JBoss Tools SVN: r37610 - trunk/openshift/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-01-02 20:35:49 -0500 (Mon, 02 Jan 2012)
New Revision: 37610
Modified:
trunk/openshift/docs/reference/en-US/Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml
Log:
updated title to mention Maven
Modified: trunk/openshift/docs/reference/en-US/Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml
===================================================================
--- trunk/openshift/docs/reference/en-US/Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml 2012-01-03 01:34:33 UTC (rev 37609)
+++ trunk/openshift/docs/reference/en-US/Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml 2012-01-03 01:35:49 UTC (rev 37610)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8' ?>
<chapter id="chap-OpenSift_Tools_Reference_Guide-Modifying_your_web_application_to_deploy_to_OpenShift_Express">
- <title>Modifying your web application to deploy to OpenShift Express</title>
+ <title>Modifying your Maven web application to deploy to OpenShift Express</title>
<para>
Open the <filename>pom.xml</filename> file of your web application in the editor by double-clicking on the file in your <guilabel>Project Explorer</guilabel> and selecting the <guilabel>pom.xml</guilabel> tab in your workbench.
</para>
12 years, 11 months
JBoss Tools SVN: r37609 - trunk/openshift/docs/reference/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-01-02 20:34:33 -0500 (Mon, 02 Jan 2012)
New Revision: 37609
Modified:
trunk/openshift/docs/reference/en-US/Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml
Log:
updated text
Modified: trunk/openshift/docs/reference/en-US/Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml
===================================================================
--- trunk/openshift/docs/reference/en-US/Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml 2012-01-03 01:29:29 UTC (rev 37608)
+++ trunk/openshift/docs/reference/en-US/Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml 2012-01-03 01:34:33 UTC (rev 37609)
@@ -9,7 +9,7 @@
Create <code>profiles</code> tags within the <code>project</code> tags of the <filename>pom.xml</filename> file. Within the <code>profiles</code> tags, press <keycap>Ctrl</keycap> and <keysym>Spacebar</keysym> together to trigger auto-completion.
</para>
<para>
- From the context menu of the auto-completion, select <guimenuitem>OpenShift Express profile - OpenShift Express profile</guimenuitem>. Doing so will insert the profile information necessary to connect to OpenShift Express.
+ From the auto-completion menu, select <guimenuitem>OpenShift Express profile</guimenuitem>. The profile information to connect to OpenShift Express will be inserted.
</para>
<figure id="openshift_express_profile_01">
<title>Selecting the OpenShift Express Profile</title>
12 years, 11 months
JBoss Tools SVN: r37608 - in trunk/openshift/docs/reference/en-US: images and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-01-02 20:29:29 -0500 (Mon, 02 Jan 2012)
New Revision: 37608
Added:
trunk/openshift/docs/reference/en-US/Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml
trunk/openshift/docs/reference/en-US/images/OpenShift_Express_Profile/
trunk/openshift/docs/reference/en-US/images/OpenShift_Express_Profile/openshift_express_profile_01.png
Modified:
trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.xml
Log:
updated with profile info
Added: trunk/openshift/docs/reference/en-US/Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml
===================================================================
--- trunk/openshift/docs/reference/en-US/Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml (rev 0)
+++ trunk/openshift/docs/reference/en-US/Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml 2012-01-03 01:29:29 UTC (rev 37608)
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='utf-8' ?>
+
+ <chapter id="chap-OpenSift_Tools_Reference_Guide-Modifying_your_web_application_to_deploy_to_OpenShift_Express">
+ <title>Modifying your web application to deploy to OpenShift Express</title>
+ <para>
+ Open the <filename>pom.xml</filename> file of your web application in the editor by double-clicking on the file in your <guilabel>Project Explorer</guilabel> and selecting the <guilabel>pom.xml</guilabel> tab in your workbench.
+ </para>
+ <para>
+ Create <code>profiles</code> tags within the <code>project</code> tags of the <filename>pom.xml</filename> file. Within the <code>profiles</code> tags, press <keycap>Ctrl</keycap> and <keysym>Spacebar</keysym> together to trigger auto-completion.
+ </para>
+ <para>
+ From the context menu of the auto-completion, select <guimenuitem>OpenShift Express profile - OpenShift Express profile</guimenuitem>. Doing so will insert the profile information necessary to connect to OpenShift Express.
+ </para>
+ <figure id="openshift_express_profile_01">
+ <title>Selecting the OpenShift Express Profile</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/OpenShift_Express_Profile/openshift_express_profile_01.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <phrase>
+ Auto-completion selection screen.
+ </phrase>
+ </textobject>
+ </mediaobject>
+ </figure>
+</chapter>
+
Modified: trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.xml
===================================================================
--- trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.xml 2012-01-03 00:46:50 UTC (rev 37607)
+++ trunk/openshift/docs/reference/en-US/OpenShift_Tools_Reference_Guide.xml 2012-01-03 01:29:29 UTC (rev 37608)
@@ -6,6 +6,7 @@
<xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Creating_an_OpenShift_Express_Application.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="Modifying_your_web_application_to_deploy_to_OpenShift_Express.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</book>
Added: trunk/openshift/docs/reference/en-US/images/OpenShift_Express_Profile/openshift_express_profile_01.png
===================================================================
(Binary files differ)
Property changes on: trunk/openshift/docs/reference/en-US/images/OpenShift_Express_Profile/openshift_express_profile_01.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
12 years, 11 months
JBoss Tools SVN: r37607 - trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-01-02 19:46:50 -0500 (Mon, 02 Jan 2012)
New Revision: 37607
Modified:
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_12.png
Log:
updated for M5
Modified: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_12.png
===================================================================
(Binary files differ)
12 years, 11 months
JBoss Tools SVN: r37606 - trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-01-02 19:38:52 -0500 (Mon, 02 Jan 2012)
New Revision: 37606
Modified:
trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_11.png
Log:
updated screenshot for M5
Modified: trunk/openshift/docs/reference/en-US/images/Creating_an_OpenShift_Express_Application/application_creation_11.png
===================================================================
(Binary files differ)
12 years, 11 months
JBoss Tools SVN: r37605 - in trunk: tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-01-02 10:32:40 -0500 (Mon, 02 Jan 2012)
New Revision: 37605
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/RunningFileOnServerTask.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ExplorerBase.java
Log:
added the possibility to run a single fine on server
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/RunningFileOnServerTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/RunningFileOnServerTask.java 2012-01-02 10:31:33 UTC (rev 37604)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/server/RunningFileOnServerTask.java 2012-01-02 15:32:40 UTC (rev 37605)
@@ -4,21 +4,9 @@
import java.util.Arrays;
import java.util.List;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
-import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
-import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
-import org.eclipse.swtbot.swt.finder.results.WidgetResult;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile;
import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.Timing;
-import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
-import org.jboss.tools.ui.bot.ext.types.IDELabel;
/**
* Runs the file on server.
@@ -37,39 +25,8 @@
@Override
public void perform() {
performInnerTask(new MarkFileAsDeployableTask(workspaceFile));
- SWTBot viewBot = SWTBotFactory.getPackageexplorer().show().bot();
- SWTBotView view = SWTBotFactory.getPackageexplorer().show();
-
- SWTBotTreeItem item = SWTBotFactory.getEclipse().getTreeItemOnPath(viewBot, viewBot.tree(), 0, workspaceFile.getFileName(), getFilePath());
- item.select();
- ContextMenuHelper.prepareTreeItemForContextMenu(viewBot.tree(), item);
- final SWTBotMenu menuRunAs = viewBot.menu(IDELabel.Menu.RUN).menu(IDELabel.Menu.RUN_AS);
- final MenuItem menuItem = UIThreadRunnable
- .syncExec(new WidgetResult<MenuItem>() {
- public MenuItem run() {
- int menuItemIndex = 0;
- MenuItem menuItem = null;
- final MenuItem[] menuItems = menuRunAs.widget.getMenu().getItems();
- while (menuItem == null && menuItemIndex < menuItems.length){
- if (menuItems[menuItemIndex].getText().indexOf("Run on Server") > - 1){
- menuItem = menuItems[menuItemIndex];
- }
- else{
- menuItemIndex++;
- }
- }
- return menuItem;
- }
- });
- if (menuItem != null){
- new SWTBotMenu(menuItem).click();
- SWTBotShell shell = getBot().shell(IDELabel.Shell.RUN_ON_SERVER).activate();
- SWTBotFactory.getOpen().finish(shell.bot());
- SWTBotFactory.getUtil().waitForAll(Timing.time3S());
- }
- else{
- throw new WidgetNotFoundException("Unable to find Menu Item with Label 'Run on Server'");
- }
+ SWTBotFactory.getPackageexplorer().show();
+ SWTBotFactory.getPackageexplorer().runOnServer(workspaceFile.getProject(), workspaceFile.getFileName(), getFilePath());
}
/**
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ExplorerBase.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ExplorerBase.java 2012-01-02 10:31:33 UTC (rev 37604)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ExplorerBase.java 2012-01-02 15:32:40 UTC (rev 37605)
@@ -139,8 +139,23 @@
* @param projectName
*/
public void runOnServer(String projectName) {
+ runOnServer(projectName, null);
+ }
+
+ /**
+ * runs given file on Server (uses default server, the first one) server MUST be running
+ * @param projectName
+ */
+ public void runOnServer(String projectName, String fileName, String... path) {
SWTBot viewBot = show().bot();
- SWTBotTreeItem item = viewBot.tree().expandNode(projectName);
+ SWTBotTreeItem item;
+
+ if (fileName == null){
+ item = viewBot.tree().expandNode(projectName);
+ } else {
+ item = SWTEclipseExt.getTreeItemOnPath(viewBot, viewBot.tree(), 0, fileName, path);
+ }
+
item.select();
ContextMenuHelper.prepareTreeItemForContextMenu(viewBot.tree(), item);
final SWTBotMenu menuRunAs = viewBot.menu(IDELabel.Menu.RUN).menu(IDELabel.Menu.RUN_AS);
12 years, 11 months
JBoss Tools SVN: r37604 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot: task/wizard/web and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-01-02 05:31:33 -0500 (Mon, 02 Jan 2012)
New Revision: 37604
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardFillingTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/DynamicWebProjectCreationTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/AbstractPortletCreationTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JSFPortletCreationTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletCreationTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletTemplate.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java
Log:
refactoring of wizards
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardFillingTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardFillingTask.java 2012-01-02 09:12:55 UTC (rev 37603)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/WizardFillingTask.java 2012-01-02 10:31:33 UTC (rev 37604)
@@ -12,7 +12,7 @@
/**
*
- * Provides the functionality of navigating between wizard pages. The data
+ * Provides the functionality of opening wizard and navigating between its pages. The data
* should fill every wizard page itself.
*
* @author ljelinko
@@ -22,13 +22,25 @@
private List<WizardPageFillingTask> wizardPages;
- public WizardFillingTask() {
+ private String wizardName;
+
+ private String wizardPath;
+
+ public WizardFillingTask(String name) {
+ this(name, null);
+ }
+
+ public WizardFillingTask(String name, String path) {
super();
+ this.wizardName = name;
+ this.wizardPath = path;
wizardPages = new ArrayList<WizardPageFillingTask>();
}
@Override
public void perform() {
+ performInnerTask(new WizardOpeningTask(wizardName, wizardPath));
+
SWTBotShell activeShell = getActiveShell();
super.setTasks(wizardPages);
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/DynamicWebProjectCreationTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/DynamicWebProjectCreationTask.java 2012-01-02 09:12:55 UTC (rev 37603)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/DynamicWebProjectCreationTask.java 2012-01-02 10:31:33 UTC (rev 37604)
@@ -1,46 +1,23 @@
package org.jboss.tools.portlet.ui.bot.task.wizard.web;
import org.jboss.tools.portlet.ui.bot.task.dialog.AssociatedPerspectiveDialogClosingTask;
-import org.jboss.tools.portlet.ui.bot.task.facet.FacetsSelectionTask;
import org.jboss.tools.portlet.ui.bot.task.wizard.WizardFillingTask;
-import org.jboss.tools.portlet.ui.bot.task.wizard.WizardOpeningTask;
/**
- * Creates a new dynamic web project using the wizard.
+ * Create a new dynamic web project using the wizard.
*
* @author ljelinko
*
*/
public class DynamicWebProjectCreationTask extends WizardFillingTask {
- private DynamicWebProjectWizardPageFillingTask firstPage;
-
public DynamicWebProjectCreationTask() {
- super();
- firstPage = new DynamicWebProjectWizardPageFillingTask();
- addWizardPage(firstPage);
+ super("Dynamic Web Project", "Web");
}
@Override
public void perform() {
- performInnerTask(new WizardOpeningTask("Dynamic Web Project", "Web"));
super.perform();
performInnerTask(new AssociatedPerspectiveDialogClosingTask(false));
}
-
- public void setProjectName(String projectName) {
- firstPage.setProjectName(projectName);
- }
-
- public void setWebModuleVersion(String webModuleVersion) {
- firstPage.setWebModuleVersion(webModuleVersion);
- }
-
- public void setServerName(String serverName) {
- firstPage.setServerName(serverName);
- }
-
- public void setSelectFacetsTask(FacetsSelectionTask selectFacetsTask) {
- firstPage.setSelectFacetsTask(selectFacetsTask);
- }
-}
+}
\ No newline at end of file
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/AbstractPortletCreationTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/AbstractPortletCreationTask.java 2012-01-02 09:12:55 UTC (rev 37603)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/AbstractPortletCreationTask.java 2012-01-02 10:31:33 UTC (rev 37604)
@@ -1,7 +1,6 @@
package org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss;
import org.jboss.tools.portlet.ui.bot.task.wizard.WizardFillingTask;
-import org.jboss.tools.portlet.ui.bot.task.wizard.WizardOpeningTask;
/**
*
@@ -14,15 +13,7 @@
private static final String PORTLET_WIZARD_PATH = "JBoss Tools Web/Portlet";
- private String portletWizardName;
-
public AbstractPortletCreationTask(String portletWizardName) {
- this.portletWizardName = portletWizardName;
+ super(portletWizardName, PORTLET_WIZARD_PATH);
}
-
- @Override
- public void perform() {
- performInnerTask(new WizardOpeningTask(portletWizardName, PORTLET_WIZARD_PATH));
- super.perform();
- }
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JSFPortletCreationTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JSFPortletCreationTask.java 2012-01-02 09:12:55 UTC (rev 37603)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JSFPortletCreationTask.java 2012-01-02 10:31:33 UTC (rev 37604)
@@ -1,6 +1,5 @@
package org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss;
-import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageDefaultsFillingTask;
/**
@@ -13,7 +12,5 @@
public JSFPortletCreationTask() {
super("JBoss JSF/Seam Portlet");
- // leave defaults on the first page
- addWizardPage(new WizardPageDefaultsFillingTask());
}
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletCreationTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletCreationTask.java 2012-01-02 09:12:55 UTC (rev 37603)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletCreationTask.java 2012-01-02 10:31:33 UTC (rev 37604)
@@ -9,31 +9,7 @@
*/
public class JavaPortletCreationTask extends AbstractPortletCreationTask {
- private JavaPortletWizardPageFillingTask firstPage;
-
public JavaPortletCreationTask() {
super("Java Portlet");
- firstPage = new JavaPortletWizardPageFillingTask();
- addWizardPage(firstPage);
}
-
- public void setProject(String project) {
- firstPage.setProject(project);
- }
-
- public void setSourceFolder(String sourceFolder) {
- firstPage.setSourceFolder(sourceFolder);
- }
-
- public void setPackageName(String packageName) {
- firstPage.setPackageName(packageName);
- }
-
- public void setClassName(String className) {
- firstPage.setClassName(className);
- }
-
- public void setSuperclass(String superclass) {
- firstPage.setSuperclass(superclass);
- }
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java 2012-01-02 09:12:55 UTC (rev 37603)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java 2012-01-02 10:31:33 UTC (rev 37604)
@@ -8,6 +8,7 @@
import org.jboss.tools.portlet.ui.bot.entity.XMLNode;
import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.AbstractPortletCreationTask;
import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JavaPortletCreationTask;
+import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JavaPortletWizardPageFillingTask;
import org.jboss.tools.portlet.ui.bot.test.template.CreatePortletTemplate;
/**
@@ -34,11 +35,14 @@
}
protected AbstractPortletCreationTask getCreatePortletTask() {
- JavaPortletCreationTask task = new JavaPortletCreationTask();
+ JavaPortletWizardPageFillingTask task = new JavaPortletWizardPageFillingTask();
task.setProject(PROJECT_NAME);
task.setPackageName(PACKAGE_NAME);
task.setClassName(CLASS_NAME);
- return task;
+
+ JavaPortletCreationTask wizardTask = new JavaPortletCreationTask();
+ wizardTask.addWizardPage(task);
+ return wizardTask;
}
@Override
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletTemplate.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletTemplate.java 2012-01-02 09:12:55 UTC (rev 37603)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreateJSFSeamPortletTemplate.java 2012-01-02 10:31:33 UTC (rev 37604)
@@ -23,6 +23,7 @@
JSFPortletCreationTask task = new JSFPortletCreationTask();
task.addWizardPage(new WizardPageDefaultsFillingTask());
task.addWizardPage(new WizardPageDefaultsFillingTask());
+ task.addWizardPage(new WizardPageDefaultsFillingTask());
return task;
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2012-01-02 09:12:55 UTC (rev 37603)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2012-01-02 10:31:33 UTC (rev 37604)
@@ -11,10 +11,11 @@
import org.jboss.tools.portlet.ui.bot.entity.FacetDefinition;
import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile;
-import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
import org.jboss.tools.portlet.ui.bot.task.facet.FacetsSelectionTask;
+import org.jboss.tools.portlet.ui.bot.task.wizard.WizardFillingTask;
import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageFillingTask;
import org.jboss.tools.portlet.ui.bot.task.wizard.web.DynamicWebProjectCreationTask;
+import org.jboss.tools.portlet.ui.bot.task.wizard.web.DynamicWebProjectWizardPageFillingTask;
import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
@@ -86,14 +87,17 @@
}
}
- protected AbstractSWTTask getCreateDynamicWebProjectTask() {
- DynamicWebProjectCreationTask task = new DynamicWebProjectCreationTask();
+ protected WizardFillingTask getCreateDynamicWebProjectTask() {
+ DynamicWebProjectWizardPageFillingTask task = new DynamicWebProjectWizardPageFillingTask();
task.setProjectName(getProjectName());
task.setWebModuleVersion("2.5");
task.setServerName(SWTTestExt.configuredState.getServer().name);
task.setSelectFacetsTask(getSelectFacetsTask());
- task.addAllWizardPages(getAdditionalWizardPages());
- return task;
+
+ DynamicWebProjectCreationTask wizardTask = new DynamicWebProjectCreationTask();
+ wizardTask.addWizardPage(task);
+ wizardTask.addAllWizardPages(getAdditionalWizardPages());
+ return wizardTask;
}
protected FacetsSelectionTask getSelectFacetsTask() {
12 years, 11 months
JBoss Tools SVN: r37603 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot: test/example and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-01-02 04:12:55 -0500 (Mon, 02 Jan 2012)
New Revision: 37603
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/problems/NumberOfErrorsMatcher.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleTest.java
Log:
removed unused imports
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/problems/NumberOfErrorsMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/problems/NumberOfErrorsMatcher.java 2011-12-30 21:38:22 UTC (rev 37602)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/problems/NumberOfErrorsMatcher.java 2012-01-02 09:12:55 UTC (rev 37603)
@@ -3,7 +3,6 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.hamcrest.Description;
import org.jboss.tools.portlet.ui.bot.matcher.JavaPerspectiveAbstractSWTMatcher;
-import org.jboss.tools.portlet.ui.bot.matcher.perspective.OpenJavaPerspectiveTask;
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
import org.jboss.tools.ui.bot.ext.view.ProblemsView;
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleTest.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleTest.java 2011-12-30 21:38:22 UTC (rev 37602)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/example/AbstractPortletExampleTest.java 2012-01-02 09:12:55 UTC (rev 37603)
@@ -5,14 +5,12 @@
import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.exceptionInConsoleOutput;
import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.isNumberOfErrors;
-import org.eclipse.swtbot.swt.finder.SWTBot;
import org.hamcrest.Matcher;
import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
import org.jboss.tools.portlet.ui.bot.task.SWTBotAware;
import org.jboss.tools.portlet.ui.bot.task.console.ConsoleClearingTask;
import org.jboss.tools.portlet.ui.bot.task.server.RunninngProjectOnServerTask;
import org.jboss.tools.ui.bot.ext.ExampleTest;
-import org.junit.Test;
/**
* Common ancestor for example projects tests.
12 years, 11 months