JBoss Tools SVN: r42878 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-08-07 07:30:18 -0400 (Tue, 07 Aug 2012)
New Revision: 42878
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java
Log:
JBIDE-11858 respond to shell closing
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java 2012-08-07 11:29:48 UTC (rev 42877)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java 2012-08-07 11:30:18 UTC (rev 42878)
@@ -26,6 +26,8 @@
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseMoveListener;
+import org.eclipse.swt.events.ShellAdapter;
+import org.eclipse.swt.events.ShellEvent;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.graphics.Point;
@@ -71,41 +73,41 @@
public void keyPressed(KeyEvent e) {
if (e == null)
return;
- if( handleEscape )
- handleEscape(e);
- if( handlef6)
- handlef6(e);
+ if( handleEscape && e.keyCode == SWT.ESC)
+ handleEscape();
+ if( handlef6 && e.keyCode == SWT.F6)
+ handlef6();
}
- protected void handleEscape(KeyEvent e) {
- if (e.keyCode == SWT.ESC) {
- if (FOCUSSED_TOOLTIP != null) {
- FOCUSSED_TOOLTIP.dispose();
- FOCUSSED_TOOLTIP = null;
- tooltipSelection = null;
- }
- activate();
- }
+ public void keyReleased(KeyEvent e) {
}
- protected void handlef6(KeyEvent e) {
- if (e.keyCode == SWT.F6) {
- // We have no focussed window, and we DO have a selection to show in focus
- if (FOCUSSED_TOOLTIP == null && tooltipSelection != null) {
- deactivate();
- hide();
- createFocusedTooltip(tree);
- }
- }
+ };
+ protected void handleEscape() {
+ if (FOCUSSED_TOOLTIP != null) {
+ FOCUSSED_TOOLTIP.dispose();
+ FOCUSSED_TOOLTIP = null;
+ tooltipSelection = null;
}
- public void keyReleased(KeyEvent e) {
+ activate();
+ }
+ protected void handlef6() {
+ // We have no focussed window, and we DO have a selection to show in focus
+ if (FOCUSSED_TOOLTIP == null && tooltipSelection != null) {
+ deactivate();
+ hide();
+ createFocusedTooltip(tree);
}
- };
+ }
public void createFocusedTooltip(final Control control) {
final Shell stickyTooltip = new Shell(control.getShell(), SWT.ON_TOP | SWT.TOOL
| SWT.NO_FOCUS);
stickyTooltip.setLayout(new FillLayout());
stickyTooltip.setBackground(stickyTooltip.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
- stickyTooltip.addKeyListener(new CustomKeyListener(true, false));
+ stickyTooltip.addShellListener(new ShellAdapter() {
+ public void shellClosed(ShellEvent e) {
+ handleEscape();
+ }
+ });
control.getDisplay().asyncExec(new Runnable() {
public void run() {
Event event = new Event();
12 years, 5 months
- 1
- 0
JBoss Tools SVN: r42877 - branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-08-07 07:29:48 -0400 (Tue, 07 Aug 2012)
New Revision: 42877
Modified:
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java
Log:
JBIDE-11858 respond to shell closing
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java 2012-08-07 10:43:18 UTC (rev 42876)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java 2012-08-07 11:29:48 UTC (rev 42877)
@@ -26,6 +26,8 @@
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.MouseMoveListener;
+import org.eclipse.swt.events.ShellAdapter;
+import org.eclipse.swt.events.ShellEvent;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.graphics.Point;
@@ -71,41 +73,41 @@
public void keyPressed(KeyEvent e) {
if (e == null)
return;
- if( handleEscape )
- handleEscape(e);
- if( handlef6)
- handlef6(e);
+ if( handleEscape && e.keyCode == SWT.ESC)
+ handleEscape();
+ if( handlef6 && e.keyCode == SWT.F6)
+ handlef6();
}
- protected void handleEscape(KeyEvent e) {
- if (e.keyCode == SWT.ESC) {
- if (FOCUSSED_TOOLTIP != null) {
- FOCUSSED_TOOLTIP.dispose();
- FOCUSSED_TOOLTIP = null;
- tooltipSelection = null;
- }
- activate();
- }
+ public void keyReleased(KeyEvent e) {
}
- protected void handlef6(KeyEvent e) {
- if (e.keyCode == SWT.F6) {
- // We have no focussed window, and we DO have a selection to show in focus
- if (FOCUSSED_TOOLTIP == null && tooltipSelection != null) {
- deactivate();
- hide();
- createFocusedTooltip(tree);
- }
- }
+ };
+ protected void handleEscape() {
+ if (FOCUSSED_TOOLTIP != null) {
+ FOCUSSED_TOOLTIP.dispose();
+ FOCUSSED_TOOLTIP = null;
+ tooltipSelection = null;
}
- public void keyReleased(KeyEvent e) {
+ activate();
+ }
+ protected void handlef6() {
+ // We have no focussed window, and we DO have a selection to show in focus
+ if (FOCUSSED_TOOLTIP == null && tooltipSelection != null) {
+ deactivate();
+ hide();
+ createFocusedTooltip(tree);
}
- };
+ }
public void createFocusedTooltip(final Control control) {
final Shell stickyTooltip = new Shell(control.getShell(), SWT.ON_TOP | SWT.TOOL
| SWT.NO_FOCUS);
stickyTooltip.setLayout(new FillLayout());
stickyTooltip.setBackground(stickyTooltip.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
- stickyTooltip.addKeyListener(new CustomKeyListener(true, false));
+ stickyTooltip.addShellListener(new ShellAdapter() {
+ public void shellClosed(ShellEvent e) {
+ handleEscape();
+ }
+ });
control.getDisplay().asyncExec(new Runnable() {
public void run() {
Event event = new Event();
12 years, 5 months
- 1
- 0
JBoss Tools SVN: r42876 - in branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss: tools/as/wst/server/ui/xpl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-08-07 06:43:18 -0400 (Tue, 07 Aug 2012)
New Revision: 42876
Modified:
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/as7/management/content/ServerContentTreeContentProvider.java
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java
Log:
JBIDE-11858 try 3 to maintenance
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/as7/management/content/ServerContentTreeContentProvider.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/as7/management/content/ServerContentTreeContentProvider.java 2012-08-07 10:42:56 UTC (rev 42875)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/as7/management/content/ServerContentTreeContentProvider.java 2012-08-07 10:43:18 UTC (rev 42876)
@@ -22,8 +22,12 @@
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Composite;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.ui.Messages;
+import org.jboss.tools.as.wst.server.ui.xpl.ServerToolTip;
/**
* ServerContentTreeContentProvider
@@ -92,13 +96,28 @@
loadElementJob.cancel();
pendingUpdates.clear();
}
-
+
+ private ServerToolTip tooltip = null;
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
if (viewer instanceof TreeViewer) {
this.viewer = (TreeViewer) viewer;
} else {
viewer = null;
}
+ if( tooltip != null )
+ tooltip.deactivate();
+ tooltip = new ServerToolTip(((TreeViewer)viewer).getTree()) {
+ protected boolean isMyType(Object selected) {
+ return selected instanceof ResourceNode;
+ }
+ protected void fillStyledText(Composite parent, StyledText sText, Object o) {
+ sText.setText("View JBoss-7 management details."); //$NON-NLS-1$
+ }
+ };
+ tooltip.setShift(new Point(15, 8));
+ tooltip.setPopupDelay(500); // in ms
+ tooltip.setHideOnMouseDown(true);
+ tooltip.activate();
}
public Object[] getElements(Object inputElement) {
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java 2012-08-07 10:42:56 UTC (rev 42875)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java 2012-08-07 10:43:18 UTC (rev 42876)
@@ -12,8 +12,6 @@
import java.io.IOException;
import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Hashtable;
import java.util.Iterator;
import org.eclipse.jface.internal.text.html.HTML2TextReader;
@@ -40,14 +38,10 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.ui.IServerModule;
-import org.eclipse.wst.server.ui.internal.provisional.IServerToolTip;
public abstract class ServerToolTip extends ToolTip {
- protected Hashtable<String,ArrayList<IServerToolTip>> toolTipProviders = new Hashtable<String,ArrayList<IServerToolTip>>();
- protected static Shell CURRENT_TOOLTIP;
+ protected Shell FOCUSSED_TOOLTIP;
+ protected Object tooltipSelection;
protected Label hintLabel;
protected Tree tree;
protected int x;
@@ -64,39 +58,54 @@
y = e.y;
}
});
-
- tree.addKeyListener(new KeyListener() {
- public void keyPressed(KeyEvent e) {
- if (e == null)
- return;
-
- if (e.keyCode == SWT.ESC) {
- if (CURRENT_TOOLTIP != null) {
- CURRENT_TOOLTIP.dispose();
- CURRENT_TOOLTIP = null;
- }
- activate();
+ tree.addKeyListener( new CustomKeyListener(true, true));
+ }
+
+ // Created a key listener to add it to both the shell and the styledText of the focussed tooltip
+ private class CustomKeyListener implements KeyListener {
+ private boolean handleEscape, handlef6;
+ public CustomKeyListener( boolean handlesEscape, boolean handlesf6) {
+ this.handleEscape = handlesEscape;
+ this.handlef6 = handlesf6;
+ }
+ public void keyPressed(KeyEvent e) {
+ if (e == null)
+ return;
+ if( handleEscape )
+ handleEscape(e);
+ if( handlef6)
+ handlef6(e);
+ }
+ protected void handleEscape(KeyEvent e) {
+ if (e.keyCode == SWT.ESC) {
+ if (FOCUSSED_TOOLTIP != null) {
+ FOCUSSED_TOOLTIP.dispose();
+ FOCUSSED_TOOLTIP = null;
+ tooltipSelection = null;
}
- if (e.keyCode == SWT.F6) {
- if (CURRENT_TOOLTIP == null) {
- deactivate();
- hide();
- createFocusedTooltip(tree);
- }
+ activate();
+ }
+ }
+ protected void handlef6(KeyEvent e) {
+ if (e.keyCode == SWT.F6) {
+ // We have no focussed window, and we DO have a selection to show in focus
+ if (FOCUSSED_TOOLTIP == null && tooltipSelection != null) {
+ deactivate();
+ hide();
+ createFocusedTooltip(tree);
}
}
- public void keyReleased(KeyEvent e){
- // nothing to do
- }
- });
- }
+ }
+ public void keyReleased(KeyEvent e) {
+ }
+ };
public void createFocusedTooltip(final Control control) {
final Shell stickyTooltip = new Shell(control.getShell(), SWT.ON_TOP | SWT.TOOL
| SWT.NO_FOCUS);
stickyTooltip.setLayout(new FillLayout());
stickyTooltip.setBackground(stickyTooltip.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
-
+ stickyTooltip.addKeyListener(new CustomKeyListener(true, false));
control.getDisplay().asyncExec(new Runnable() {
public void run() {
Event event = new Event();
@@ -116,7 +125,7 @@
// addListener(stickyTooltip);
}
});
- CURRENT_TOOLTIP = stickyTooltip;
+ FOCUSSED_TOOLTIP = stickyTooltip;
}
@Override
@@ -130,20 +139,27 @@
return false;
/* JBT: Added this check */
Object o = tree.getItem(new Point(event.x, event.y));
+ boolean ret;
if( o instanceof TreeItem && !isMyType(((TreeItem)o).getData()))
- return false;
- return super.shouldCreateToolTip(event);
+ ret = false;
+ else
+ ret = super.shouldCreateToolTip(event);
+ if( !ret )
+ tooltipSelection = null;
+ return ret;
}
/*
* JBT: Added a method
*/
protected abstract boolean isMyType(Object selected);
+ protected abstract void fillStyledText(Composite parent, StyledText sText, Object o);
protected Composite createToolTipContentArea(Event event, Composite parent) {
Object o = tree.getItem(new Point(event.x, event.y));
if (o == null)
return null;
+ tooltipSelection = o;
FillLayout layout = (FillLayout)parent.getLayout();
layout.type = SWT.VERTICAL;
@@ -154,10 +170,11 @@
StyledText sText = new StyledText(parent, SWT.NONE);
sText.setEditable(false);
sText.setBackground(parent.getBackground());
+ sText.addKeyListener(new CustomKeyListener(true, false));
fillStyledText(parent, sText, o);
- // add the F3 text
+ // add the F6 text
hintLabel = new Label(parent,SWT.BORDER);
hintLabel.setAlignment(SWT.RIGHT);
hintLabel.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
@@ -183,47 +200,6 @@
return parent;
}
- protected void fillStyledText(Composite parent, StyledText sText, Object o) {
-
- IServer server = null;
- IServerModule module = null;
- if (o instanceof TreeItem) {
- Object obj = ((TreeItem)o).getData();
- if (obj instanceof IServer)
- server = (IServer) obj;
- if (obj instanceof IServerModule)
- module = (IServerModule) obj;
- }
-
- if (module != null) {
- IModule[] modules = module.getModule();
- IModule m = modules[modules.length - 1];
- sText.setText("<b>" + m.getName() + "</b>");
- //sText.setText("<b>" + m.getName() + "</b></p>" + m.getModuleType().getName());
-
- StyledText sText2 = new StyledText(parent, SWT.NONE);
- sText2.setEditable(false);
- sText2.setBackground(parent.getBackground());
- sText2.setText(m.getModuleType().getName());
- }
-
- if (server != null) {
- sText.setText("<b>" + server.getName() + "</b>");
-
- // add adopters content
- if (server.getServerType() != null) {
- ArrayList<IServerToolTip> listOfProviders = toolTipProviders.get(server.getServerType().getId());
-
- if (listOfProviders != null) {
- for (IServerToolTip tipProvider : listOfProviders) {
- tipProvider.createContent(parent,server);
- }
- }
- }
- }
- }
-
-
protected void parseText(String htmlText,StyledText sText) {
TextPresentation presentation = new TextPresentation();
HTML2TextReader reader = new HTML2TextReader(new StringReader(htmlText), presentation);
12 years, 5 months
- 1
- 0
JBoss Tools SVN: r42875 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss: tools/as/wst/server/ui/xpl and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-08-07 06:42:56 -0400 (Tue, 07 Aug 2012)
New Revision: 42875
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/as7/management/content/ServerContentTreeContentProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java
Log:
JBIDE-11858 try 3 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/as7/management/content/ServerContentTreeContentProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/as7/management/content/ServerContentTreeContentProvider.java 2012-08-07 09:31:58 UTC (rev 42874)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/as7/management/content/ServerContentTreeContentProvider.java 2012-08-07 10:42:56 UTC (rev 42875)
@@ -22,8 +22,12 @@
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.widgets.Composite;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.ui.Messages;
+import org.jboss.tools.as.wst.server.ui.xpl.ServerToolTip;
/**
* ServerContentTreeContentProvider
@@ -92,13 +96,28 @@
loadElementJob.cancel();
pendingUpdates.clear();
}
-
+
+ private ServerToolTip tooltip = null;
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
if (viewer instanceof TreeViewer) {
this.viewer = (TreeViewer) viewer;
} else {
viewer = null;
}
+ if( tooltip != null )
+ tooltip.deactivate();
+ tooltip = new ServerToolTip(((TreeViewer)viewer).getTree()) {
+ protected boolean isMyType(Object selected) {
+ return selected instanceof ResourceNode;
+ }
+ protected void fillStyledText(Composite parent, StyledText sText, Object o) {
+ sText.setText("View JBoss-7 management details."); //$NON-NLS-1$
+ }
+ };
+ tooltip.setShift(new Point(15, 8));
+ tooltip.setPopupDelay(500); // in ms
+ tooltip.setHideOnMouseDown(true);
+ tooltip.activate();
}
public Object[] getElements(Object inputElement) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java 2012-08-07 09:31:58 UTC (rev 42874)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerToolTip.java 2012-08-07 10:42:56 UTC (rev 42875)
@@ -12,8 +12,6 @@
import java.io.IOException;
import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Hashtable;
import java.util.Iterator;
import org.eclipse.jface.internal.text.html.HTML2TextReader;
@@ -40,14 +38,10 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.ui.IServerModule;
-import org.eclipse.wst.server.ui.internal.provisional.IServerToolTip;
public abstract class ServerToolTip extends ToolTip {
- protected Hashtable<String,ArrayList<IServerToolTip>> toolTipProviders = new Hashtable<String,ArrayList<IServerToolTip>>();
- protected static Shell CURRENT_TOOLTIP;
+ protected Shell FOCUSSED_TOOLTIP;
+ protected Object tooltipSelection;
protected Label hintLabel;
protected Tree tree;
protected int x;
@@ -64,39 +58,54 @@
y = e.y;
}
});
-
- tree.addKeyListener(new KeyListener() {
- public void keyPressed(KeyEvent e) {
- if (e == null)
- return;
-
- if (e.keyCode == SWT.ESC) {
- if (CURRENT_TOOLTIP != null) {
- CURRENT_TOOLTIP.dispose();
- CURRENT_TOOLTIP = null;
- }
- activate();
+ tree.addKeyListener( new CustomKeyListener(true, true));
+ }
+
+ // Created a key listener to add it to both the shell and the styledText of the focussed tooltip
+ private class CustomKeyListener implements KeyListener {
+ private boolean handleEscape, handlef6;
+ public CustomKeyListener( boolean handlesEscape, boolean handlesf6) {
+ this.handleEscape = handlesEscape;
+ this.handlef6 = handlesf6;
+ }
+ public void keyPressed(KeyEvent e) {
+ if (e == null)
+ return;
+ if( handleEscape )
+ handleEscape(e);
+ if( handlef6)
+ handlef6(e);
+ }
+ protected void handleEscape(KeyEvent e) {
+ if (e.keyCode == SWT.ESC) {
+ if (FOCUSSED_TOOLTIP != null) {
+ FOCUSSED_TOOLTIP.dispose();
+ FOCUSSED_TOOLTIP = null;
+ tooltipSelection = null;
}
- if (e.keyCode == SWT.F6) {
- if (CURRENT_TOOLTIP == null) {
- deactivate();
- hide();
- createFocusedTooltip(tree);
- }
+ activate();
+ }
+ }
+ protected void handlef6(KeyEvent e) {
+ if (e.keyCode == SWT.F6) {
+ // We have no focussed window, and we DO have a selection to show in focus
+ if (FOCUSSED_TOOLTIP == null && tooltipSelection != null) {
+ deactivate();
+ hide();
+ createFocusedTooltip(tree);
}
}
- public void keyReleased(KeyEvent e){
- // nothing to do
- }
- });
- }
+ }
+ public void keyReleased(KeyEvent e) {
+ }
+ };
public void createFocusedTooltip(final Control control) {
final Shell stickyTooltip = new Shell(control.getShell(), SWT.ON_TOP | SWT.TOOL
| SWT.NO_FOCUS);
stickyTooltip.setLayout(new FillLayout());
stickyTooltip.setBackground(stickyTooltip.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
-
+ stickyTooltip.addKeyListener(new CustomKeyListener(true, false));
control.getDisplay().asyncExec(new Runnable() {
public void run() {
Event event = new Event();
@@ -116,7 +125,7 @@
// addListener(stickyTooltip);
}
});
- CURRENT_TOOLTIP = stickyTooltip;
+ FOCUSSED_TOOLTIP = stickyTooltip;
}
@Override
@@ -130,20 +139,27 @@
return false;
/* JBT: Added this check */
Object o = tree.getItem(new Point(event.x, event.y));
+ boolean ret;
if( o instanceof TreeItem && !isMyType(((TreeItem)o).getData()))
- return false;
- return super.shouldCreateToolTip(event);
+ ret = false;
+ else
+ ret = super.shouldCreateToolTip(event);
+ if( !ret )
+ tooltipSelection = null;
+ return ret;
}
/*
* JBT: Added a method
*/
protected abstract boolean isMyType(Object selected);
+ protected abstract void fillStyledText(Composite parent, StyledText sText, Object o);
protected Composite createToolTipContentArea(Event event, Composite parent) {
Object o = tree.getItem(new Point(event.x, event.y));
if (o == null)
return null;
+ tooltipSelection = o;
FillLayout layout = (FillLayout)parent.getLayout();
layout.type = SWT.VERTICAL;
@@ -154,10 +170,11 @@
StyledText sText = new StyledText(parent, SWT.NONE);
sText.setEditable(false);
sText.setBackground(parent.getBackground());
+ sText.addKeyListener(new CustomKeyListener(true, false));
fillStyledText(parent, sText, o);
- // add the F3 text
+ // add the F6 text
hintLabel = new Label(parent,SWT.BORDER);
hintLabel.setAlignment(SWT.RIGHT);
hintLabel.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND));
@@ -183,47 +200,6 @@
return parent;
}
- protected void fillStyledText(Composite parent, StyledText sText, Object o) {
-
- IServer server = null;
- IServerModule module = null;
- if (o instanceof TreeItem) {
- Object obj = ((TreeItem)o).getData();
- if (obj instanceof IServer)
- server = (IServer) obj;
- if (obj instanceof IServerModule)
- module = (IServerModule) obj;
- }
-
- if (module != null) {
- IModule[] modules = module.getModule();
- IModule m = modules[modules.length - 1];
- sText.setText("<b>" + m.getName() + "</b>");
- //sText.setText("<b>" + m.getName() + "</b></p>" + m.getModuleType().getName());
-
- StyledText sText2 = new StyledText(parent, SWT.NONE);
- sText2.setEditable(false);
- sText2.setBackground(parent.getBackground());
- sText2.setText(m.getModuleType().getName());
- }
-
- if (server != null) {
- sText.setText("<b>" + server.getName() + "</b>");
-
- // add adopters content
- if (server.getServerType() != null) {
- ArrayList<IServerToolTip> listOfProviders = toolTipProviders.get(server.getServerType().getId());
-
- if (listOfProviders != null) {
- for (IServerToolTip tipProvider : listOfProviders) {
- tipProvider.createContent(parent,server);
- }
- }
- }
- }
- }
-
-
protected void parseText(String htmlText,StyledText sText) {
TextPresentation presentation = new TextPresentation();
HTML2TextReader reader = new HTML2TextReader(new StringReader(htmlText), presentation);
12 years, 5 months
- 1
- 0
JBoss Tools SVN: r42874 - branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-08-07 05:31:58 -0400 (Tue, 07 Aug 2012)
New Revision: 42874
Modified:
branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeDeltaImpl.java
branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeImpl.java
Log:
JBIDE-12385 to maintenance
Modified: branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeDeltaImpl.java
===================================================================
--- branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeDeltaImpl.java 2012-08-07 09:29:20 UTC (rev 42873)
+++ branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeDeltaImpl.java 2012-08-07 09:31:58 UTC (rev 42874)
@@ -212,9 +212,9 @@
// Using a different delta constructor here to force
// whether this child is added or removed.
return new ArchiveNodeDeltaImpl(this, impl, addedOrRemoved,
- (HashMap)impl.attributeChanges.clone(),
- (HashMap)impl.propertyChanges.clone(),
- (HashMap)impl.childChanges.clone());
+ impl.getAttributeChanges(),
+ impl.getPropertyChanges(),
+ impl.getChildChanges());
}
return child.getDelta();
}
Modified: branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeImpl.java
===================================================================
--- branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeImpl.java 2012-08-07 09:29:20 UTC (rev 42873)
+++ branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveNodeImpl.java 2012-08-07 09:31:58 UTC (rev 42874)
@@ -41,11 +41,24 @@
protected ArrayList<ArchiveNodeImpl> children;
// cached data for deltas
- protected HashMap<String, NodeDelta> attributeChanges;
- protected HashMap<String, NodeDelta> propertyChanges;
- protected HashMap<IArchiveNode, Integer> childChanges;
+ private HashMap<String, NodeDelta> attributeChanges;
+ public synchronized HashMap<String, NodeDelta> getAttributeChanges() {
+ return (HashMap<String, NodeDelta>)attributeChanges.clone();
+ }
+ public synchronized HashMap<String, NodeDelta> getPropertyChanges() {
+ return (HashMap<String, NodeDelta>)propertyChanges.clone();
+ }
+ public synchronized HashMap<IArchiveNode, Integer> getChildChanges() {
+ return (HashMap<IArchiveNode, Integer>)childChanges.clone();
+ }
+
+
+ private HashMap<String, NodeDelta> propertyChanges;
+ private HashMap<IArchiveNode, Integer> childChanges;
+
+
public ArchiveNodeImpl (XbPackageNodeWithProperties delegate) {
nodeDelegate = delegate;
children = new ArrayList<ArchiveNodeImpl>();
@@ -260,7 +273,7 @@
* @param child
* @param addInDelegate
*/
- public final void addChild(IArchiveNode child, boolean addInDelegate) throws ArchivesModelException {
+ public synchronized final void addChild(IArchiveNode child, boolean addInDelegate) throws ArchivesModelException {
Assert.isNotNull(child);
ArchiveNodeImpl childImpl = (ArchiveNodeImpl) child;
children.add(childImpl);
@@ -302,7 +315,7 @@
* (non-Javadoc)
* @see org.jboss.ide.eclipse.archives.core.model.IArchiveNode#removeChild(org.jboss.ide.eclipse.archives.core.model.IArchiveNode)
*/
- public void removeChild(IArchiveNode node) {
+ public synchronized void removeChild(IArchiveNode node) {
Assert.isNotNull(node);
ArchiveNodeImpl impl = (ArchiveNodeImpl) node;
boolean removed = false;
@@ -322,64 +335,62 @@
/**
* An attribute has changed. Save the change so it can be represented in a delta
*/
- protected void attributeChanged(String key, Object beforeValue, Object afterValue) {
+ protected synchronized void attributeChanged(String key, Object beforeValue, Object afterValue) {
int kind = IArchiveNodeDelta.ATTRIBUTE_CHANGED;
- HashMap<String, NodeDelta> map = attributeChanges;
// short circuit if no change has REALLY occurred
if( beforeValue != null && beforeValue.equals(afterValue)) return;
- if( map.containsKey(key)) {
- Object original = map.get(key).getBefore();
+ if( attributeChanges.containsKey(key)) {
+ Object original = attributeChanges.get(key).getBefore();
if( original == null && afterValue == null )
- map.remove(key);
+ attributeChanges.remove(key);
else if( original == null )
- map.put(key, new NodeDelta(original, afterValue, kind));
+ attributeChanges.put(key, new NodeDelta(original, afterValue, kind));
else if( original.equals(afterValue))
// value was changed from x to y, then back to x. Therefore, no change
- map.remove(key);
+ attributeChanges.remove(key);
else
// value was changed from x to y to z.
// Before should remain x, after should become z
- map.put(key, new NodeDelta(original, afterValue, kind));
+ attributeChanges.put(key, new NodeDelta(original, afterValue, kind));
} else {
// added
- map.put(key, new NodeDelta(beforeValue, afterValue, kind));
+ attributeChanges.put(key, new NodeDelta(beforeValue, afterValue, kind));
}
}
/**
* A property has changed. Save the change so it can be represented in a delta
*/
- protected void propertyChanged(String key, Object beforeValue, Object afterValue) {
- HashMap<String, NodeDelta> changeMap = propertyChanges;
+ protected synchronized void propertyChanged(String key, Object beforeValue, Object afterValue) {
// short circuit if no change has REALLY occurred
if( beforeValue != null && beforeValue.equals(afterValue)) return;
- if( changeMap.containsKey(key)) {
+ if( propertyChanges.containsKey(key)) {
// element has already been added, removed, or changed since last save
- Object original = changeMap.get(key).getBefore();
+ Object original = propertyChanges.get(key).getBefore();
if( original == null && afterValue == null )
- changeMap.remove(key);
+ propertyChanges.remove(key);
else if( original == null )
- changeMap.put(key, new NodeDelta(original, afterValue, IArchiveNodeDelta.PROPERTY_ADDED));
+ propertyChanges.put(key, new NodeDelta(original, afterValue, IArchiveNodeDelta.PROPERTY_ADDED));
else if( original.equals(afterValue))
// value was changed from x to y, then back to x. Therefore, no change
- changeMap.remove(key);
+ propertyChanges.remove(key);
else if( afterValue == null ) {
// changed from x to y to null, so removed
- changeMap.put(key, new NodeDelta(original, afterValue, IArchiveNodeDelta.PROPERTY_REMOVED));
+ propertyChanges.put(key, new NodeDelta(original, afterValue, IArchiveNodeDelta.PROPERTY_REMOVED));
} else {
// changed from x to y to z, so changed
- changeMap.put(key, new NodeDelta(original, afterValue, IArchiveNodeDelta.PROPERTY_CHANGED));
+ propertyChanges.put(key, new NodeDelta(original, afterValue, IArchiveNodeDelta.PROPERTY_CHANGED));
}
} else {
int kind;
if( beforeValue == null ) kind = IArchiveNodeDelta.PROPERTY_ADDED;
else if( afterValue == null ) kind = IArchiveNodeDelta.PROPERTY_REMOVED;
else kind = IArchiveNodeDelta.PROPERTY_CHANGED;
- changeMap.put(key, new NodeDelta(beforeValue, afterValue, kind));
+ propertyChanges.put(key, new NodeDelta(beforeValue, afterValue, kind));
}
}
@@ -388,7 +399,7 @@
* @param node
* @param changeType
*/
- protected void childChanges(IArchiveNode node, int changeType) {
+ protected synchronized void childChanges(IArchiveNode node, int changeType) {
if( childChanges.containsKey(node)) {
int lastChange = childChanges.get(node).intValue();
if( lastChange == IArchiveNodeDelta.CHILD_ADDED && changeType == IArchiveNodeDelta.CHILD_REMOVED) {
@@ -406,14 +417,15 @@
* @see org.jboss.ide.eclipse.archives.core.model.IArchiveNode#getDelta()
*/
public IArchiveNodeDelta getDelta() {
- return new ArchiveNodeDeltaImpl(null, this, (HashMap<String, NodeDelta>)attributeChanges.clone(),
- (HashMap<String, NodeDelta>)propertyChanges.clone(), (HashMap<IArchiveNode, Integer>)childChanges.clone());
+ return new ArchiveNodeDeltaImpl(null, this, getAttributeChanges(),
+ getPropertyChanges(), getChildChanges());
}
+
/**
* Forget all past state
*/
- public void clearDelta() {
+ public synchronized void clearDelta() {
attributeChanges.clear();
propertyChanges.clear();
childChanges.clear();
12 years, 5 months
- 1
- 0
JBoss Tools SVN: r42873 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2012-08-07 05:29:20 -0400 (Tue, 07 Aug 2012)
New Revision: 42873
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java
Log:
Added support for 3.2 runtime.
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java 2012-08-07 08:40:14 UTC (rev 42872)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java 2012-08-07 09:29:20 UTC (rev 42873)
@@ -2,9 +2,9 @@
import static org.junit.Assert.fail;
-import org.eclipse.swtbot.swt.finder.SWTBot;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.config.TestConfigurator;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS32;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS42;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS50;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS51;
@@ -14,6 +14,7 @@
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform6x;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss32Runtime;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss42Runtime;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss50Runtime;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss51Runtime;
@@ -150,6 +151,9 @@
}
}
else if (TestConfigurator.Values.SERVER_TYPE_AS.equals(serverType)) {
+ if ("3.2".equals(version)) {
+ return new ServerInfo(JBossCommunityJBoss32Runtime.LABEL,JBossCommunityJBossAS32.LABEL);
+ }
if ("4.2".equals(version)) {
return new ServerInfo(JBossCommunityJBoss42Runtime.LABEL,JBossCommunityJBossAS42.LABEL);
}
12 years, 5 months
- 1
- 0
JBoss Tools SVN: r42872 - in branches/jbosstools-3.3.x/as/tests: org.jboss.ide.eclipse.as.ui.bot.test and 44 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mmalina
Date: 2012-08-07 04:40:14 -0400 (Tue, 07 Aug 2012)
New Revision: 42872
Added:
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.classpath
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.project
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/build.properties
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.classpath
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/.jsdtscope
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.jdt.core.prefs
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.container
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.name
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/WEB-INF/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/WEB-INF/lib/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/index.jsp
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/tests/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/tests/as/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/tests/as/HelloWorld.class
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/HelloWorld.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/eap-6.properties
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/NewFileWizard.java
Removed:
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.classpath
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/.jsdtscope
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.jdt.core.prefs
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.container
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.name
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/WEB-INF/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/WEB-INF/lib/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/index.jsp
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/tests/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/tests/as/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/tests/as/HelloWorld.class
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/HelloWorld.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/eap-6.properties
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java
branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/NewFileWizard.java
Log:
Merged AS bot tests from trunk to maintenance.
Property changes on: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test
___________________________________________________________________
Added: svn:ignore
+ bin
screenshots
Added: svn:mergeinfo
+ /trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test:41809-42871
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.classpath (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.classpath)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.classpath (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.classpath 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="resources"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.project (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.project)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.project (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/.project 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.ide.eclipse.as.ui.bot.test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Bot tests for AS component
-Bundle-SymbolicName: org.jboss.ide.eclipse.as.ui.bot.test;singleton:=true
-Bundle-Version: 2.4.0.qualifier
-Bundle-Activator: org.jboss.ide.eclipse.as.ui.bot.test.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0",
- org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0",
- org.eclipse.swtbot.swt.finder;bundle-version="2.0.0",
- org.apache.log4j;bundle-version="1.2.13",
- org.junit4;bundle-version="4.8.1",
- org.jboss.tools.ui.bot.ext;bundle-version="1.0.0",
- org.hamcrest;bundle-version="1.1.0",
- org.eclipse.ui.forms;bundle-version="3.5.0"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-Vendor: JBoss by Red Hat
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/META-INF/MANIFEST.MF 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Bot tests for AS component
+Bundle-SymbolicName: org.jboss.ide.eclipse.as.ui.bot.test;singleton:=true
+Bundle-Version: 2.3.1.qualifier
+Bundle-Activator: org.jboss.ide.eclipse.as.ui.bot.test.Activator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.swtbot.eclipse.core;bundle-version="2.0.0",
+ org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.0",
+ org.eclipse.swtbot.swt.finder;bundle-version="2.0.0",
+ org.apache.log4j;bundle-version="1.2.13",
+ org.junit4;bundle-version="4.8.1",
+ org.jboss.tools.ui.bot.ext;bundle-version="1.0.0",
+ org.hamcrest;bundle-version="1.1.0",
+ org.eclipse.ui.forms;bundle-version="3.5.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Vendor: JBoss by Red Hat
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/build.properties (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/build.properties)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/build.properties (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/build.properties 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,5 @@
+source.. = src/,\
+ resources/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="DISPLAY" value=":${string_prompt:display number:0}"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.ide.eclipse.as.ui.bot.test.AllTestsSuite"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.ide.eclipse.as.ui.bot.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=${file_prompt:"Please choose a SWTBot configuration file":${workspace_loc}/org.jboss.ide.eclipse.as.ui.bot.test/resources/generated_config_files} -Xmx1024m -XX:MaxPermSize=256m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_AllTestsSuite.launch 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":${string_prompt:display number:0}"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.ide.eclipse.as.ui.bot.test.AllTestsSuite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.ide.eclipse.as.ui.bot.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=${file_prompt:"Please choose a SWTBot configuration file":${workspace_loc}/org.jboss.ide.eclipse.as.ui.bot.test/resources/generated_config_files} -Xmx1024m -XX:MaxPermSize=256m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="DISPLAY" value=":${string_prompt:display number:0}"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.ide.eclipse.as.ui.bot.test.EAPCompatibilitySuite"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.ide.eclipse.as.ui.bot.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=${file_prompt:"Please choose a SWTBot configuration file":${workspace_loc}/org.jboss.ide.eclipse.as.ui.bot.test/resources/generated_config_files} -Xmx1024m -XX:MaxPermSize=256m"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/AS_EAPCompatibilitySuite.launch 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.swtbot.eclipse.ui.launcher.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="DISPLAY" value=":${string_prompt:display number:0}"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jboss.ide.eclipse.as.ui.bot.test.EAPCompatibilitySuite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jboss.ide.eclipse.as.ui.bot.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dswtbot.test.properties.file=${file_prompt:"Please choose a SWTBot configuration file":${workspace_loc}/org.jboss.ide.eclipse.as.ui.bot.test/resources/generated_config_files} -Xmx1024m -XX:MaxPermSize=256m"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
-<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-<stringAttribute key="M2_GOALS" value="clean process-resources"/>
-<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
-<booleanAttribute key="M2_OFFLINE" value="false"/>
-<stringAttribute key="M2_PROFILES" value=""/>
-<listAttribute key="M2_PROPERTIES">
-<listEntry value="eap-6.0=${folder_prompt:EAP 6.0 installation directory}"/>
-<listEntry value="jboss-as-5.1=${folder_prompt:JBoss AS 5.1 installation directory}"/>
-<listEntry value="jboss-as-6.1=${folder_prompt:JBoss AS 6.1 installation directory}"/>
-</listAttribute>
-<stringAttribute key="M2_RUNTIME" value="/home/ljelinko/programs/apache-maven-3.0.3"/>
-<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
-<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
-<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace}"/>
-</launchConfiguration>
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/as_portlets_prepare_workspace.launch 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="clean process-resources"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value=""/>
+<listAttribute key="M2_PROPERTIES">
+<listEntry value="eap-6.0=${folder_prompt:EAP 6.0 installation directory}"/>
+<listEntry value="jboss-as-5.1=${folder_prompt:JBoss AS 5.1 installation directory}"/>
+<listEntry value="jboss-as-6.1=${folder_prompt:JBoss AS 6.1 installation directory}"/>
+</listAttribute>
+<stringAttribute key="M2_RUNTIME" value="/home/ljelinko/programs/apache-maven-3.0.3"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace}"/>
+</launchConfiguration>
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <groupId>org.jboss.ide.eclipse.as.ui.bot.test</groupId>
- <artifactId>prepare.workspace</artifactId>
- <version>0.0.0-SNAPSHOT</version>
- <modelVersion>4.0.0</modelVersion>
-
- <build>
- <resources>
- <resource>
- <directory>../../resources/config_files_templates/product</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>../../resources/config_files_templates/project</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
- <outputDirectory>../../resources/generated_config_files</outputDirectory>
- </build>
-</project>
\ No newline at end of file
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/launchers/prepare_workspace/pom.xml 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <groupId>org.jboss.ide.eclipse.as.ui.bot.test</groupId>
+ <artifactId>prepare.workspace</artifactId>
+ <version>0.0.0-SNAPSHOT</version>
+ <modelVersion>4.0.0</modelVersion>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>../../resources/config_files_templates/product</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>../../resources/config_files_templates/project</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <outputDirectory>../../resources/generated_config_files</outputDirectory>
+ </build>
+</project>
\ No newline at end of file
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/pom.xml 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools.as</groupId>
+ <artifactId>tests</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.as.tests</groupId>
+ <artifactId>org.jboss.ide.eclipse.as.ui.bot.test</artifactId>
+
+ <packaging>eclipse-test-plugin</packaging>
+
+ <properties>
+ <jbosstools.test.jboss-as-7.1.home>${requirementsDirectory}/jboss-as-7.1.1.Final</jbosstools.test.jboss-as-7.1.home>
+ <jbosstools.test.jboss-as-7.1.url>http://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1...</jbosstools.test.jboss-as-7.1.url>
+ <jbosstools.test.jboss-as-7.1.md5>175c92545454f4e7270821f4b8326c4e</jbosstools.test.jboss-as-7.1.md5>
+ <configurations.dir>resources/project_config_files</configurations.dir>
+ <additionalSystemProperties></additionalSystemProperties>
+ <systemProperties>${additionalSystemProperties} -Djbosstools.test.jboss-as-7.1.home=${jbosstools.test.jboss-as-7.1.home} -Dtest.configurations.dir=${configurations.dir} -Dorg.eclipse.swtbot.screenshots.dir=${project.build.directory}/screenshots</systemProperties>
+ <test.class>org.jboss.ide.eclipse.as.ui.bot.test.AllTestsSuite</test.class>
+
+ </properties>
+
+ <profiles>
+ <profile>
+ <id>debug</id>
+ <properties>
+ <additionalSystemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y </additionalSystemProperties>
+ </properties>
+ </profile>
+ <profile>
+ <id>osx</id>
+ <activation>
+ <property>
+ <name>java.vendor.url</name>
+ <value>http://www.apple.com/</value>
+ </property>
+ </activation>
+ <properties>
+ <!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
+ <platformSystemProperties> -d32 -Dosgi.arch=x86 -XstartOnFirstThread -Dorg.eclipse.swtbot.keyboard.layout=MAC_EN_US</platformSystemProperties>
+ </properties>
+ </profile>
+ </profiles>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>maven-download-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-as-7.1.1</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+ <url>${jbosstools.test.jboss-as-7.1.url}</url>
+ <md5>${jbosstools.test.jboss-as-7.1.md5}</md5>
+ <unpack>true</unpack>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <useUIThread>false</useUIThread>
+ <surefire.timeout>7200</surefire.timeout>
+ <forkedProcessTimeoutInSeconds>7200</forkedProcessTimeoutInSeconds>
+ <testSuite>org.jboss.ide.eclipse.as.ui.bot.test</testSuite>
+ <testClass>${test.class}</testClass>
+ <skip>${swtbot.test.skip}</skip>
+ <dependencies combine.children="append">
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.ide.eclipse.as.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <ignoreTychoRepositories>true</ignoreTychoRepositories>
+ <environments>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.classpath
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.classpath 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.classpath 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
- <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
- <attributes>
- <attribute name="owner.project.facets" value="java"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="build/classes"/>
-</classpath>
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.classpath (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.classpath)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.classpath (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.classpath 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>jsp-project</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
- </natures>
-</projectDescription>
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.project 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jsp-project</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/.jsdtscope
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/.jsdtscope 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/.jsdtscope 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="WebContent"/>
- <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
- <attributes>
- <attribute name="hide" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
- <classpathentry kind="output" path=""/>
-</classpath>
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/.jsdtscope (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/.jsdtscope)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/.jsdtscope (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/.jsdtscope 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.jdt.core.prefs 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.jdt.core.prefs 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.jdt.core.prefs (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.jdt.core.prefs)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.jdt.core.prefs 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="jsp-project">
- <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
- <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
- <property name="context-root" value="jsp-project"/>
- <property name="java-output-path" value="/jsp-project/build/classes"/>
- </wb-module>
-</project-modules>
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.component 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="jsp-project">
+ <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+ <property name="context-root" value="jsp-project"/>
+ <property name="java-output-path" value="/jsp-project/build/classes"/>
+ </wb-module>
+</project-modules>
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
- <fixed facet="jst.web"/>
- <fixed facet="java"/>
- <fixed facet="wst.jsdt.web"/>
- <installed facet="java" version="1.6"/>
- <installed facet="wst.jsdt.web" version="1.0"/>
- <installed facet="jst.web" version="2.5"/>
-</faceted-project>
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <fixed facet="jst.web"/>
+ <fixed facet="java"/>
+ <fixed facet="wst.jsdt.web"/>
+ <installed facet="java" version="1.6"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+ <installed facet="jst.web" version="2.5"/>
+</faceted-project>
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1 +0,0 @@
-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.container (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.container)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1 +0,0 @@
-Window
\ No newline at end of file
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.name (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.name)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/MANIFEST.MF 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/MANIFEST.MF 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/MANIFEST.MF (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/MANIFEST.MF)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/META-INF/MANIFEST.MF 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/index.jsp
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/index.jsp 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/index.jsp 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,6 +0,0 @@
-<%@ page language="java" import="org.jboss.tools.tests.as.*" errorPage="" %>
-<html>
-<body>
- <%=HelloWorld.sayHello()%>
-</body>
-</html>
\ No newline at end of file
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/index.jsp (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/index.jsp)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/index.jsp (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/WebContent/index.jsp 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,6 @@
+<%@ page language="java" import="org.jboss.tools.tests.as.*" errorPage="" %>
+<html>
+<body>
+ <%=HelloWorld.sayHello()%>
+</body>
+</html>
\ No newline at end of file
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/tests/as/HelloWorld.class
===================================================================
(Binary files differ)
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/tests/as/HelloWorld.class (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/build/classes/org/jboss/tools/tests/as/HelloWorld.class)
===================================================================
(Binary files differ)
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/HelloWorld.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/HelloWorld.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/HelloWorld.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,8 +0,0 @@
-package org.jboss.tools.tests.as;
-
-public class HelloWorld {
-
- public static String sayHello(){
- return "Hello tests!";
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/HelloWorld.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/HelloWorld.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/HelloWorld.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/projects/jsp-project/src/org/jboss/tools/tests/as/HelloWorld.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,8 @@
+package org.jboss.tools.tests.as;
+
+public class HelloWorld {
+
+ public static String sayHello(){
+ return "Hello tests!";
+ }
+}
Property changes on: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources
___________________________________________________________________
Added: svn:ignore
+ generated_config_files
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1 +0,0 @@
-SERVER=EAP,6.0,default,${eap-6.0}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/product/eap-6.properties 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1 @@
+SERVER=EAP,6.0,default,${eap-6.0}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1 +0,0 @@
-SERVER=AS,4.2,default,${jboss-as-4.2}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-4.properties 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1 @@
+SERVER=AS,4.2,default,${jboss-as-4.2}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1 +0,0 @@
-SERVER=AS,5.1,default,${jboss-as-5.1}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-5.properties 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1 @@
+SERVER=AS,5.1,default,${jboss-as-5.1}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1 +0,0 @@
-SERVER=AS,6.1,default,${jboss-as-6.1}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/config_files_templates/project/jbossas-6.properties 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1 @@
+SERVER=AS,6.1,default,${jboss-as-6.1}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/eap-6.properties
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/eap-6.properties 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/eap-6.properties 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1 +0,0 @@
-SERVER=EAP,6.0,default,${jbosstools.test.jboss-as-7.1.home}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/eap-6.properties (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/eap-6.properties)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/eap-6.properties (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/resources/project_config_files/eap-6.properties 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1 @@
+SERVER=EAP,6.0,default,${jbosstools.test.jboss-as-7.1.home}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,32 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
- public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.ui.bot.test";
-
- private static BundleContext context;
-
- static BundleContext getContext() {
- return context;
- }
-
- /*
- * (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext bundleContext) throws Exception {
- Activator.context = bundleContext;
- }
-
- /*
- * (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext bundleContext) throws Exception {
- Activator.context = null;
- }
-
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/Activator.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,32 @@
+package org.jboss.ide.eclipse.as.ui.bot.test;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.ui.bot.test";
+
+ private static BundleContext context;
+
+ static BundleContext getContext() {
+ return context;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext bundleContext) throws Exception {
+ Activator.context = bundleContext;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext bundleContext) throws Exception {
+ Activator.context = null;
+ }
+
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,48 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.as4.CreateAS4Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as4.DeployJSPProjectAS4Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as4.OperateAS4Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as4.UndeployJSPProjectAS4Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as5.CreateAS5Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as5.DeployJSPProjectAS5Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as5.OperateAS5Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as5.UndeployJSPProjectAS5Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as6.CreateAS6Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as6.DeployJSPProjectAS6Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as6.OperateAS6Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as6.UndeployJSPProjectAS6Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.OperateAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProjectAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer;
-import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFile;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-(a)RunWith(RequirementAwareSuite.class)
-(a)Suite.SuiteClasses({
- CreateAS7Server.class,
- CreateAS6Server.class,
- CreateAS5Server.class,
- CreateAS4Server.class,
- OperateAS7Server.class,
- OperateAS6Server.class,
- OperateAS5Server.class,
- OperateAS4Server.class,
- DeployJSPProjectAS7Server.class,
- DeployJSPProjectAS6Server.class,
- DeployJSPProjectAS5Server.class,
- DeployJSPProjectAS4Server.class,
- HotDeployJSPFile.class,
- UndeployJSPProjectAS7Server.class,
- UndeployJSPProjectAS6Server.class,
- UndeployJSPProjectAS5Server.class,
- UndeployJSPProjectAS4Server.class,
- DeleteServer.class
-})
-public class AllTestsSuite {
-
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/AllTestsSuite.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,48 @@
+package org.jboss.ide.eclipse.as.ui.bot.test;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.as4.CreateAS4Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as4.DeployJSPProjectAS4Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as4.OperateAS4Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as4.UndeployJSPProjectAS4Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as5.CreateAS5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as5.DeployJSPProjectAS5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as5.OperateAS5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as5.UndeployJSPProjectAS5Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.CreateAS6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.DeployJSPProjectAS6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.OperateAS6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as6.UndeployJSPProjectAS6Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.OperateAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProjectAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFile;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+(a)RunWith(RequirementAwareSuite.class)
+(a)Suite.SuiteClasses({
+ CreateAS7Server.class,
+ CreateAS6Server.class,
+ CreateAS5Server.class,
+ CreateAS4Server.class,
+ OperateAS7Server.class,
+ OperateAS6Server.class,
+ OperateAS5Server.class,
+ OperateAS4Server.class,
+ DeployJSPProjectAS7Server.class,
+ DeployJSPProjectAS6Server.class,
+ DeployJSPProjectAS5Server.class,
+ DeployJSPProjectAS4Server.class,
+ HotDeployJSPFile.class,
+ UndeployJSPProjectAS7Server.class,
+ UndeployJSPProjectAS6Server.class,
+ UndeployJSPProjectAS5Server.class,
+ UndeployJSPProjectAS4Server.class,
+ DeleteServer.class
+})
+public class AllTestsSuite {
+
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,24 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.OperateAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProjectAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer;
-import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFile;
-import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-(a)RunWith(RequirementAwareSuite.class)
-(a)Suite.SuiteClasses({
- CreateAS7Server.class,
- OperateAS7Server.class,
- DeployJSPProjectAS7Server.class,
- HotDeployJSPFile.class,
- UndeployJSPProjectAS7Server.class,
- DeleteServer.class
-})
-public class EAPCompatibilitySuite {
-
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/EAPCompatibilitySuite.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,24 @@
+package org.jboss.ide.eclipse.as.ui.bot.test;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.CreateAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.OperateAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.UndeployJSPProjectAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeleteServer;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.HotDeployJSPFile;
+import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+(a)RunWith(RequirementAwareSuite.class)
+(a)Suite.SuiteClasses({
+ CreateAS7Server.class,
+ OperateAS7Server.class,
+ DeployJSPProjectAS7Server.class,
+ HotDeployJSPFile.class,
+ UndeployJSPProjectAS7Server.class,
+ DeleteServer.class
+})
+public class EAPCompatibilitySuite {
+
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,44 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as4;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-
-import java.util.List;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
-
-/**
-*
-* @see CreateServerTemplate
-* @author Lucia Jelinkova
-*
-*/
-@Require(server=(a)Server(type=ServerType.JbossAS, version="4.2", state=ServerState.Present))
-public class CreateAS4Server extends CreateServerTemplate {
-
- @Override
- protected void assertEditorPorts() {
- assertThat("8080", is(editor.getWebPort()));
- assertThat("1099", is(editor.getJNDIPort()));
- }
-
- @Override
- protected void assertViewPorts(List<XMLConfiguration> configurations) {
- for (XMLConfiguration config : configurations){
- assertValueIsNumber(config);
- }
- }
-
- private void assertValueIsNumber(XMLConfiguration config){
- try {
- Integer.parseInt(config.getValue());
- } catch (NumberFormatException e){
- fail(config + " does not a numeric value");
- }
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/CreateAS4Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,44 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as4;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
+
+/**
+*
+* @see CreateServerTemplate
+* @author Lucia Jelinkova
+*
+*/
+@Require(server=(a)Server(type=ServerType.JbossAS, version="4.2", state=ServerState.Present))
+public class CreateAS4Server extends CreateServerTemplate {
+
+ @Override
+ protected void assertEditorPorts() {
+ assertThat("8080", is(editor.getWebPort()));
+ assertThat("1099", is(editor.getJNDIPort()));
+ }
+
+ @Override
+ protected void assertViewPorts(List<XMLConfiguration> configurations) {
+ for (XMLConfiguration config : configurations){
+ assertValueIsNumber(config);
+ }
+ }
+
+ private void assertValueIsNumber(XMLConfiguration config){
+ try {
+ Integer.parseInt(config.getValue());
+ } catch (NumberFormatException e){
+ fail(config + " does not a numeric value");
+ }
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as4;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-
-/**
- * @see DeployJSPProjectTemplate
- * @author Lucia Jelinkova
- *
- */
-@Require(server=(a)Server(type=ServerType.JbossAS, version="4.2", state=ServerState.Running))
-public class DeployJSPProjectAS4Server extends DeployJSPProjectTemplate {
-
- @Override
- protected String getConsoleMessage() {
- return "deploy, ctxPath=/" + PROJECT_NAME;
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/DeployJSPProjectAS4Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as4;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see DeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="4.2", state=ServerState.Running))
+public class DeployJSPProjectAS4Server extends DeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "deploy, ctxPath=/" + PROJECT_NAME;
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as4;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-
-/**
- * @see OperateServerTemplate
- * @author Lucia Jelinkova
- *
- */
-@Require(server=(a)Server(type=ServerType.JbossAS, version="4.2", state=ServerState.NotRunning))
-public class OperateAS4Server extends OperateServerTemplate {
-
- @Override
- public String getWelcomePageText() {
- return "Manage this JBoss AS Instance";
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/OperateAS4Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as4;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see OperateServerTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="4.2", state=ServerState.NotRunning))
+public class OperateAS4Server extends OperateServerTemplate {
+
+ @Override
+ public String getWelcomePageText() {
+ return "Manage this JBoss AS Instance";
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,22 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as4;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
-import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-
-/**
- * @see UndeployJSPProjectTemplate
- * @author Lucia Jelinkova
- *
- */
-@Require(server=(a)Server(type=ServerType.JbossAS, version="4.2", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
-public class UndeployJSPProjectAS4Server extends UndeployJSPProjectTemplate {
-
- @Override
- protected String getConsoleMessage() {
- return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as4/UndeployJSPProjectAS4Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as4;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see UndeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="4.2", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS4Server extends UndeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,44 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as5;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-
-import java.util.List;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
-
-/**
-*
-* @see CreateServerTemplate
-* @author Lucia Jelinkova
-*
-*/
-@Require(server=(a)Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Present))
-public class CreateAS5Server extends CreateServerTemplate {
-
- @Override
- protected void assertEditorPorts() {
- assertThat("8080", is(editor.getWebPort()));
- assertThat("1099", is(editor.getJNDIPort()));
- }
-
- @Override
- protected void assertViewPorts(List<XMLConfiguration> configurations) {
- for (XMLConfiguration config : configurations){
- assertValueIsNumber(config);
- }
- }
-
- private void assertValueIsNumber(XMLConfiguration config){
- try {
- Integer.parseInt(config.getValue());
- } catch (NumberFormatException e){
- fail(config + " does not a numeric value");
- }
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/CreateAS5Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,44 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as5;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
+
+/**
+*
+* @see CreateServerTemplate
+* @author Lucia Jelinkova
+*
+*/
+@Require(server=(a)Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Present))
+public class CreateAS5Server extends CreateServerTemplate {
+
+ @Override
+ protected void assertEditorPorts() {
+ assertThat("8080", is(editor.getWebPort()));
+ assertThat("1099", is(editor.getJNDIPort()));
+ }
+
+ @Override
+ protected void assertViewPorts(List<XMLConfiguration> configurations) {
+ for (XMLConfiguration config : configurations){
+ assertValueIsNumber(config);
+ }
+ }
+
+ private void assertValueIsNumber(XMLConfiguration config){
+ try {
+ Integer.parseInt(config.getValue());
+ } catch (NumberFormatException e){
+ fail(config + " does not a numeric value");
+ }
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as5;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-
-/**
- * @see DeployJSPProjectTemplate
- * @author Lucia Jelinkova
- *
- */
-@Require(server=(a)Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Running))
-public class DeployJSPProjectAS5Server extends DeployJSPProjectTemplate {
-
- @Override
- protected String getConsoleMessage() {
- return "deploy, ctxPath=/" + PROJECT_NAME;
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/DeployJSPProjectAS5Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as5;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see DeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Running))
+public class DeployJSPProjectAS5Server extends DeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "deploy, ctxPath=/" + PROJECT_NAME;
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as5;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-
-/**
- * @see OperateServerTemplate
- * @author Lucia Jelinkova
- *
- */
-@Require(server=(a)Server(type=ServerType.JbossAS, version="5.1", state=ServerState.NotRunning))
-public class OperateAS5Server extends OperateServerTemplate {
-
- @Override
- public String getWelcomePageText() {
- return "Manage this JBoss AS Instance";
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/OperateAS5Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as5;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see OperateServerTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="5.1", state=ServerState.NotRunning))
+public class OperateAS5Server extends OperateServerTemplate {
+
+ @Override
+ public String getWelcomePageText() {
+ return "Manage this JBoss AS Instance";
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,22 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as5;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
-import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-
-/**
- * @see UndeployJSPProjectTemplate
- * @author Lucia Jelinkova
- *
- */
-@Require(server=(a)Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
-public class UndeployJSPProjectAS5Server extends UndeployJSPProjectTemplate {
-
- @Override
- protected String getConsoleMessage() {
- return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as5/UndeployJSPProjectAS5Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as5;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see UndeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="5.1", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS5Server extends UndeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,45 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as6;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-
-import java.util.List;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
-
-/**
-*
-* @see CreateServerTemplate
-* @author Lucia Jelinkova
-*
-*/
-@Require(server=(a)Server(type=ServerType.JbossAS, version="6.1", state=ServerState.Present))
-public class CreateAS6Server extends CreateServerTemplate {
-
- @Override
- protected void assertEditorPorts() {
- assertThat("8080", is(editor.getWebPort()));
- assertThat("1099", is(editor.getJNDIPort()));
- assertThat("1090", is(editor.getJMXPort()));
- }
-
- @Override
- protected void assertViewPorts(List<XMLConfiguration> configurations) {
- for (XMLConfiguration config : configurations){
- assertValueIsNumber(config);
- }
- }
-
- private void assertValueIsNumber(XMLConfiguration config){
- try {
- Integer.parseInt(config.getValue());
- } catch (NumberFormatException e){
- fail(config + " does not a numeric value");
- }
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/CreateAS6Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,45 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as6;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
+
+/**
+*
+* @see CreateServerTemplate
+* @author Lucia Jelinkova
+*
+*/
+@Require(server=(a)Server(type=ServerType.JbossAS, version="6.1", state=ServerState.Present))
+public class CreateAS6Server extends CreateServerTemplate {
+
+ @Override
+ protected void assertEditorPorts() {
+ assertThat("8080", is(editor.getWebPort()));
+ assertThat("1099", is(editor.getJNDIPort()));
+ assertThat("1090", is(editor.getJMXPort()));
+ }
+
+ @Override
+ protected void assertViewPorts(List<XMLConfiguration> configurations) {
+ for (XMLConfiguration config : configurations){
+ assertValueIsNumber(config);
+ }
+ }
+
+ private void assertValueIsNumber(XMLConfiguration config){
+ try {
+ Integer.parseInt(config.getValue());
+ } catch (NumberFormatException e){
+ fail(config + " does not a numeric value");
+ }
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as6;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-
-/**
- * @see DeployJSPProjectTemplate
- * @author Lucia Jelinkova
- *
- */
-@Require(server=(a)Server(type=ServerType.JbossAS, version="6.1", state=ServerState.Running))
-public class DeployJSPProjectAS6Server extends DeployJSPProjectTemplate {
-
- @Override
- protected String getConsoleMessage() {
- return "deploy, ctxPath=/" + PROJECT_NAME;
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/DeployJSPProjectAS6Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as6;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see DeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="6.1", state=ServerState.Running))
+public class DeployJSPProjectAS6Server extends DeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "deploy, ctxPath=/" + PROJECT_NAME;
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as6;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-
-/**
- * @see OperateServerTemplate
- * @author Lucia Jelinkova
- *
- */
-@Require(server=(a)Server(type=ServerType.JbossAS, version="6.1", state=ServerState.NotRunning))
-public class OperateAS6Server extends OperateServerTemplate {
-
- @Override
- public String getWelcomePageText() {
- return "Manage this JBoss AS Instance";
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/OperateAS6Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as6;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see OperateServerTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="6.1", state=ServerState.NotRunning))
+public class OperateAS6Server extends OperateServerTemplate {
+
+ @Override
+ public String getWelcomePageText() {
+ return "Manage this JBoss AS Instance";
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,22 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as6;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
-import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-
-/**
- * @see UndeployJSPProjectTemplate
- * @author Lucia Jelinkova
- *
- */
-@Require(server=(a)Server(type=ServerType.JbossAS, version="6.1", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
-public class UndeployJSPProjectAS6Server extends UndeployJSPProjectTemplate {
-
- @Override
- protected String getConsoleMessage() {
- return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as6/UndeployJSPProjectAS6Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as6;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see UndeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.JbossAS, version="6.1", state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS6Server extends UndeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "undeploy, ctxPath=/" + DeployJSPProjectTemplate.PROJECT_NAME;
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,36 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as7;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.is;
-
-import java.util.List;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
-
-/**
- *
- * @see CreateServerTemplate
- * @author Lucia Jelinkova
- *
- */
-@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.Present))
-public class CreateAS7Server extends CreateServerTemplate {
-
- @Override
- protected void assertEditorPorts() {
- assertThat("8080", is(editor.getWebPort()));
- assertThat("9999", is(editor.getManagementPort()));
- }
-
- @Override
- protected void assertViewPorts(List<XMLConfiguration> configurations) {
- assertThat(configurations, hasItem(new XMLConfiguration("JBoss Management", "${jboss.management.native.port:9999}")));
- assertThat(configurations, hasItem(new XMLConfiguration("JBoss Web", "8080")));
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/CreateAS7Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,36 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as7;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.is;
+
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.CreateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
+
+/**
+ *
+ * @see CreateServerTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.Present))
+public class CreateAS7Server extends CreateServerTemplate {
+
+ @Override
+ protected void assertEditorPorts() {
+ assertThat("8080", is(editor.getWebPort()));
+ assertThat("9999", is(editor.getManagementPort()));
+ }
+
+ @Override
+ protected void assertViewPorts(List<XMLConfiguration> configurations) {
+ assertThat(configurations, hasItem(new XMLConfiguration("JBoss Management", "${jboss.management.native.port:9999}")));
+ assertThat(configurations, hasItem(new XMLConfiguration("JBoss Web", "8080")));
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,21 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as7;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-
-/**
- * @see DeployJSPProjectTemplate
- * @author Lucia Jelinkova
- *
- */
-@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.Running))
-public class DeployJSPProjectAS7Server extends DeployJSPProjectTemplate {
-
- @Override
- protected String getConsoleMessage() {
- return "Registering web context: /" + PROJECT_NAME;
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/DeployJSPProjectAS7Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,21 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as7;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see DeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.Running))
+public class DeployJSPProjectAS7Server extends DeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "Registering web context: /" + PROJECT_NAME;
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,22 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as7;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-
-/**
- *
- * @see OperateServerTemplate
- * @author Lucia Jelinkova
- *
- */
-@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.NotRunning))
-public class OperateAS7Server extends OperateServerTemplate {
-
- @Override
- public String getWelcomePageText() {
- return "Welcome to EAP 6";
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/OperateAS7Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as7;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.OperateServerTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ *
+ * @see OperateServerTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.NotRunning))
+public class OperateAS7Server extends OperateServerTemplate {
+
+ @Override
+ public String getWelcomePageText() {
+ return "Welcome to EAP 6";
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,22 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.as7;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
-import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
-
-/**
- * @see UndeployJSPProjectTemplate
- * @author Lucia Jelinkova
- *
- */
-@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.Running), clearProjects=false, clearWorkspace=false)
-public class UndeployJSPProjectAS7Server extends UndeployJSPProjectTemplate {
-
- @Override
- protected String getConsoleMessage() {
- return "Undeployed \"" + DeployJSPProjectTemplate.PROJECT_NAME + ".war\"";
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/as7/UndeployJSPProjectAS7Server.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,22 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.as7;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.template.DeployJSPProjectTemplate;
+import org.jboss.ide.eclipse.as.ui.bot.test.template.UndeployJSPProjectTemplate;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
+
+/**
+ * @see UndeployJSPProjectTemplate
+ * @author Lucia Jelinkova
+ *
+ */
+@Require(server=(a)Server(type=ServerType.EAP, state=ServerState.Running), clearProjects=false, clearWorkspace=false)
+public class UndeployJSPProjectAS7Server extends UndeployJSPProjectTemplate {
+
+ @Override
+ protected String getConsoleMessage() {
+ return "Undeployed \"" + DeployJSPProjectTemplate.PROJECT_NAME + ".war\"";
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,42 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.editor;
-
-import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-
-public class ServerEditor {
-
- private ServersView serversView = new ServersView();
-
- private String name;
-
- public ServerEditor(String name) {
- super();
- this.name = name;
- }
-
- public void open(){
- serversView.openServerEditor(name);
- }
-
- public ServerLaunchConfiguration openLaunchConfiguration(){
- SWTBotFactory.getBot().hyperlink("Open launch configuration").click();
- SWTBotFactory.getBot().shell("Edit Configuration").activate();
- return new ServerLaunchConfiguration();
- }
-
- public String getWebPort(){
- return SWTBotFactory.getBot().textWithLabel("Web").getText();
- }
-
- public String getJNDIPort(){
- return SWTBotFactory.getBot().textWithLabel("JNDI").getText();
- }
-
- public String getJMXPort(){
- return SWTBotFactory.getBot().textWithLabel("JMX RMI").getText();
- }
-
- public String getManagementPort(){
- return SWTBotFactory.getBot().textWithLabel("Management").getText();
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerEditor.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,42 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.editor;
+
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+
+public class ServerEditor {
+
+ private ServersView serversView = new ServersView();
+
+ private String name;
+
+ public ServerEditor(String name) {
+ super();
+ this.name = name;
+ }
+
+ public void open(){
+ serversView.openServerEditor(name);
+ }
+
+ public ServerLaunchConfiguration openLaunchConfiguration(){
+ SWTBotFactory.getBot().hyperlink("Open launch configuration").click();
+ SWTBotFactory.getBot().shell("Edit Configuration").activate();
+ return new ServerLaunchConfiguration();
+ }
+
+ public String getWebPort(){
+ return SWTBotFactory.getBot().textWithLabel("Web").getText();
+ }
+
+ public String getJNDIPort(){
+ return SWTBotFactory.getBot().textWithLabel("JNDI").getText();
+ }
+
+ public String getJMXPort(){
+ return SWTBotFactory.getBot().textWithLabel("JMX RMI").getText();
+ }
+
+ public String getManagementPort(){
+ return SWTBotFactory.getBot().textWithLabel("Management").getText();
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,14 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.editor;
-
-import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-
-public class ServerLaunchConfiguration {
-
- public String getProgramArguments(){
- return SWTBotFactory.getBot().textInGroup("Program arguments:").getText();
- }
-
- public String getVMArguments(){
- return SWTBotFactory.getBot().textInGroup("VM arguments:").getText();
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/editor/ServerLaunchConfiguration.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,14 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.editor;
+
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+
+public class ServerLaunchConfiguration {
+
+ public String getProgramArguments(){
+ return SWTBotFactory.getBot().textInGroup("Program arguments:").getText();
+ }
+
+ public String getVMArguments(){
+ return SWTBotFactory.getBot().textInGroup("VM arguments:").getText();
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,36 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.template;
-
-import java.util.List;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.editor.ServerEditor;
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Test;
-
-/**
- * Creates server and checks its ports (in both the server view and server editor)
- *
- * @author Lucia Jelinkova
- *
- */
-public abstract class CreateServerTemplate extends SWTTestExt {
-
- protected ServerEditor editor;
-
- protected abstract void assertEditorPorts();
-
- protected abstract void assertViewPorts(List<XMLConfiguration> configurations);
-
- @Test
- public void createServer(){
- editor = new ServerEditor(configuredState.getServer().name);
- editor.open();
-
- assertEditorPorts();
-
- ServersView view = new ServersView();
- List<XMLConfiguration> configurations = view.getXMLConfiguration(configuredState.getServer().name, "Ports");
- assertViewPorts(configurations);
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/CreateServerTemplate.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,36 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import java.util.List;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.editor.ServerEditor;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.entity.XMLConfiguration;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Test;
+
+/**
+ * Creates server and checks its ports (in both the server view and server editor)
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class CreateServerTemplate extends SWTTestExt {
+
+ protected ServerEditor editor;
+
+ protected abstract void assertEditorPorts();
+
+ protected abstract void assertViewPorts(List<XMLConfiguration> configurations);
+
+ @Test
+ public void createServer(){
+ editor = new ServerEditor(configuredState.getServer().name);
+ editor.open();
+
+ assertEditorPorts();
+
+ ServersView view = new ServersView();
+ List<XMLConfiguration> configurations = view.getXMLConfiguration(configuredState.getServer().name, "Ports");
+ assertViewPorts(configurations);
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,23 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.template;
-
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Test;
-
-/**
- * Deletes the server and checks that it is not present on the server's view.
- *
- * @author Lucia Jelinkova
- *
- */
-public class DeleteServer extends SWTTestExt {
-
- private ServersView serversView = new ServersView();
-
- @Test
- public void deleteServer(){
- serversView.deleteServer(configuredState.getServer().name);
-
- assertFalse(serversView.serverExists(configuredState.getServer().name));
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeleteServer.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,23 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Test;
+
+/**
+ * Deletes the server and checks that it is not present on the server's view.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class DeleteServer extends SWTTestExt {
+
+ private ServersView serversView = new ServersView();
+
+ @Test
+ public void deleteServer(){
+ serversView.deleteServer(configuredState.getServer().name);
+
+ assertFalse(serversView.serverExists(configuredState.getServer().name));
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,61 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.template;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.not;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.Activator;
-import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
-import org.jboss.ide.eclipse.as.ui.bot.test.wizard.ImportProjectWizard;
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.SWTUtilExt;
-import org.jboss.tools.ui.bot.ext.condition.NonSystemJobRunsCondition;
-import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
-import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Imports pre-prepared JSP project and adds it into the server. Checks:
- *
- * <ul>
- * <li>the console output</li>
- * <li>server's label</li>
- * <li>project is listed under the server</li>
- * <li>the index.jsp of the project</li>
- * </ul>
- * @author Lucia Jelinkova
- *
- */
-public abstract class DeployJSPProjectTemplate extends SWTTestExt {
-
- public static final String PROJECT_NAME = "jsp-project";
-
- protected abstract String getConsoleMessage();
-
- @Before
- public void importProject(){
- ImportProjectWizard wizard = new ImportProjectWizard();
- wizard.setCopyProjectsIntoWorkspace(true);
- wizard.setProjectPath(SWTUtilExt.getPathToFileWithinPlugin(Activator.PLUGIN_ID, "projects"));
- wizard.setProjectNames(PROJECT_NAME);
- wizard.execute();
- }
-
- @Test
- public void deployProject(){
- ServersView serversView = new ServersView();
- serversView.addProjectToServer(PROJECT_NAME, configuredState.getServer().name);
-
- // web
- serversView.openWebPage(configuredState.getServer().name, PROJECT_NAME);
- assertThat("Hello tests!", new PageSourceMatcher());
- // console
- assertThat(getConsoleMessage(), new ConsoleOutputMatcher(TaskDuration.NORMAL));
- assertThat("Exception:", not(new ConsoleOutputMatcher()));
- // view
- assertTrue("Server contains project", serversView.containsProject(configuredState.getServer().name, PROJECT_NAME));
- assertEquals("Started", serversView.getServerStatus(configuredState.getServer().name));
- assertEquals("Synchronized", serversView.getServerPublishStatus(configuredState.getServer().name));
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/DeployJSPProjectTemplate.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,61 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.not;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.Activator;
+import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
+import org.jboss.ide.eclipse.as.ui.bot.test.wizard.ImportProjectWizard;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.SWTUtilExt;
+import org.jboss.tools.ui.bot.ext.condition.NonSystemJobRunsCondition;
+import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
+import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Imports pre-prepared JSP project and adds it into the server. Checks:
+ *
+ * <ul>
+ * <li>the console output</li>
+ * <li>server's label</li>
+ * <li>project is listed under the server</li>
+ * <li>the index.jsp of the project</li>
+ * </ul>
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class DeployJSPProjectTemplate extends SWTTestExt {
+
+ public static final String PROJECT_NAME = "jsp-project";
+
+ protected abstract String getConsoleMessage();
+
+ @Before
+ public void importProject(){
+ ImportProjectWizard wizard = new ImportProjectWizard();
+ wizard.setCopyProjectsIntoWorkspace(true);
+ wizard.setProjectPath(SWTUtilExt.getPathToFileWithinPlugin(Activator.PLUGIN_ID, "projects"));
+ wizard.setProjectNames(PROJECT_NAME);
+ wizard.execute();
+ }
+
+ @Test
+ public void deployProject(){
+ ServersView serversView = new ServersView();
+ serversView.addProjectToServer(PROJECT_NAME, configuredState.getServer().name);
+
+ // web
+ serversView.openWebPage(configuredState.getServer().name, PROJECT_NAME);
+ assertThat("Hello tests!", new PageSourceMatcher());
+ // console
+ assertThat(getConsoleMessage(), new ConsoleOutputMatcher(TaskDuration.NORMAL));
+ assertThat("Exception:", not(new ConsoleOutputMatcher()));
+ // view
+ assertTrue("Server contains project", serversView.containsProject(configuredState.getServer().name, PROJECT_NAME));
+ assertEquals("Started", serversView.getServerStatus(configuredState.getServer().name));
+ assertEquals("Synchronized", serversView.getServerPublishStatus(configuredState.getServer().name));
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,37 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.template;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
-import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
-import org.jboss.ide.eclipse.as.ui.bot.test.wizard.NewFileWizard;
-import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.junit.Test;
-
-/**
- * Adds a new jsp file into the jsp project and checks it is hot deployed:
- * <ul>
- * <li>loads the new page in the web browser </li>
- * </ul>
- * @author Lucia Jelinkova
- *
- */
-public class HotDeployJSPFile extends SWTTestExt {
-
- public static final String JSP_CONTENT =
- "<%@ page language=\"java\" contentType=\"text/html; charset=UTF-8\" pageEncoding=\"UTF-8\"%> \n" +
- "<html> <body> Hot deployment </body> </html>";
-
- @Test
- public void hotDeployment(){
- NewFileWizard wizard = new NewFileWizard();
- wizard.setPath(DeployJSPProjectAS7Server.PROJECT_NAME, "WebContent");
- wizard.setFileName("hot.jsp");
- wizard.setText(JSP_CONTENT);
- wizard.execute();
-
- SWTBotFactory.getBot().sleep(5000);
- assertThat("Hot deployment", new PageSourceMatcher("http://localhost:8080/" + DeployJSPProjectAS7Server.PROJECT_NAME + "/hot.jsp"));
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/HotDeployJSPFile.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,37 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
+import org.jboss.ide.eclipse.as.ui.bot.test.web.PageSourceMatcher;
+import org.jboss.ide.eclipse.as.ui.bot.test.wizard.NewFileWizard;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.junit.Test;
+
+/**
+ * Adds a new jsp file into the jsp project and checks it is hot deployed:
+ * <ul>
+ * <li>loads the new page in the web browser </li>
+ * </ul>
+ * @author Lucia Jelinkova
+ *
+ */
+public class HotDeployJSPFile extends SWTTestExt {
+
+ public static final String JSP_CONTENT =
+ "<%@ page language=\"java\" contentType=\"text/html; charset=UTF-8\" pageEncoding=\"UTF-8\"%> \n" +
+ "<html> <body> Hot deployment </body> </html>";
+
+ @Test
+ public void hotDeployment(){
+ NewFileWizard wizard = new NewFileWizard();
+ wizard.setPath(DeployJSPProjectAS7Server.PROJECT_NAME, "WebContent");
+ wizard.setFileName("hot.jsp");
+ wizard.setText(JSP_CONTENT);
+ wizard.execute();
+
+ SWTBotFactory.getBot().sleep(5000);
+ assertThat("Hot deployment", new PageSourceMatcher("http://localhost:8080/" + DeployJSPProjectAS7Server.PROJECT_NAME + "/hot.jsp"));
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,76 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.template;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
-
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Test;
-
-/**
- * Starts, restarts and stops the server and checks:
- * <ul>
- * <li>the console output</li>
- * <li>server's label</li>
- * <li>welcome page is available (if the result state is started)</li>
- * </ul>
- * @author Lucia Jelinkova
- *
- */
-public abstract class OperateServerTemplate extends SWTTestExt {
-
- protected ServersView serversView = new ServersView();
-
- public abstract String getWelcomePageText();
-
- protected String getServerName(){
- return configuredState.getServer().name;
- }
-
- @Test
- public void operateServer(){
- startServer();
- restartServer();
- stopServer();
- }
-
- public void startServer(){
- serversView.startServer(getServerName());
- serversView.openWebPage(configuredState.getServer().name);
-
- assertNoException("Starting server");
- assertServerState("Starting server", "Started");
- assertWebPageContains(getWelcomePageText());
- }
-
- public void restartServer(){
- serversView.restartServer(getServerName());
- serversView.openWebPage(configuredState.getServer().name);
-
- assertNoException("Restarting server");
- assertServerState("Restarting server", "Started");
- assertWebPageContains(getWelcomePageText());
- }
-
- public void stopServer(){
- serversView.stopServer(getServerName());
- serversView.openWebPage(configuredState.getServer().name);
-
- assertNoException("Stopping server");
- assertServerState("Stopping server", "Stopped");
- }
-
- protected void assertNoException(String message) {
- assertThat(message, "Exception:", not(new ConsoleOutputMatcher()));
- }
-
- protected void assertServerState(String message, String state) {
- assertThat(message, serversView.getServerStatus(getServerName()), is(state));
- }
-
- private void assertWebPageContains(String string) {
- serversView.openWebPage(configuredState.getServer().name);
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/OperateServerTemplate.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,76 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Test;
+
+/**
+ * Starts, restarts and stops the server and checks:
+ * <ul>
+ * <li>the console output</li>
+ * <li>server's label</li>
+ * <li>welcome page is available (if the result state is started)</li>
+ * </ul>
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class OperateServerTemplate extends SWTTestExt {
+
+ protected ServersView serversView = new ServersView();
+
+ public abstract String getWelcomePageText();
+
+ protected String getServerName(){
+ return configuredState.getServer().name;
+ }
+
+ @Test
+ public void operateServer(){
+ startServer();
+ restartServer();
+ stopServer();
+ }
+
+ public void startServer(){
+ serversView.startServer(getServerName());
+ serversView.openWebPage(configuredState.getServer().name);
+
+ assertNoException("Starting server");
+ assertServerState("Starting server", "Started");
+ assertWebPageContains(getWelcomePageText());
+ }
+
+ public void restartServer(){
+ serversView.restartServer(getServerName());
+ serversView.openWebPage(configuredState.getServer().name);
+
+ assertNoException("Restarting server");
+ assertServerState("Restarting server", "Started");
+ assertWebPageContains(getWelcomePageText());
+ }
+
+ public void stopServer(){
+ serversView.stopServer(getServerName());
+ serversView.openWebPage(configuredState.getServer().name);
+
+ assertNoException("Stopping server");
+ assertServerState("Stopping server", "Stopped");
+ }
+
+ protected void assertNoException(String message) {
+ assertThat(message, "Exception:", not(new ConsoleOutputMatcher()));
+ }
+
+ protected void assertServerState(String message, String state) {
+ assertThat(message, serversView.getServerStatus(getServerName()), is(state));
+ }
+
+ private void assertWebPageContains(String string) {
+ serversView.openWebPage(configuredState.getServer().name);
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,43 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.template;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.not;
-
-import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
-import org.jboss.tools.ui.bot.ext.SWTTestExt;
-import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
-import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
-import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
-import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
-import org.jboss.tools.ui.bot.ext.view.ServersView;
-import org.junit.Test;
-
-/**
- * Removes JSP project from server. Checks:
- *
- * <ul>
- * <li>the console output</li>
- * <li>server's label</li>
- * <li>project is not listed under the server</li>
- * </ul>
- * @author Lucia Jelinkova
- *
- */
-public abstract class UndeployJSPProjectTemplate extends SWTTestExt {
-
- protected abstract String getConsoleMessage();
- @Test
- public void undeployProject(){
- ServersView serversView = new ServersView();
- serversView.removeProjectFromServer(DeployJSPProjectTemplate.PROJECT_NAME, configuredState.getServer().name);
-
- // console
- assertThat(getConsoleMessage(), new ConsoleOutputMatcher(TaskDuration.NORMAL));
- assertThat("Exception:", not(new ConsoleOutputMatcher()));
- // view
- assertFalse("Server contains project", serversView.containsProject(configuredState.getServer().name, DeployJSPProjectAS7Server.PROJECT_NAME));
- assertEquals("Started", serversView.getServerStatus(configuredState.getServer().name));
- assertEquals("Synchronized", serversView.getServerPublishStatus(configuredState.getServer().name));
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/template/UndeployJSPProjectTemplate.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,43 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.template;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.not;
+
+import org.jboss.ide.eclipse.as.ui.bot.test.as7.DeployJSPProjectAS7Server;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.condition.TaskDuration;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
+import org.jboss.tools.ui.bot.ext.matcher.console.ConsoleOutputMatcher;
+import org.jboss.tools.ui.bot.ext.view.ServersView;
+import org.junit.Test;
+
+/**
+ * Removes JSP project from server. Checks:
+ *
+ * <ul>
+ * <li>the console output</li>
+ * <li>server's label</li>
+ * <li>project is not listed under the server</li>
+ * </ul>
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class UndeployJSPProjectTemplate extends SWTTestExt {
+
+ protected abstract String getConsoleMessage();
+ @Test
+ public void undeployProject(){
+ ServersView serversView = new ServersView();
+ serversView.removeProjectFromServer(DeployJSPProjectTemplate.PROJECT_NAME, configuredState.getServer().name);
+
+ // console
+ assertThat(getConsoleMessage(), new ConsoleOutputMatcher(TaskDuration.NORMAL));
+ assertThat("Exception:", not(new ConsoleOutputMatcher()));
+ // view
+ assertFalse("Server contains project", serversView.containsProject(configuredState.getServer().name, DeployJSPProjectAS7Server.PROJECT_NAME));
+ assertEquals("Started", serversView.getServerStatus(configuredState.getServer().name));
+ assertEquals("Synchronized", serversView.getServerPublishStatus(configuredState.getServer().name));
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,42 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.web;
-
-import org.hamcrest.Description;
-import org.hamcrest.TypeSafeMatcher;
-import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.parts.SWTBotBrowserExt;
-
-public class PageSourceMatcher extends TypeSafeMatcher<String> {
-
- private String pageText;
-
- private String url;
-
- public PageSourceMatcher() {
- super();
- }
-
- public PageSourceMatcher(String url) {
- this();
- this.url = url;
- }
-
- @Override
- public boolean matchesSafely(String item) {
- SWTBotBrowserExt browser = SWTBotFactory.getBot().browserExt();
- if (url != null){
- browser.loadUrlToBrowser(url, SWTBotFactory.getBot());
- }
-
- pageText = browser.getText();
- if ("".equals(item)){
- return pageText.equals(item);
- }
- return pageText.contains(item);
- }
-
- @Override
- public void describeTo(Description description) {
- description.appendText("is on the page, but there was instead: ");
- description.appendValue(pageText);
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/web/PageSourceMatcher.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,42 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.web;
+
+import org.hamcrest.Description;
+import org.hamcrest.TypeSafeMatcher;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.parts.SWTBotBrowserExt;
+
+public class PageSourceMatcher extends TypeSafeMatcher<String> {
+
+ private String pageText;
+
+ private String url;
+
+ public PageSourceMatcher() {
+ super();
+ }
+
+ public PageSourceMatcher(String url) {
+ this();
+ this.url = url;
+ }
+
+ @Override
+ public boolean matchesSafely(String item) {
+ SWTBotBrowserExt browser = SWTBotFactory.getBot().browserExt();
+ if (url != null){
+ browser.loadUrlToBrowser(url, SWTBotFactory.getBot());
+ }
+
+ pageText = browser.getText();
+ if ("".equals(item)){
+ return pageText.equals(item);
+ }
+ return pageText.contains(item);
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("is on the page, but there was instead: ");
+ description.appendValue(pageText);
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,111 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.wizard;
-
-import org.eclipse.swtbot.swt.finder.SWTBot;
-import org.eclipse.swtbot.swt.finder.keyboard.KeyboardFactory;
-import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
-import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem;
-import org.jboss.tools.ui.bot.ext.wizards.SWTBotImportWizard;
-
-public class ImportProjectWizard {
-
- private SWTBotImportWizard wizard = new SWTBotImportWizard();
-
- private String[] projectNames;
-
- private String projectPath;
-
- private String zipFilePath;
-
- private boolean copyProjectsIntoWorkspace;
-
- public void execute(){
- wizard.open(ActionItem.Import.GeneralExistingProjectsintoWorkspace.LABEL.getName(), ActionItem.Import.GeneralExistingProjectsintoWorkspace.LABEL.getGroupPath().get(0));
- loadProjects();
- selectProjects();
- wizard.finishWithWait();
- }
-
- private void loadProjects() {
- if (projectPath != null && zipFilePath != null){
- throw new IllegalArgumentException("You have to choose between folder and ZIP path");
- }
-
- if (projectPath != null){
- loadProjectsFromFolder();
- return;
- }
-
- if (zipFilePath != null){
- loadProjectsFromZIP();
- return;
- }
-
- throw new IllegalArgumentException("You have to provide either folder or ZIP path");
- }
-
- private void loadProjectsFromFolder() {
- getBot().text(0).setText(projectPath);
- KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.TAB);
- }
-
- private void loadProjectsFromZIP() {
- getBot().radio("Select archive file:").click();
- getBot().text(1).setText(zipFilePath);
- KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.TAB);
- }
-
- private void selectProjects() {
- selectCopyProjectsIntoWorkspace();
- getBot().button("Deselect All").click();
- SWTBotTree projectsTree = getBot().treeWithLabel("Projects:");
- for (String projectName : projectNames){
- SWTBotTreeItem projectItem = projectsTree.getTreeItem(getProjectLabel(projectName));
- projectItem.check();
- }
- }
-
- private void selectCopyProjectsIntoWorkspace() {
- if (isFileSystem()){
- if (copyProjectsIntoWorkspace){
- getBot().checkBox("Copy projects into workspace").select();
- } else {
- getBot().checkBox("Copy projects into workspace").deselect();
- }
- }
- }
-
- private String getProjectLabel(String project){
- if (isFileSystem()){
- return project + " (" + projectPath + "/" + project + ")";
- } else {
- return project + " (" + project + ")";
- }
- }
-
- private boolean isFileSystem(){
- return projectPath != null;
- }
-
- public void setProjectNames(String... projectNames) {
- this.projectNames = projectNames;
- }
-
- public void setProjectPath(String projectPath) {
- this.projectPath = projectPath;
- }
-
- public void setZipFilePath(String zipFilePath) {
- this.zipFilePath = zipFilePath;
- }
-
- public void setCopyProjectsIntoWorkspace(boolean copyProjectsIntoWorkspace) {
- this.copyProjectsIntoWorkspace = copyProjectsIntoWorkspace;
- }
-
- private SWTBot getBot(){
- return SWTBotFactory.getBot();
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/ImportProjectWizard.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,111 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.wizard;
+
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.keyboard.KeyboardFactory;
+import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+import org.jboss.tools.ui.bot.ext.wizards.SWTBotImportWizard;
+
+public class ImportProjectWizard {
+
+ private SWTBotImportWizard wizard = new SWTBotImportWizard();
+
+ private String[] projectNames;
+
+ private String projectPath;
+
+ private String zipFilePath;
+
+ private boolean copyProjectsIntoWorkspace;
+
+ public void execute(){
+ wizard.open(ActionItem.Import.GeneralExistingProjectsintoWorkspace.LABEL.getName(), ActionItem.Import.GeneralExistingProjectsintoWorkspace.LABEL.getGroupPath().get(0));
+ loadProjects();
+ selectProjects();
+ wizard.finishWithWait();
+ }
+
+ private void loadProjects() {
+ if (projectPath != null && zipFilePath != null){
+ throw new IllegalArgumentException("You have to choose between folder and ZIP path");
+ }
+
+ if (projectPath != null){
+ loadProjectsFromFolder();
+ return;
+ }
+
+ if (zipFilePath != null){
+ loadProjectsFromZIP();
+ return;
+ }
+
+ throw new IllegalArgumentException("You have to provide either folder or ZIP path");
+ }
+
+ private void loadProjectsFromFolder() {
+ getBot().text(0).setText(projectPath);
+ KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.TAB);
+ }
+
+ private void loadProjectsFromZIP() {
+ getBot().radio("Select archive file:").click();
+ getBot().text(1).setText(zipFilePath);
+ KeyboardFactory.getAWTKeyboard().pressShortcut(Keystrokes.TAB);
+ }
+
+ private void selectProjects() {
+ selectCopyProjectsIntoWorkspace();
+ getBot().button("Deselect All").click();
+ SWTBotTree projectsTree = getBot().treeWithLabel("Projects:");
+ for (String projectName : projectNames){
+ SWTBotTreeItem projectItem = projectsTree.getTreeItem(getProjectLabel(projectName));
+ projectItem.check();
+ }
+ }
+
+ private void selectCopyProjectsIntoWorkspace() {
+ if (isFileSystem()){
+ if (copyProjectsIntoWorkspace){
+ getBot().checkBox("Copy projects into workspace").select();
+ } else {
+ getBot().checkBox("Copy projects into workspace").deselect();
+ }
+ }
+ }
+
+ private String getProjectLabel(String project){
+ if (isFileSystem()){
+ return project + " (" + projectPath + "/" + project + ")";
+ } else {
+ return project + " (" + project + ")";
+ }
+ }
+
+ private boolean isFileSystem(){
+ return projectPath != null;
+ }
+
+ public void setProjectNames(String... projectNames) {
+ this.projectNames = projectNames;
+ }
+
+ public void setProjectPath(String projectPath) {
+ this.projectPath = projectPath;
+ }
+
+ public void setZipFilePath(String zipFilePath) {
+ this.zipFilePath = zipFilePath;
+ }
+
+ public void setCopyProjectsIntoWorkspace(boolean copyProjectsIntoWorkspace) {
+ this.copyProjectsIntoWorkspace = copyProjectsIntoWorkspace;
+ }
+
+ private SWTBot getBot(){
+ return SWTBotFactory.getBot();
+ }
+}
Deleted: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/NewFileWizard.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/NewFileWizard.java 2012-08-07 08:27:58 UTC (rev 42871)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/NewFileWizard.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -1,43 +0,0 @@
-package org.jboss.ide.eclipse.as.ui.bot.test.wizard;
-
-import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
-import org.jboss.tools.ui.bot.ext.SWTBotFactory;
-import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem;
-import org.jboss.tools.ui.bot.ext.wizards.SWTBotNewObjectWizard;
-
-public class NewFileWizard {
-
- private SWTBotNewObjectWizard wizard = new SWTBotNewObjectWizard();
-
- private String[] path;
-
- private String fileName;
-
- private String text;
-
- public void execute(){
- wizard.open(ActionItem.NewObject.GeneralFile.LABEL.getName(), ActionItem.NewObject.GeneralFile.LABEL.getGroupPath().get(0));
- SWTEclipseExt.selectTreeLocation(SWTBotFactory.getBot(), path);
- SWTBotFactory.getBot().textWithLabel("File name:").setText(fileName);
- wizard.finishWithWait();
-
- if (text != null){
- SWTBotEditor editor = SWTBotFactory.getBot().editorByTitle(fileName);
- editor.toTextEditor().setText(text);
- editor.saveAndClose();
- }
- }
-
- public void setPath(String... path) {
- this.path = path;
- }
-
- public void setFileName(String fileName) {
- this.fileName = fileName;
- }
-
- public void setText(String text) {
- this.text = text;
- }
-}
Copied: branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/NewFileWizard.java (from rev 42871, trunk/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/NewFileWizard.java)
===================================================================
--- branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/NewFileWizard.java (rev 0)
+++ branches/jbosstools-3.3.x/as/tests/org.jboss.ide.eclipse.as.ui.bot.test/src/org/jboss/ide/eclipse/as/ui/bot/test/wizard/NewFileWizard.java 2012-08-07 08:40:14 UTC (rev 42872)
@@ -0,0 +1,43 @@
+package org.jboss.ide.eclipse.as.ui.bot.test.wizard;
+
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+import org.jboss.tools.ui.bot.ext.wizards.SWTBotNewObjectWizard;
+
+public class NewFileWizard {
+
+ private SWTBotNewObjectWizard wizard = new SWTBotNewObjectWizard();
+
+ private String[] path;
+
+ private String fileName;
+
+ private String text;
+
+ public void execute(){
+ wizard.open(ActionItem.NewObject.GeneralFile.LABEL.getName(), ActionItem.NewObject.GeneralFile.LABEL.getGroupPath().get(0));
+ SWTEclipseExt.selectTreeLocation(SWTBotFactory.getBot(), path);
+ SWTBotFactory.getBot().textWithLabel("File name:").setText(fileName);
+ wizard.finishWithWait();
+
+ if (text != null){
+ SWTBotEditor editor = SWTBotFactory.getBot().editorByTitle(fileName);
+ editor.toTextEditor().setText(text);
+ editor.saveAndClose();
+ }
+ }
+
+ public void setPath(String... path) {
+ this.path = path;
+ }
+
+ public void setFileName(String fileName) {
+ this.fileName = fileName;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+}
12 years, 5 months
- 1
- 0
JBoss Tools SVN: r42871 - in branches/jbosstools-3.3.x/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-08-07 04:27:58 -0400 (Tue, 07 Aug 2012)
New Revision: 42871
Modified:
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java
branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java
Log:
JBIDE-12229 to maintenance
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2012-08-07 08:04:39 UTC (rev 42870)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2012-08-07 08:27:58 UTC (rev 42871)
@@ -86,7 +86,8 @@
String name = sourcePath.lastSegment();
IStatus result = null;
- DeploymentMarkerUtils.removeDeployFailedMarker(method, server, destination, monitor);
+ if( DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server) )
+ DeploymentMarkerUtils.removeDeployFailedMarker(method, server, destination, monitor);
if(publishType == IJBossServerPublisher.REMOVE_PUBLISH) {
result = removeRemoteDeployment(sourcePath, destination.removeLastSegments(1), name, monitor);
@@ -127,7 +128,7 @@
// Locally zip it up into the remote tmp folder
IStatus result = super.publishModule(method, server, module, publishType, delta, monitor);
- if( result.isOK() ) {
+ if( result.isOK() && requiresTransfer()) { // It seems the superclass already transfers it upstream for as7 :|
result = remoteFullPublish(sourcePath, destination.removeLastSegments(1), name,
AbstractServerToolsPublisher.getSubMon(monitor, 150));
}
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2012-08-07 08:04:39 UTC (rev 42870)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2012-08-07 08:27:58 UTC (rev 42871)
@@ -36,6 +36,7 @@
public class WTPZippedPublisher implements IJBossServerPublisher {
private int moduleState = IServer.PUBLISH_STATE_NONE;
+ private boolean requiresTransfer = true;
public boolean accepts(String method, IServer server, IModule[] module) {
IDeployableServer ds = ServerConverter.getDeployableServer(server);
@@ -45,6 +46,9 @@
public int getPublishState() {
return moduleState;
}
+ public boolean requiresTransfer() {
+ return requiresTransfer;
+ }
protected String getDeployRoot(IModule[] module, IDeployableServer ds) {
return PublishUtil.getDeployRootFolder(
@@ -65,9 +69,11 @@
return null;
if( DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server)) {
+ requiresTransfer = false;
status = handleJBoss7Deployment(method, server, module, publishType, delta, monitor);
} else {
Trace.trace(Trace.STRING_FINER, "Using as<=6 publishModule logic in WTPZippedPublisher for module " + module[module.length-1].getName() ); //$NON-NLS-1$
+ requiresTransfer = true;
IDeployableServer ds = ServerConverter.getDeployableServer(server);
String deployRoot = getDeployRoot(module, ds);
LocalZippedPublisherUtil util = new LocalZippedPublisherUtil();
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java 2012-08-07 08:04:39 UTC (rev 42870)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java 2012-08-07 08:27:58 UTC (rev 42871)
@@ -16,10 +16,12 @@
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.jst.j2ee.project.facet.JavaUtilityProjectCreationDataModelProvider;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
+import org.jboss.ide.eclipse.as.core.util.JavaUtils;
/**
* @author André Dietisheim
@@ -49,6 +51,7 @@
getProperties().setHost(getHost(jbossServer, jbossRuntime), launchConfig);
getProperties().setConfig(getServerConfig(jbossRuntime), launchConfig);
getProperties().setServerHome(getServerHome(jbossRuntime), jbossRuntime, launchConfig);
+ getProperties().setServerFlag(getSupportsServerFlag(jbossRuntime), jbossRuntime, launchConfig);
getProperties().setVmArguments(getDefaultVMArguments(jbossRuntime), launchConfig);
getProperties().setJreContainer(getJreContainerPath(jbossRuntime), launchConfig);
getProperties().setEndorsedDir(getEndorsedDir(jbossRuntime), launchConfig);
@@ -66,6 +69,7 @@
getProperties().setHost(getHost(jbossServer, jbossRuntime), launchConfig);
getProperties().setConfig(getServerConfig(jbossRuntime), launchConfig);
getProperties().setServerHome(getServerHome(jbossRuntime), jbossRuntime, launchConfig);
+ getProperties().setServerFlag(getSupportsServerFlag(jbossRuntime), jbossRuntime, launchConfig);
getProperties().setJreContainer(getJreContainerPath(jbossRuntime), launchConfig);
getProperties().setEndorsedDir(getEndorsedDir(jbossRuntime), launchConfig);
getProperties().setJavaLibPath(getJavaLibraryPath(jbossRuntime), launchConfig);
@@ -76,6 +80,11 @@
getProperties().setServerId(getServerId(jbossServer), launchConfig);
}
+ protected boolean getSupportsServerFlag(IJBossServerRuntime runtime) {
+ IVMInstall install = runtime.getVM();
+ return JavaUtils.supportsServerMode(install);
+ }
+
protected abstract String getEndorsedDir(IJBossServerRuntime runtime);
protected abstract String getJavaLibraryPath(IJBossServerRuntime runtime);
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java 2012-08-07 08:04:39 UTC (rev 42870)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java 2012-08-07 08:27:58 UTC (rev 42871)
@@ -178,6 +178,15 @@
}
}
+ public void setServerFlag(boolean useFlag, IJBossServerRuntime runtime,
+ ILaunchConfigurationWorkingCopy launchConfig) throws CoreException {
+ String programArguments = getProgramArguments(launchConfig);
+ String newArgs = useFlag ?
+ ArgsUtil.setFlag(programArguments, IJBossRuntimeConstants.SERVER_ARG) :
+ ArgsUtil.clearFlag(programArguments, IJBossRuntimeConstants.SERVER_ARG);
+ setProgramArguments(newArgs, launchConfig);
+ }
+
public boolean isServerHomeSet(ILaunchConfigurationWorkingCopy launchConfig) throws CoreException {
String value = ArgsUtil.getValue(getProgramArguments(launchConfig),
null,
Modified: branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java
===================================================================
--- branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java 2012-08-07 08:04:39 UTC (rev 42870)
+++ branches/jbosstools-3.3.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java 2012-08-07 08:27:58 UTC (rev 42871)
@@ -233,4 +233,27 @@
}
return original;
}
+
+ public static String setFlag(String original, String flagName) {
+ if( original.startsWith(flagName + SPACE ) || original.contains(SPACE + flagName + SPACE) || original.endsWith(flagName))
+ return original;
+ return original.trim() + SPACE + flagName;
+ }
+
+ public static String clearFlag(String original, String flagName) {
+ if( original.trim().startsWith(flagName + SPACE))
+ return original.trim().substring(flagName.length()).trim();
+
+ if( original.contains(SPACE + flagName + SPACE)) {
+ return original.replace(SPACE + flagName + SPACE, SPACE).trim();
+ }
+
+ if( original.trim().endsWith(SPACE + flagName)) {
+ return original.trim().substring(0, original.trim().length() - flagName.length()).trim();
+ }
+ if( original.trim().equals(flagName)) {
+ return ""; //$NON-NLS-1$
+ }
+ return original.trim();
+ }
}
\ No newline at end of file
12 years, 5 months
- 1
- 0
JBoss Tools SVN: r42870 - in trunk/as: plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-08-07 04:04:39 -0400 (Tue, 07 Aug 2012)
New Revision: 42870
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java
trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/utiltests/ArgsUtilTest.java
Log:
JBIDE-12229 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java 2012-08-07 07:04:02 UTC (rev 42869)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractStartLaunchConfigurator.java 2012-08-07 08:04:39 UTC (rev 42870)
@@ -16,10 +16,12 @@
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.jst.j2ee.project.facet.JavaUtilityProjectCreationDataModelProvider;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
+import org.jboss.ide.eclipse.as.core.util.JavaUtils;
/**
* @author André Dietisheim
@@ -49,6 +51,7 @@
getProperties().setHost(getHost(jbossServer, jbossRuntime), launchConfig);
getProperties().setConfig(getServerConfig(jbossRuntime), launchConfig);
getProperties().setServerHome(getServerHome(jbossRuntime), jbossRuntime, launchConfig);
+ getProperties().setServerFlag(getSupportsServerFlag(jbossRuntime), jbossRuntime, launchConfig);
getProperties().setVmArguments(getDefaultVMArguments(jbossRuntime), launchConfig);
getProperties().setJreContainer(getJreContainerPath(jbossRuntime), launchConfig);
getProperties().setEndorsedDir(getEndorsedDir(jbossRuntime), launchConfig);
@@ -66,6 +69,7 @@
getProperties().setHost(getHost(jbossServer, jbossRuntime), launchConfig);
getProperties().setConfig(getServerConfig(jbossRuntime), launchConfig);
getProperties().setServerHome(getServerHome(jbossRuntime), jbossRuntime, launchConfig);
+ getProperties().setServerFlag(getSupportsServerFlag(jbossRuntime), jbossRuntime, launchConfig);
getProperties().setJreContainer(getJreContainerPath(jbossRuntime), launchConfig);
getProperties().setEndorsedDir(getEndorsedDir(jbossRuntime), launchConfig);
getProperties().setJavaLibPath(getJavaLibraryPath(jbossRuntime), launchConfig);
@@ -76,6 +80,11 @@
getProperties().setServerId(getServerId(jbossServer), launchConfig);
}
+ protected boolean getSupportsServerFlag(IJBossServerRuntime runtime) {
+ IVMInstall install = runtime.getVM();
+ return JavaUtils.supportsServerMode(install);
+ }
+
protected abstract String getEndorsedDir(IJBossServerRuntime runtime);
protected abstract String getJavaLibraryPath(IJBossServerRuntime runtime);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java 2012-08-07 07:04:02 UTC (rev 42869)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/JBossLaunchConfigProperties.java 2012-08-07 08:04:39 UTC (rev 42870)
@@ -178,6 +178,15 @@
}
}
+ public void setServerFlag(boolean useFlag, IJBossServerRuntime runtime,
+ ILaunchConfigurationWorkingCopy launchConfig) throws CoreException {
+ String programArguments = getProgramArguments(launchConfig);
+ String newArgs = useFlag ?
+ ArgsUtil.setFlag(programArguments, IJBossRuntimeConstants.SERVER_ARG) :
+ ArgsUtil.clearFlag(programArguments, IJBossRuntimeConstants.SERVER_ARG);
+ setProgramArguments(newArgs, launchConfig);
+ }
+
public boolean isServerHomeSet(ILaunchConfigurationWorkingCopy launchConfig) throws CoreException {
String value = ArgsUtil.getValue(getProgramArguments(launchConfig),
null,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java 2012-08-07 07:04:02 UTC (rev 42869)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ArgsUtil.java 2012-08-07 08:04:39 UTC (rev 42870)
@@ -233,4 +233,27 @@
}
return original;
}
+
+ public static String setFlag(String original, String flagName) {
+ if( original.startsWith(flagName + SPACE ) || original.contains(SPACE + flagName + SPACE) || original.endsWith(flagName))
+ return original;
+ return original.trim() + SPACE + flagName;
+ }
+
+ public static String clearFlag(String original, String flagName) {
+ if( original.trim().startsWith(flagName + SPACE))
+ return original.trim().substring(flagName.length()).trim();
+
+ if( original.contains(SPACE + flagName + SPACE)) {
+ return original.replace(SPACE + flagName + SPACE, SPACE).trim();
+ }
+
+ if( original.trim().endsWith(SPACE + flagName)) {
+ return original.trim().substring(0, original.trim().length() - flagName.length()).trim();
+ }
+ if( original.trim().equals(flagName)) {
+ return ""; //$NON-NLS-1$
+ }
+ return original.trim();
+ }
}
\ No newline at end of file
Modified: trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/utiltests/ArgsUtilTest.java
===================================================================
--- trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/utiltests/ArgsUtilTest.java 2012-08-07 07:04:02 UTC (rev 42869)
+++ trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/utiltests/ArgsUtilTest.java 2012-08-07 08:04:39 UTC (rev 42870)
@@ -143,4 +143,14 @@
public String[] split(String val) {
return val.split(" ");
}
+
+ public void testSettingFlag() {
+ String original = "-Dsome.name=yes -server -Darg2=no";
+ String[] asArray = ArgsUtil.parse(original);
+ assertEquals(3, asArray.length);
+ String cleared = ArgsUtil.clearFlag(original, "-server");
+ assertEquals("-Dsome.name=yes -Darg2=no", cleared);
+ String set = ArgsUtil.setFlag(cleared, "-ser3");
+ assertEquals("-Dsome.name=yes -Darg2=no -ser3", set);
+ }
}
12 years, 5 months
- 1
- 0
JBoss Tools SVN: r42869 - trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-08-07 03:04:02 -0400 (Tue, 07 Aug 2012)
New Revision: 42869
Modified:
trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml
Log:
Freemarker ui.bot.test pom.xml updated, needed configuration is now in parent pom
Modified: trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml
===================================================================
--- trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml 2012-08-07 06:59:27 UTC (rev 42868)
+++ trunk/freemarker/tests/org.jboss.tools.freemarker.ui.bot.test/pom.xml 2012-08-07 07:04:02 UTC (rev 42869)
@@ -26,43 +26,6 @@
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>0.14.1</version>
- <configuration>
- <resolver>p2</resolver>
- <ignoreTychoRepositories>true</ignoreTychoRepositories>
- <environments>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<useUIThread>false</useUIThread>
12 years, 5 months
- 1
- 0