geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r679174 - in /geronimo/devtools/eclipse-plugin/trunk/testsuite: eclipse/ launcher/ plugins/org.apache.geronimo.testsuite.v21/ plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/ plugins/org.apache.g...
Date Wed, 23 Jul 2008 19:52:56 GMT
Author: mcconne
Date: Wed Jul 23 12:52:55 2008
New Revision: 679174

URL: http://svn.apache.org/viewvc?rev=679174&view=rev
Log:
GERONIMODEVTOOLS-436 5-minute tutorial added to the GEP testsuite -- Thanks to BJ Reed for this patch !!

Added:
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5Minute.java   (with props)
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5MinuteTest.java   (with props)
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/MyServlet.java   (with props)
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/MyStatelessSessionBean.java   (with props)
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/RemoteBusinessInterface.java   (with props)
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/index.jsp   (with props)
Modified:
    geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/build.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/AbbotHelper.java
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/NewServerTest.java
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/test.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml?rev=679174&r1=679173&r2=679174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml Wed Jul 23 12:52:55 2008
@@ -228,10 +228,16 @@
             <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.core/${gep_version}">
                 <include name="**/*.jar"/>
             </fileset>
+            <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.ui/${gep_version}">
+                <include name="**/*.jar"/>
+            </fileset>
+            <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.schemas/${gep_version}">
+                <include name="**/*.jar"/>
+            </fileset>
             <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.v21.core/${gep_version}">
                 <include name="**/*.jar"/>
             </fileset>
-            <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.ui/${gep_version}">
+            <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.v21.ui/${gep_version}">
                 <include name="**/*.jar"/>
             </fileset>
         </copy>

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/build.xml?rev=679174&r1=679173&r2=679174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/build.xml Wed Jul 23 12:52:55 2008
@@ -51,7 +51,9 @@
      |                                                                                             
      -->
     <target name="win32" depends="init" description="Start Equinox launcher on Windows">
-        <java classname="org.eclipse.equinox.launcher.Main" fork="true">
+        <java classname="org.eclipse.equinox.launcher.Main" 
+              failonerror="true"
+              fork="true">
             <classpath>
                 <pathelement path="${eclipse-home}/eclipse/plugins/org.eclipse.equinox.launcher.jar"/>
             </classpath>
@@ -63,15 +65,17 @@
             <arg value="-Dws=win32"/>
             <arg value="-Darch=x86"/>
         </java>
-    </target>
-            
+    </target>                                         
+
     <!--
      |  
      | Start Eclipse via the Equinox launcher (Linux)
      |                                                                                             
      -->
     <target name="linux" depends="init" description="Start Equinox launcher on Linux">
-        <java classname="org.eclipse.equinox.launcher.Main" fork="true">
+        <java classname="org.eclipse.equinox.launcher.Main" 
+              failonerror="true"
+              fork="true">
             <classpath>
                 <pathelement path="${eclipse-home}/eclipse/plugins/org.eclipse.equinox.launcher.jar"/>
             </classpath>
@@ -91,7 +95,9 @@
      |                                                                                             
      -->
     <target name="macos" depends="init" description="Start Equinox launcher on Mac">
-        <java classname="org.eclipse.equinox.launcher.Main" fork="true">
+        <java classname="org.eclipse.equinox.launcher.Main" 
+              failonerror="true"
+              fork="true">
             <classpath>
                 <pathelement path="${eclipse-home}/eclipse/plugins/org.eclipse.equinox.launcher.jar"/>
             </classpath>

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/AbbotHelper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/AbbotHelper.java?rev=679174&r1=679173&r2=679174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/AbbotHelper.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/AbbotHelper.java Wed Jul 23 12:52:55 2008
@@ -61,14 +61,14 @@
     protected void clickButton (Shell aShell, String buttonText) throws MultipleFoundException, NotFoundException {
         Button button = (Button) finder.find (aShell, new WidgetTextMatcher (buttonText, Button.class, true));
         ButtonTester.getButtonTester().actionClick (button);        
-        waitTime( 1000 );
+        waitTime( 1500 );
     }
 
     // helper method
     protected Shell clickButton (Shell aShell, String buttonText, String newDialogName) throws MultipleFoundException, NotFoundException {
         Button button = (Button) finder.find (aShell, new WidgetTextMatcher (buttonText, Button.class));
         ButtonTester.getButtonTester().actionClick (button);  
-        waitTime( 1000 );
+        waitTime( 1500 );
         return ShellTester.waitVisible (newDialogName);
     }
 
@@ -76,7 +76,7 @@
     protected Shell clickEnabledButton (Shell aShell, String buttonText, String newDialogName) throws MultipleFoundException, NotFoundException {
         Button button = (Button) finder.find (aShell, new ButtonMultiMatcher (buttonText, Button.class, true));
         ButtonTester.getButtonTester().actionClick (button);  
-        waitTime( 1000 );
+        waitTime( 1500 );
         return ShellTester.waitVisible (newDialogName);
     }
 
@@ -84,14 +84,14 @@
     protected void doubleClickItem (Shell aShell, String itemText) throws MultipleFoundException, NotFoundException {
         Item item = (Item) finder.find (aShell, new WidgetTextMatcher (itemText, Item.class, true));
         ItemTester.getItemTester().actionDoubleClick(item);       
-        waitTime( 1000 );
+        waitTime( 1500 );
     }
 
     // helper method
     protected void clickItem (Shell aShell, String itemText) throws MultipleFoundException, NotFoundException {
         Item item = (Item) finder.find (aShell, new WidgetTextMatcher (itemText, Item.class, true));
         ItemTester.getItemTester().actionClick (item, 3, 3);       
-        waitTime( 1000 );
+        waitTime( 1500 );
     }
 
     // helper method    
@@ -99,7 +99,7 @@
         Item item = (Item) finder.find (workbenchShell, new WidgetTextMatcher (itemText, Item.class, true));
         ItemPath anItemPath = new ItemPath (menuList);
         ItemTester.getItemTester().actionClickMenuItem (item, anItemPath);
-        waitTime( 1000 );
+        waitTime( 1500 );
         return ShellTester.waitVisible (newDialogName);
     }
 
@@ -108,7 +108,7 @@
         Item item = (Item) finder.find (workbenchShell, new WidgetTextMatcher (itemText, Item.class, true));
         ItemPath anItemPath = new ItemPath (menuList);
         ItemTester.getItemTester().actionClickMenuItem (item, anItemPath);
-        waitTime( 1000 );
+        waitTime( 1500 );
     }
 
     // helper method    
@@ -116,7 +116,7 @@
         ItemPath anItemPath = new ItemPath (menuList);
         Menu bar = ShellTester.getShellTester().getMenuBar (aShell);
         MenuTester.getMenuTester().actionClickItem (bar, anItemPath);
-        waitTime( 1000 );
+        waitTime( 1500 );
         return ShellTester.waitVisible (newDialogName);
     }
     
@@ -125,7 +125,7 @@
         ItemPath anItemPath = new ItemPath (menuList);
         Menu bar = ShellTester.getShellTester().getMenuBar (aShell);
         MenuTester.getMenuTester().actionClickItem (bar, anItemPath);
-        waitTime( 1000 );
+        waitTime( 1500 );
     }
 
     // helper method
@@ -133,7 +133,7 @@
         ItemPath anItemPath = new ItemPath (treeList);
         Tree tree = (Tree) finder.find (aShell, new WidgetClassMatcher (Tree.class));
         TreeTester.getTreeTester().actionClickItem (tree, anItemPath);
-        waitTime( 1000 );
+        waitTime( 1500 );
     }
 
     // helper method
@@ -146,14 +146,14 @@
         } else {
             TextTester.getTextTester().actionKeyString (text, newText);  
         }
-        waitTime( 1000 );
+        waitTime( 1500 );
     }
 
     // helper method with a leap of faith that the cursor is
     // exactly where we want it to be.
     protected void setCursorText (String newText) {
         TextTester.getTextTester().actionKeyString (newText);
-        waitTime( 1000 );
+        waitTime( 1500 );
     }
     
     // helper method

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/NewServerTest.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/NewServerTest.java?rev=679174&r1=679173&r2=679174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/NewServerTest.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/NewServerTest.java Wed Jul 23 12:52:55 2008
@@ -31,7 +31,6 @@
 
 import abbot.swt.eclipse.junit.extensions.WorkbenchTestCase;
 import abbot.swt.eclipse.utils.Preferences;
-import abbot.swt.eclipse.utils.PreferenceUtils;
 import abbot.swt.eclipse.utils.Preferences.Mode;
 import abbot.swt.eclipse.utils.WorkbenchUtilities;
 import abbot.swt.finder.generic.MultipleFoundException;
@@ -47,7 +46,6 @@
     protected void setUp() throws Exception {
         super.setUp();
         Preferences.setPerspectiveSwitchPrompt(Mode.Always);
-        PreferenceUtils.setWelcomeOnStartup(false, PlatformUI.getPreferenceStore()); 
     }
 
     protected void tearDown() throws Exception {
@@ -119,8 +117,6 @@
         aHelper.clickButton (wizardShell, IDialogConstants.FINISH_LABEL);
     }
 
-    // TODO only want to add the SampleEAR project and then test that
-    // that will include 3 different types of projects
     private void serverTesting () throws MultipleFoundException, NotFoundException {
         
     	String serverDisplay = "Apache Geronimo v2.1 Server at localhost";
@@ -131,13 +127,13 @@
                 new String[] {"&Start"});
         aHelper.waitForServerStatus (workbenchShell, serverDisplay, "Started");
         
-        aHelper.waitTime( 1000 );
+        aHelper.waitTime( 1500 );
         
         aHelper.rightClickItem (workbenchShell, serverDisplay,
                 new String[] {"S&top"});
         aHelper.waitForServerStatus (workbenchShell, serverDisplay, "Stopped");
         
-        aHelper.waitTime( 1000 );
+        aHelper.waitTime( 1500 );
         
     }
     
@@ -162,17 +158,14 @@
         int index = location.lastIndexOf(File.separatorChar);
         if (index > -1) {
             location = location.substring(0,index);
-            System.out.println(location);           
         }
         index = location.lastIndexOf(File.separatorChar);
         if (index > -1) {
             location = location.substring(0,index);
-            System.out.println(location);
         }
         index = location.lastIndexOf(File.separatorChar);
         if (index > -1) {
             location = location.substring(0,index);
-            System.out.println(location);
         }
         location = location + File.separatorChar + "server" ;
         return location;

Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5Minute.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5Minute.java?rev=679174&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5Minute.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5Minute.java Wed Jul 23 12:52:55 2008
@@ -0,0 +1,163 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geronimo.testsuite.v21.ui;
+
+import java.io.FileInputStream;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.swt.widgets.Shell;
+import abbot.swt.finder.generic.MultipleFoundException;
+import abbot.swt.finder.generic.NotFoundException;
+
+/**
+ * Tutorial5Minute
+ *
+ * @version $Rev$ $Date$
+ */
+public class Tutorial5Minute {
+
+    Shell workbenchShell;
+    AbbotHelper aHelper;
+
+    Tutorial5Minute (Shell shell, AbbotHelper helper) {
+        workbenchShell = shell;
+        aHelper = helper;
+    }
+
+    public void createProjects() throws Exception {
+        createEARProject ();
+        createEJBProject ();
+        createWARProject ();
+        copyCode ();
+    }
+
+    private void createEARProject() throws MultipleFoundException, NotFoundException {
+        Shell wizardShell = aHelper.clickMenuItem (workbenchShell,
+                new String[] {"&File", "&New\tAlt+Shift+N", "&Other..."},
+                "New");
+
+        aHelper.clickTreeItem (wizardShell,
+                new String[] {"Java EE", "Enterprise Application Project"});
+        aHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+        aHelper.setTextField(wizardShell, "", "SampleEAR");
+        aHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+        aHelper.clickButton (wizardShell, "Generate Deployment Descriptor");
+        aHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+        aHelper.setTextField(wizardShell, "default", "sampleear");
+        aHelper.setTextField(wizardShell, "", "sample-ear");
+        aHelper.setTextField(wizardShell, "car", "ear");
+        aHelper.clickButton (wizardShell, IDialogConstants.FINISH_LABEL);
+
+        aHelper.waitForDialogDisposal (wizardShell);
+    }
+
+    private void createEJBProject() throws MultipleFoundException, NotFoundException {
+        Shell wizardShell = aHelper.clickMenuItem (workbenchShell,
+                new String[] {"&File", "&New\tAlt+Shift+N", "&Other..."},
+                "New");
+
+        aHelper.clickTreeItem (wizardShell,
+                new String[] {"EJB", "EJB Project"});
+        aHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+        aHelper.setTextField(wizardShell, "", "SampleEJB");
+        aHelper.clickButton (wizardShell, "Add project to an EAR");
+        aHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+        aHelper.clickButton (wizardShell, "Create an EJB Client JAR module to hold the client interfaces and classes.");
+        aHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+        aHelper.setTextField(wizardShell, "default", "sampleear");
+        aHelper.setTextField(wizardShell, "", "sample-ejb");
+        aHelper.setTextField(wizardShell, "car", "ejb");
+        aHelper.clickButton (wizardShell, IDialogConstants.FINISH_LABEL);
+        
+        aHelper.waitForDialogDisposal (wizardShell);
+        
+        aHelper.doubleClickItem(workbenchShell, "ejbModule");
+        aHelper.doubleClickItem(workbenchShell, "META-INF");
+        Shell questionShell = aHelper.rightClickItem(workbenchShell, "openejb-jar.xml",
+                new String[] {"&Delete"}, "Delete Resources");
+        aHelper.clickButton (questionShell, IDialogConstants.OK_LABEL);
+        aHelper.waitForDialogDisposal (questionShell);
+    }
+
+    private void createWARProject() throws MultipleFoundException, NotFoundException {
+        Shell wizardShell = aHelper.clickMenuItem (workbenchShell,
+                new String[] {"&File", "&New\tAlt+Shift+N", "&Other..."},
+                "New");
+
+        aHelper.clickTreeItem (wizardShell,
+                new String[] {"Web", "Dynamic Web Project"});
+        aHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+        aHelper.setTextField(wizardShell, "", "SampleWAR");
+        aHelper.clickButton (wizardShell, "Add project to an EAR");
+        aHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+        aHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+        aHelper.setTextField(wizardShell, "default", "sampleear");
+        aHelper.setTextField(wizardShell, "", "sample-war");
+        aHelper.setTextField(wizardShell, "car", "war");
+        aHelper.clickButton (wizardShell, IDialogConstants.FINISH_LABEL);
+        
+        aHelper.waitForDialogDisposal (wizardShell);
+    }
+    
+    private void copyCode () throws Exception {
+        aHelper.clickItem (workbenchShell, "SampleWAR");
+        Shell propShell = aHelper.clickMenuItem (workbenchShell,
+                new String[] {"&Project", "&Properties"},
+                "Properties for SampleWAR");
+        aHelper.clickItem (propShell, "Java EE Module Dependencies");
+        aHelper.clickButton (propShell, "Select &All");
+        aHelper.clickButton (propShell, "&Apply");
+        aHelper.clickButton (propShell, IDialogConstants.OK_LABEL);
+
+        IWorkspaceRoot aWSRoot = ResourcesPlugin.getWorkspace().getRoot();
+        IProject aProject = aWSRoot.getProject ("SampleEJB");
+        IFolder aFolder = aProject.getFolder("ejbModule/sampleear");
+        aFolder.create (false, true, null);
+        String fileDir = aWSRoot.getLocation().toOSString() + "/src/main/resources/ui-tutorial";
+        IFile aFile = aProject.getFile("ejbModule/sampleear/RemoteBusinessInterface.java");
+        aFile.create(new FileInputStream (fileDir + "/RemoteBusinessInterface.java"), true, null);
+        aFile = aProject.getFile("ejbModule/sampleear/MyStatelessSessionBean.java");
+        aFile.create(new FileInputStream (fileDir + "/MyStatelessSessionBean.java"), true, null);
+
+        aProject = aWSRoot.getProject ("SampleWAR");
+        aFolder = aProject.getFolder("src/sampleear");
+        aFolder.create (false, true, null);
+        aFile = aProject.getFile("WebContent/index.jsp");
+        aFile.create(new FileInputStream (fileDir + "/index.jsp"), true, null);
+        // have to go through Servlet Creation dialog to make the web.xml correct
+        Shell servletShell = aHelper.rightClickItem(workbenchShell, "SampleWAR",
+                new String [] {"&New", "Servlet"}, "Create Servlet");
+        aHelper.setCursorText("MyServlet");
+        aHelper.setTextField(servletShell, "", "sampleear");
+        aHelper.clickButton (servletShell, IDialogConstants.NEXT_LABEL);
+        aHelper.clickItem(servletShell, "/MyServlet");
+        Shell urlShell = aHelper.clickEnabledButton (servletShell, "Edit...", "URL Mappings");
+        aHelper.setTextField(urlShell, "/MyServlet", "/sayHello");
+        aHelper.clickButton (urlShell, IDialogConstants.OK_LABEL);
+        aHelper.clickButton (servletShell, IDialogConstants.FINISH_LABEL);
+
+        // copy over the correct contents
+        aFile = aProject.getFile("src/sampleear/MyServlet.java");
+        aFile.setContents(new FileInputStream (fileDir + "/MyServlet.java"), true, true, null);
+    }
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5Minute.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5Minute.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5Minute.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5MinuteTest.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5MinuteTest.java?rev=679174&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5MinuteTest.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5MinuteTest.java Wed Jul 23 12:52:55 2008
@@ -0,0 +1,210 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geronimo.testsuite.v21.ui;
+
+import java.io.File;
+
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IPerspectiveDescriptor;
+import org.eclipse.ui.IPerspectiveRegistry;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
+
+import abbot.swt.eclipse.junit.extensions.WorkbenchTestCase;
+import abbot.swt.eclipse.utils.Preferences;
+import abbot.swt.eclipse.utils.Preferences.Mode;
+import abbot.swt.eclipse.utils.WorkbenchUtilities;
+import abbot.swt.finder.generic.MultipleFoundException;
+import abbot.swt.finder.generic.NotFoundException;
+
+/**
+ * Tutorial5MinuteTest
+ *
+ * @version $Rev$ $Date$
+ */
+public class Tutorial5MinuteTest extends WorkbenchTestCase {
+    Shell workbenchShell;
+    AbbotHelper aHelper;
+    
+    protected void setUp() throws Exception {
+        super.setUp();
+        Preferences.setPerspectiveSwitchPrompt(Mode.Always);
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+    }
+
+    // We only want to install/uninstall the server a single time so 
+    // we will roll all testcases into one large one that is controlled
+    // in the testAllGeronimoGUI method.
+    public void testAllGeronimoGUI() {
+        boolean success = false;
+        try {
+            workbenchShell = WorkbenchUtilities.getWorkbenchWindow().getShell();
+            aHelper = new AbbotHelper (workbenchShell);
+            
+            // so we are sure that we are looking in the desired perspective
+            showJEEPerspective();
+
+            // create server from an installed instance
+            server21Create();
+
+            // create some new projects
+            Tutorial5Minute tutorial = new Tutorial5Minute (workbenchShell, aHelper);
+            tutorial.createProjects ();
+
+            serverTesting();
+
+            // delete the projects that have been created
+            // reverse alphabetical is a little smoother
+            deleteProject ("SampleWAR");
+            deleteProject ("SampleEJB");
+            deleteProject ("SampleEAR");
+
+            // remove the server 
+            server21Remove();
+
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue (success);
+    }
+
+    private void showJEEPerspective() throws MultipleFoundException, NotFoundException {
+
+    	aHelper.clickMenuItem (workbenchShell,
+                new String[] {"&Window", "&Close Perspective"});
+    	
+    	Shell perspectiveShell = aHelper.clickMenuItem (workbenchShell,
+              new String[] {"&Window", "&Open Perspective", "&Other..." },
+              "Open Perspective");
+      aHelper.clickItem (perspectiveShell, "Java EE (default)");
+      aHelper.clickButton (perspectiveShell, IDialogConstants.OK_LABEL);        
+    }
+    
+    // just getting through this with no exceptions is success.
+    private void server21Create() throws MultipleFoundException, NotFoundException {
+        // Launch the New Project wizard and aHelper.wait for it to open.
+        Shell wizardShell = aHelper.clickMenuItem (workbenchShell,
+                new String[] {"&File", "&New\tAlt+Shift+N", "&Other..."},
+                "New");
+
+        // Having 2 tree items with the same name is not very good design
+        aHelper.clickTreeItem (wizardShell, 
+                new String[] {"Server", "Server"});
+        aHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+
+        // Select the proper Server. why do we have this in there twice?
+        aHelper.clickItem (wizardShell, "Apache Geronimo v2.1 Server");
+        aHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+
+        //TODO would be nice to install the server instead of have to know where it is in advance
+        aHelper.setTextField (wizardShell, "", getServerInstallDirectory());
+
+        aHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+        aHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+        aHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+        aHelper.clickButton (wizardShell, IDialogConstants.FINISH_LABEL);
+    }
+
+    // TODO only want to add the SampleEAR project and then test that
+    // that will include 3 different types of projects
+    private void serverTesting () throws MultipleFoundException, NotFoundException {
+        
+    	String serverDisplay = "Apache Geronimo v2.1 Server at localhost";
+    	aHelper.clickMenuItem (workbenchShell,
+                new String[] {"&Window", "Show &View", "Servers"});
+        
+        Shell deployShell = aHelper.rightClickItem (workbenchShell, serverDisplay,
+                new String[] {"Add and Remove &Projects..."}, "Add and Remove Projects");
+        aHelper.clickButton (deployShell, "Add A&ll >>");
+        
+        aHelper.clickButton (deployShell, IDialogConstants.FINISH_LABEL);
+        aHelper.waitForDialogDisposal (deployShell);
+        
+        aHelper.rightClickItem (workbenchShell, serverDisplay,
+                new String[] {"&Start"});
+        aHelper.waitForServerStatus (workbenchShell, serverDisplay, "Started");
+        
+        // Wait for server status to change from publishing -> synchronized
+        aHelper.waitTime( 5000 );  
+        
+        aHelper.rightClickItem (workbenchShell, serverDisplay,
+                new String[] {"S&top"});
+        aHelper.waitForServerStatus (workbenchShell, serverDisplay, "Stopped");
+        
+        aHelper.waitTime( 1500 );
+        
+        deployShell = aHelper.rightClickItem (workbenchShell, serverDisplay,
+                new String[] {"Add and Remove &Projects..."}, "Add and Remove Projects");
+        aHelper.clickButton (deployShell, "<< Re&move All");
+        aHelper.clickButton (deployShell, IDialogConstants.FINISH_LABEL);
+        aHelper.waitForDialogDisposal (deployShell);
+    }
+    
+    // remove the server so that the test will be reset back to its original state.
+    private void server21Remove () throws MultipleFoundException, NotFoundException {
+        Shell preferenceShell = aHelper.clickMenuItem (workbenchShell,
+                new String[] {"&Window", "&Preferences"},
+                "Preferences");
+
+        aHelper.clickTreeItem (preferenceShell,
+                new String[] {"Server", "Runtime Environments"});
+        aHelper.clickItem (preferenceShell, "Apache Geronimo v2.1");
+        Shell questionShell = aHelper.clickButton (preferenceShell, "&Remove", "Server");
+        
+        aHelper.clickButton (questionShell, IDialogConstants.OK_LABEL);
+        aHelper.clickButton (preferenceShell, IDialogConstants.OK_LABEL);
+    }
+
+    private String getServerInstallDirectory() {
+        IWorkspace ws = ResourcesPlugin.getWorkspace();
+        String location = ws.getRoot().getLocation().toOSString();
+        int index = location.lastIndexOf(File.separatorChar);
+        if (index > -1) {
+            location = location.substring(0,index);
+        }
+        index = location.lastIndexOf(File.separatorChar);
+        if (index > -1) {
+            location = location.substring(0,index);
+        }
+        index = location.lastIndexOf(File.separatorChar);
+        if (index > -1) {
+            location = location.substring(0,index);
+        }
+        location = location + File.separatorChar + "server" ;
+        return location;
+    }  
+
+    private void deleteProject (String projectName) throws MultipleFoundException, NotFoundException {
+        Shell questionShell = aHelper.rightClickItem (workbenchShell, projectName, 
+                new String[] {"&Delete"}, "Delete Resources");
+
+        // use .* to signify use of a wildcard
+        aHelper.clickButton (questionShell, "&Delete project contents.*");
+        aHelper.clickButton (questionShell, IDialogConstants.OK_LABEL);
+        aHelper.waitForDialogDisposal (questionShell);
+    }
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5MinuteTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5MinuteTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/Tutorial5MinuteTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/MyServlet.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/MyServlet.java?rev=679174&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/MyServlet.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/MyServlet.java Wed Jul 23 12:52:55 2008
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sampleear;
+
+import java.io.IOException;
+
+import javax.ejb.EJB;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * MyServlet
+ *
+ * @version $Rev$ $Date$
+ */
+public class MyServlet extends javax.servlet.http.HttpServlet implements javax.servlet.Servlet {
+    static final long serialVersionUID = 1L;
+
+    @EJB
+    RemoteBusinessInterface remoteBusinessIntf;
+
+    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        String name = request.getParameter("name");
+        if (name == null || name.length() == 0) {
+            name = "anonymous";
+        }
+        response.getWriter().write(remoteBusinessIntf.sayHello(name));
+    }
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/MyServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/MyServlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/MyServlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/MyStatelessSessionBean.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/MyStatelessSessionBean.java?rev=679174&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/MyStatelessSessionBean.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/MyStatelessSessionBean.java Wed Jul 23 12:52:55 2008
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sampleear;
+
+import javax.ejb.Stateless;
+
+/**
+ * MyStatelessSessionBean
+ *
+ * @version $Rev$ $Date$
+ */
+@Stateless
+public class MyStatelessSessionBean implements RemoteBusinessInterface {
+
+    public String sayHello(String name) {
+        return getClass().getName() + " says hello to " + name + ".";
+    }
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/MyStatelessSessionBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/MyStatelessSessionBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/MyStatelessSessionBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/RemoteBusinessInterface.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/RemoteBusinessInterface.java?rev=679174&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/RemoteBusinessInterface.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/RemoteBusinessInterface.java Wed Jul 23 12:52:55 2008
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sampleear;
+
+import javax.ejb.Remote;
+
+/**
+ * RemoteBusinessInterface
+ *
+ * @version $Rev$ $Date$
+ */
+@Remote
+public interface RemoteBusinessInterface {
+    public String sayHello(String name);
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/RemoteBusinessInterface.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/RemoteBusinessInterface.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/RemoteBusinessInterface.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/index.jsp?rev=679174&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/index.jsp (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/index.jsp Wed Jul 23 12:52:55 2008
@@ -0,0 +1,32 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
+<!-- @version $Rev$ $Date$ -->
+
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+    <title>5-minute Tutorial on Enterprise Application Development with Eclipse and Geronimo</title>
+  </head>
+  <body>
+    <form action="${pageContext.request.contextPath}/sayHello">
+      <input type="text" name="name" /><input type="submit" value="Press me!" />
+    </form>
+  </body>
+</html>

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/index.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/ui-tutorial/index.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/test.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/test.xml?rev=679174&r1=679173&r2=679174&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/test.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/test.xml Wed Jul 23 12:52:55 2008
@@ -43,12 +43,63 @@
         <property name="jdt-folder"
                   value="${eclipse-home}/jdt_folder"/>
         <delete dir="${jdt-folder}" quiet="true"/>
+
+        <!-- 
+         #########################################################################
+         ##                                                                     ##
+         ## Extra permgen memory required for this testsuite                    ##
+         ##                                                                     ##
+         #########################################################################
+         -->
+        <property name="extraVMargs" value="-XX:MaxPermSize=128m" />
+        <echo message="######################################################" />
+        <echo message="##                                                    " />
+        <echo message="## extraVMargs: ${extraVMargs}" />
+        <echo message="##                                                    " />
+        <echo message="######################################################" />
+
+        <!-- 
+         #########################################################################
+         ##                                                                     ##
+         ## Define new server testcase                                          ##
+         ##                                                                     ##
+         #########################################################################
+         -->
         <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
             <property name="data-dir" value="${jdt-folder}"/>
             <property name="plugin-name" value="${plugin-name}"/>
             <property name="classname"
                       value="org.apache.geronimo.testsuite.v21.ui.NewServerTest"/>
         </ant>
+
+        <!-- 
+         #########################################################################
+         ##                                                                     ##
+         ## Copy the testsuite.v21 resources required for the 5 minute tutorial ##
+         ##                                                                     ##
+         #########################################################################
+         -->
+        <mkdir dir="${jdt-folder}/src"/>
+        <copy todir="${jdt-folder}/src">
+            <fileset dir="${eclipse-home}/../../../plugins/org.apache.geronimo.testsuite.v21/src">
+                <include name="**/*.java"/>
+                <include name="**/*.jsp"/>
+            </fileset>
+        </copy>
+
+        <!-- 
+         #########################################################################
+         ##                                                                     ##
+         ## 5 minute tutorial testcase                                          ##
+         ##                                                                     ##
+         #########################################################################
+         -->
+        <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+            <property name="data-dir" value="${jdt-folder}"/>
+            <property name="plugin-name" value="${plugin-name}"/>
+            <property name="classname"
+                      value="org.apache.geronimo.testsuite.v21.ui.Tutorial5MinuteTest"/>
+        </ant>
     </target>
 	
     <!-- This target holds code to cleanup the testing environment after -->



Mime
View raw message