geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r723171 - in /geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins: org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ org.apache.geronimo.testsuite.v20/ org.apache.geronimo.testsuite.v20/src/mai...
Date Thu, 04 Dec 2008 00:51:19 GMT
Author: mcconne
Date: Wed Dec  3 16:51:19 2008
New Revision: 723171

URL: http://svn.apache.org/viewvc?rev=723171&view=rev
Log:
GERONIMODEVTOOLS-539 Run on server testcases for the patch that Delos Dai provided for GERONIMODEVTOOLS-536

Added:
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/RunOnServerTest.java   (with props)
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/resources/run-on-server/
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/resources/run-on-server/index.jsp   (with props)
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/RunOnServerTest.java   (with props)
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/run-on-server/
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/run-on-server/index.jsp   (with props)
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/RunOnServerTest.java   (with props)
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/run-on-server/
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/run-on-server/index.jsp   (with props)
Modified:
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/AbbotHelper.java
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/SharedLibPojoTest.java
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/test.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/SharedLibPojoTest.java
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/test.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/SharedLibPojoTest.java
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/test.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/AbbotHelper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/AbbotHelper.java?rev=723171&r1=723170&r2=723171&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/AbbotHelper.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/AbbotHelper.java Wed Dec  3 16:51:19 2008
@@ -100,6 +100,13 @@
         waitTime( 1500 );
     }
 
+    // helper method
+    public void clickCombo(Shell aShell, String itemText) throws MultipleFoundException, NotFoundException {
+        Combo combo = (Combo) finder.find (aShell, new WidgetTextMatcher (itemText, Combo.class, true));
+        ComboTester.getComboTester().actionClick (combo);      
+        waitTime( 1500 );
+    }
+
     // helper method    
     public Shell rightClickItem (Shell aShell, String itemText, String[] menuList, String newDialogName) throws MultipleFoundException, NotFoundException {
         Item item = (Item) finder.find (workbenchShell, new WidgetTextMatcher (itemText, Item.class, true));

Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/RunOnServerTest.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/RunOnServerTest.java?rev=723171&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/RunOnServerTest.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/RunOnServerTest.java Wed Dec  3 16:51:19 2008
@@ -0,0 +1,186 @@
+/*
+ * 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.v20.ui;
+
+import java.io.FileInputStream;
+
+import org.apache.geronimo.testsuite.common.AssertUtil;
+import org.apache.geronimo.testsuite.common.selenium.EclipseSelenium;
+import org.apache.geronimo.testsuite.common.ui.AbbotHelper;
+import org.apache.geronimo.testsuite.common.ui.Constants;
+import org.apache.geronimo.testsuite.common.ui.ProjectTasks;
+import org.apache.geronimo.testsuite.common.ui.ServerTasks;
+import org.apache.geronimo.testsuite.common.ui.WorkbenchTasks;
+import org.eclipse.core.resources.IFile;
+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.eclipse.junit.extensions.WorkbenchTestCase;
+import abbot.swt.eclipse.utils.WorkbenchUtilities;
+
+/*
+ * @version $Rev$ $Date$
+ */
+public class RunOnServerTest extends WorkbenchTestCase {
+
+    Shell workbenchShell = WorkbenchUtilities.getWorkbenchWindow().getShell();
+    AbbotHelper abbotHelper = new AbbotHelper(workbenchShell);
+    boolean success = false;
+
+
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        deleteProject();
+        deleteServer();
+    }
+
+
+    public void testRunOnServer() {
+        createServer();
+        startServer();
+        createProject();
+        copyCodeToProject();
+        deployProject();
+    }
+
+
+    private void createServer() {
+        success = false;
+        try {
+            WorkbenchTasks workbenchTasks = new WorkbenchTasks(workbenchShell, abbotHelper);
+            // so we are sure that we are looking in the desired perspective
+            workbenchTasks.showJEEPerspective();
+            ServerTasks serverTasks = new ServerTasks(workbenchShell, abbotHelper, Constants.SERVER_V20 );
+            serverTasks.createServer();
+            serverTasks.startServer();
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+
+    private void startServer() {
+        success = false;
+        try {
+            ServerTasks serverTasks = new ServerTasks(workbenchShell, abbotHelper, Constants.SERVER_V20 );
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+
+    private void createProject() {
+        success = false;
+        try {
+            Shell wizardShell = abbotHelper.clickMenuItem (workbenchShell,
+                                                           new String[] {"&File", "&New\tAlt+Shift+N", "&Other..."},
+                                                           "New");
+            abbotHelper.clickTreeItem (wizardShell,
+                                       new String[] {"Web", "Dynamic Web Project"});
+            abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+            abbotHelper.setTextField(wizardShell,"", "DynamicWebProject");
+            abbotHelper.clickButton (wizardShell, IDialogConstants.FINISH_LABEL);
+            abbotHelper.waitForDialogDisposal(wizardShell);
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+
+    private void copyCodeToProject() {
+        success = false;
+        try {
+            IWorkspaceRoot aWSRoot = ResourcesPlugin.getWorkspace().getRoot();
+            IProject aProject = aWSRoot.getProject ("DynamicWebProject");
+            String fileDir = aWSRoot.getLocation().toOSString() + "/src/main/resources/run-on-server";
+            IFile aFile = aProject.getFile("WebContent/index.jsp");
+            aFile.create(new FileInputStream (fileDir + "/index.jsp"), true, null);
+            abbotHelper.waitTime( 1500 );
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+
+    private void deployProject() {
+        success = false;
+        try {
+            Shell deployShell = abbotHelper.rightClickItem(workbenchShell, "DynamicWebProject",
+                                                           new String [] {"&Run As", "&1 Run on Server\tAlt+Shift+X, R"}, 
+                                                           "Run On Server");
+            abbotHelper.clickButton (deployShell, IDialogConstants.FINISH_LABEL);
+            abbotHelper.waitTime( 10000 );
+            abbotHelper.clickCombo( workbenchShell, "http://localhost:8080/DynamicWebProject/");
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+
+    private void deleteProject() {
+        success = false;
+        try {
+            ProjectTasks projectTasks = new ProjectTasks(workbenchShell, abbotHelper, Constants.SERVER_V20 );
+            projectTasks.deleteProject ("DynamicWebProject");
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+
+    private void deleteServer() {
+        success = false;
+        try {
+            ServerTasks serverTasks = new ServerTasks(workbenchShell, abbotHelper, Constants.SERVER_V20 );
+            serverTasks.stopServer();
+            serverTasks.removeServer();
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+}

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

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

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

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/SharedLibPojoTest.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/SharedLibPojoTest.java?rev=723171&r1=723170&r2=723171&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/SharedLibPojoTest.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/SharedLibPojoTest.java Wed Dec  3 16:51:19 2008
@@ -59,7 +59,7 @@
         createPojoProject();
         copyCodeToPojoProject();
         createHelloWorldProject();
-        copyCodeToHellowWorldProject();
+        copyCodeToHelloWorldProject();
         modifyHelloWorldBuildPath();
         deployHelloWorldProject();
         addSharedLibSupport();
@@ -148,7 +148,7 @@
         }
 
     }
-    public void copyCodeToHellowWorldProject()
+    public void copyCodeToHelloWorldProject()
     {
         try {
             IWorkspaceRoot aWSRoot = ResourcesPlugin.getWorkspace().getRoot();

Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/resources/run-on-server/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/resources/run-on-server/index.jsp?rev=723171&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/resources/run-on-server/index.jsp (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/resources/run-on-server/index.jsp Wed Dec  3 16:51:19 2008
@@ -0,0 +1,31 @@
+<!--
+   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>Run on Server</title>
+</head>
+<body>
+Run on Server Testcase !!!
+</body>
+</html>

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/resources/run-on-server/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/resources/run-on-server/index.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/resources/run-on-server/index.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/test.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/test.xml?rev=723171&r1=723170&r2=723171&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/test.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/test.xml Wed Dec  3 16:51:19 2008
@@ -44,6 +44,7 @@
                   value="${eclipse-home}/jdt_folder"/>
         <delete dir="${jdt-folder}" quiet="true"/>
 
+
         <!-- 
          #########################################################################
          ##                                                                     ##
@@ -52,12 +53,24 @@
          #########################################################################
          -->
         <property name="extraVMargs" value="-XX:MaxPermSize=128m" />
-        <echo message="######################################################" />
-        <echo message="##                                                    " />
-        <echo message="## extraVMargs: ${extraVMargs}" />
-        <echo message="##                                                    " />
-        <echo message="######################################################" />
 
+
+        <!-- 
+         #########################################################################
+         ##                                                                     ##
+         ## Copy the resources required for this testsuite                      ##
+         ##                                                                     ##
+         #########################################################################
+         -->
+        <mkdir dir="${jdt-folder}/src"/>
+        <copy todir="${jdt-folder}/src">
+            <fileset dir="${eclipse-home}/../../../plugins/org.apache.geronimo.testsuite.v20/src">
+                <include name="**/*.java"/>
+                <include name="**/*.jsp"/>
+            </fileset>
+        </copy>
+        
+        
         <!--
          #########################################################################
          ##                                                                     ##
@@ -72,21 +85,22 @@
                       value="org.apache.geronimo.testsuite.v20.ui.EclipseUITest"/>
         </ant>
 
-        <!-- 
+
+        <!--
          #########################################################################
          ##                                                                     ##
-         ## Copy the testsuite.v20 resources required for the SharedLib project ##
+         ## Run on Server testcase                                              ##
          ##                                                                     ##
          #########################################################################
          -->
-        <mkdir dir="${jdt-folder}/src"/>
-        <copy todir="${jdt-folder}/src">
-            <fileset dir="${eclipse-home}/../../../plugins/org.apache.geronimo.testsuite.v20/src">
-                <include name="**/*.java"/>
-                <include name="**/*.jsp"/>
-            </fileset>
-        </copy>
-        
+        <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.v20.ui.RunOnServerTest"/>
+        </ant>
+
+
         <!--
          #########################################################################                                                                     ##
          ##                                                                     ##
@@ -101,6 +115,7 @@
              value="org.apache.geronimo.testsuite.v20.ui.SharedLibPojoTest"/>
         </ant>
     
+    
         <!-- 
          #########################################################################
          ##                                                                     ##
@@ -115,20 +130,6 @@
                       value="org.apache.geronimo.testsuite.v20.ui.NewServerTest"/>
         </ant>
 
-        <!-- 
-         #########################################################################
-         ##                                                                     ##
-         ## Copy the testsuite.v20 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.v20/src">
-                <include name="**/*.java"/>
-                <include name="**/*.jsp"/>
-            </fileset>
-        </copy>
 
         <!-- 
          #########################################################################
@@ -143,6 +144,8 @@
             <property name="classname"
                       value="org.apache.geronimo.testsuite.v20.ui.Tutorial5MinuteTest"/>
         </ant>
+
+
     </target>
     
     <!-- This target holds code to cleanup the testing environment after -->

Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/RunOnServerTest.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/RunOnServerTest.java?rev=723171&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/RunOnServerTest.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/RunOnServerTest.java Wed Dec  3 16:51:19 2008
@@ -0,0 +1,186 @@
+/*
+ * 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.apache.geronimo.testsuite.common.AssertUtil;
+import org.apache.geronimo.testsuite.common.selenium.EclipseSelenium;
+import org.apache.geronimo.testsuite.common.ui.AbbotHelper;
+import org.apache.geronimo.testsuite.common.ui.Constants;
+import org.apache.geronimo.testsuite.common.ui.ProjectTasks;
+import org.apache.geronimo.testsuite.common.ui.ServerTasks;
+import org.apache.geronimo.testsuite.common.ui.WorkbenchTasks;
+import org.eclipse.core.resources.IFile;
+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.eclipse.junit.extensions.WorkbenchTestCase;
+import abbot.swt.eclipse.utils.WorkbenchUtilities;
+
+/*
+ * @version $Rev$ $Date$
+ */
+public class RunOnServerTest extends WorkbenchTestCase {
+
+    Shell workbenchShell = WorkbenchUtilities.getWorkbenchWindow().getShell();
+    AbbotHelper abbotHelper = new AbbotHelper(workbenchShell);
+    boolean success = false;
+
+
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        deleteProject();
+        deleteServer();
+    }
+
+
+    public void testRunOnServer() {
+        createServer();
+        startServer();
+        createProject();
+        copyCodeToProject();
+        deployProject();
+    }
+
+
+    private void createServer() {
+        success = false;
+        try {
+            WorkbenchTasks workbenchTasks = new WorkbenchTasks(workbenchShell, abbotHelper);
+            // so we are sure that we are looking in the desired perspective
+            workbenchTasks.showJEEPerspective();
+            ServerTasks serverTasks = new ServerTasks(workbenchShell, abbotHelper, Constants.SERVER_V21 );
+            serverTasks.createServer();
+            serverTasks.startServer();
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+
+    private void startServer() {
+        success = false;
+        try {
+            ServerTasks serverTasks = new ServerTasks(workbenchShell, abbotHelper, Constants.SERVER_V21 );
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+
+    private void createProject() {
+        success = false;
+        try {
+            Shell wizardShell = abbotHelper.clickMenuItem (workbenchShell,
+                                                           new String[] {"&File", "&New\tAlt+Shift+N", "&Other..."},
+                                                           "New");
+            abbotHelper.clickTreeItem (wizardShell,
+                                       new String[] {"Web", "Dynamic Web Project"});
+            abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+            abbotHelper.setTextField(wizardShell,"", "DynamicWebProject");
+            abbotHelper.clickButton (wizardShell, IDialogConstants.FINISH_LABEL);
+            abbotHelper.waitForDialogDisposal(wizardShell);
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+
+    private void copyCodeToProject() {
+        success = false;
+        try {
+            IWorkspaceRoot aWSRoot = ResourcesPlugin.getWorkspace().getRoot();
+            IProject aProject = aWSRoot.getProject ("DynamicWebProject");
+            String fileDir = aWSRoot.getLocation().toOSString() + "/src/main/resources/run-on-server";
+            IFile aFile = aProject.getFile("WebContent/index.jsp");
+            aFile.create(new FileInputStream (fileDir + "/index.jsp"), true, null);
+            abbotHelper.waitTime( 1500 );
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+
+    private void deployProject() {
+        success = false;
+        try {
+            Shell deployShell = abbotHelper.rightClickItem(workbenchShell, "DynamicWebProject",
+                                                           new String [] {"&Run As", "&1 Run on Server\tAlt+Shift+X, R"}, 
+                                                           "Run On Server");
+            abbotHelper.clickButton (deployShell, IDialogConstants.FINISH_LABEL);
+            abbotHelper.waitTime( 10000 );
+            abbotHelper.clickCombo( workbenchShell, "http://localhost:8080/DynamicWebProject/");
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+
+    private void deleteProject() {
+        success = false;
+        try {
+            ProjectTasks projectTasks = new ProjectTasks(workbenchShell, abbotHelper, Constants.SERVER_V21 );
+            projectTasks.deleteProject ("DynamicWebProject");
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+
+    private void deleteServer() {
+        success = false;
+        try {
+            ServerTasks serverTasks = new ServerTasks(workbenchShell, abbotHelper, Constants.SERVER_V21 );
+            serverTasks.stopServer();
+            serverTasks.removeServer();
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/RunOnServerTest.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/RunOnServerTest.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/RunOnServerTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/SharedLibPojoTest.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/SharedLibPojoTest.java?rev=723171&r1=723170&r2=723171&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/SharedLibPojoTest.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/SharedLibPojoTest.java Wed Dec  3 16:51:19 2008
@@ -59,7 +59,7 @@
         createPojoProject();
         copyCodeToPojoProject();
         createHelloWorldProject();
-        copyCodeToHellowWorldProject();
+        copyCodeToHelloWorldProject();
         modifyHelloWorldBuildPath();
         deployHelloWorldProject();
         addSharedLibSupport();
@@ -148,7 +148,7 @@
         }
 
     }
-    public void copyCodeToHellowWorldProject()
+    public void copyCodeToHelloWorldProject()
     {
         try {
             IWorkspaceRoot aWSRoot = ResourcesPlugin.getWorkspace().getRoot();

Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/run-on-server/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/run-on-server/index.jsp?rev=723171&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/run-on-server/index.jsp (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/run-on-server/index.jsp Wed Dec  3 16:51:19 2008
@@ -0,0 +1,31 @@
+<!--
+   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>Run on Server</title>
+</head>
+<body>
+Run on Server Testcase !!!
+</body>
+</html>

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

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

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/resources/run-on-server/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=723171&r1=723170&r2=723171&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 Dec  3 16:51:19 2008
@@ -44,6 +44,7 @@
                   value="${eclipse-home}/jdt_folder"/>
         <delete dir="${jdt-folder}" quiet="true"/>
 
+
         <!-- 
          #########################################################################
          ##                                                                     ##
@@ -52,11 +53,23 @@
          #########################################################################
          -->
         <property name="extraVMargs" value="-XX:MaxPermSize=128m" />
-        <echo message="######################################################" />
-        <echo message="##                                                    " />
-        <echo message="## extraVMargs: ${extraVMargs}" />
-        <echo message="##                                                    " />
-        <echo message="######################################################" />
+        
+        
+        <!-- 
+         #########################################################################
+         ##                                                                     ##
+         ## Copy the resources required for this testsuite                      ##
+         ##                                                                     ##
+         #########################################################################
+         -->
+        <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>
+        
         
         <!--
          #########################################################################
@@ -71,22 +84,23 @@
             <property name="classname"
                       value="org.apache.geronimo.testsuite.v21.ui.EclipseUITest"/>
         </ant>
-    
-        <!-- 
+        
+        
+        <!--
          #########################################################################
          ##                                                                     ##
-         ## Copy the testsuite.v21 resources required for the SharedLib project ##
+         ## Run on Server testcase                                              ##
          ##                                                                     ##
          #########################################################################
          -->
-        <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>
-        
+        <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.RunOnServerTest"/>
+        </ant>
+
+
         <!--
          #########################################################################                                                                     ##
          ##                                                                     ##
@@ -101,6 +115,7 @@
              value="org.apache.geronimo.testsuite.v21.ui.SharedLibPojoTest"/>
         </ant>
     
+    
         <!-- 
          #########################################################################
          ##                                                                     ##
@@ -115,20 +130,6 @@
                       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>
 
         <!-- 
          #########################################################################
@@ -143,6 +144,8 @@
             <property name="classname"
                       value="org.apache.geronimo.testsuite.v21.ui.Tutorial5MinuteTest"/>
         </ant>
+
+
     </target>
 
     <!-- This target holds code to cleanup the testing environment after -->

Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/RunOnServerTest.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/RunOnServerTest.java?rev=723171&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/RunOnServerTest.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/RunOnServerTest.java Wed Dec  3 16:51:19 2008
@@ -0,0 +1,186 @@
+/*
+ * 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.v22.ui;
+
+import java.io.FileInputStream;
+
+import org.apache.geronimo.testsuite.common.AssertUtil;
+import org.apache.geronimo.testsuite.common.selenium.EclipseSelenium;
+import org.apache.geronimo.testsuite.common.ui.AbbotHelper;
+import org.apache.geronimo.testsuite.common.ui.Constants;
+import org.apache.geronimo.testsuite.common.ui.ProjectTasks;
+import org.apache.geronimo.testsuite.common.ui.ServerTasks;
+import org.apache.geronimo.testsuite.common.ui.WorkbenchTasks;
+import org.eclipse.core.resources.IFile;
+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.eclipse.junit.extensions.WorkbenchTestCase;
+import abbot.swt.eclipse.utils.WorkbenchUtilities;
+
+/*
+ * @version $Rev$ $Date$
+ */
+public class RunOnServerTest extends WorkbenchTestCase {
+
+    Shell workbenchShell = WorkbenchUtilities.getWorkbenchWindow().getShell();
+    AbbotHelper abbotHelper = new AbbotHelper(workbenchShell);
+    boolean success = false;
+
+
+    protected void setUp() throws Exception {
+        super.setUp();
+    }
+
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        deleteProject();
+        deleteServer();
+    }
+
+
+    public void testRunOnServer() {
+        createServer();
+        startServer();
+        createProject();
+        copyCodeToProject();
+        deployProject();
+    }
+
+
+    private void createServer() {
+        success = false;
+        try {
+            WorkbenchTasks workbenchTasks = new WorkbenchTasks(workbenchShell, abbotHelper);
+            // so we are sure that we are looking in the desired perspective
+            workbenchTasks.showJEEPerspective();
+            ServerTasks serverTasks = new ServerTasks(workbenchShell, abbotHelper, Constants.SERVER_V22 );
+            serverTasks.createServer();
+            serverTasks.startServer();
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+
+    private void startServer() {
+        success = false;
+        try {
+            ServerTasks serverTasks = new ServerTasks(workbenchShell, abbotHelper, Constants.SERVER_V22 );
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+
+    private void createProject() {
+        success = false;
+        try {
+            Shell wizardShell = abbotHelper.clickMenuItem (workbenchShell,
+                                                           new String[] {"&File", "&New\tAlt+Shift+N", "&Other..."},
+                                                           "New");
+            abbotHelper.clickTreeItem (wizardShell,
+                                       new String[] {"Web", "Dynamic Web Project"});
+            abbotHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
+            abbotHelper.setTextField(wizardShell,"", "DynamicWebProject");
+            abbotHelper.clickButton (wizardShell, IDialogConstants.FINISH_LABEL);
+            abbotHelper.waitForDialogDisposal(wizardShell);
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+
+    private void copyCodeToProject() {
+        success = false;
+        try {
+            IWorkspaceRoot aWSRoot = ResourcesPlugin.getWorkspace().getRoot();
+            IProject aProject = aWSRoot.getProject ("DynamicWebProject");
+            String fileDir = aWSRoot.getLocation().toOSString() + "/src/main/resources/run-on-server";
+            IFile aFile = aProject.getFile("WebContent/index.jsp");
+            aFile.create(new FileInputStream (fileDir + "/index.jsp"), true, null);
+            abbotHelper.waitTime( 1500 );
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+
+    private void deployProject() {
+        success = false;
+        try {
+            Shell deployShell = abbotHelper.rightClickItem(workbenchShell, "DynamicWebProject",
+                                                           new String [] {"&Run As", "&1 Run on Server\tAlt+Shift+X, R"}, 
+                                                           "Run On Server");
+            abbotHelper.clickButton (deployShell, IDialogConstants.FINISH_LABEL);
+            abbotHelper.waitTime( 10000 );
+            abbotHelper.clickCombo( workbenchShell, "http://localhost:8080/DynamicWebProject/");
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+
+    private void deleteProject() {
+        success = false;
+        try {
+            ProjectTasks projectTasks = new ProjectTasks(workbenchShell, abbotHelper, Constants.SERVER_V22 );
+            projectTasks.deleteProject ("DynamicWebProject");
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+
+    private void deleteServer() {
+        success = false;
+        try {
+            ServerTasks serverTasks = new ServerTasks(workbenchShell, abbotHelper, Constants.SERVER_V22 );
+            serverTasks.stopServer();
+            serverTasks.removeServer();
+            success = true;
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        assertTrue( success );
+    }
+
+}

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

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

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

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/SharedLibPojoTest.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/SharedLibPojoTest.java?rev=723171&r1=723170&r2=723171&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/SharedLibPojoTest.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/SharedLibPojoTest.java Wed Dec  3 16:51:19 2008
@@ -59,7 +59,7 @@
         createPojoProject();
         copyCodeToPojoProject();
         createHelloWorldProject();
-        copyCodeToHellowWorldProject();
+        copyCodeToHelloWorldProject();
         modifyHelloWorldBuildPath();
         deployHelloWorldProject();
         addSharedLibSupport();
@@ -148,7 +148,7 @@
         }
 
     }
-    public void copyCodeToHellowWorldProject()
+    public void copyCodeToHelloWorldProject()
     {
         try {
             IWorkspaceRoot aWSRoot = ResourcesPlugin.getWorkspace().getRoot();

Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/run-on-server/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/run-on-server/index.jsp?rev=723171&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/run-on-server/index.jsp (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/run-on-server/index.jsp Wed Dec  3 16:51:19 2008
@@ -0,0 +1,31 @@
+<!--
+   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>Run on Server</title>
+</head>
+<body>
+Run on Server Testcase !!!
+</body>
+</html>

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/run-on-server/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/run-on-server/index.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/run-on-server/index.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/test.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/test.xml?rev=723171&r1=723170&r2=723171&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/test.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/test.xml Wed Dec  3 16:51:19 2008
@@ -44,6 +44,7 @@
                   value="${eclipse-home}/jdt_folder"/>
         <delete dir="${jdt-folder}" quiet="true"/>
 
+
         <!-- 
          #########################################################################
          ##                                                                     ##
@@ -52,12 +53,24 @@
          #########################################################################
          -->
         <property name="extraVMargs" value="-XX:MaxPermSize=128m" />
-        <echo message="######################################################" />
-        <echo message="##                                                    " />
-        <echo message="## extraVMargs: ${extraVMargs}" />
-        <echo message="##                                                    " />
-        <echo message="######################################################" />
 
+
+        <!-- 
+         #########################################################################
+         ##                                                                     ##
+         ## Copy the resources required for this testsuite                      ##
+         ##                                                                     ##
+         #########################################################################
+         -->
+        <mkdir dir="${jdt-folder}/src"/>
+        <copy todir="${jdt-folder}/src">
+            <fileset dir="${eclipse-home}/../../../plugins/org.apache.geronimo.testsuite.v22/src">
+                <include name="**/*.java"/>
+                <include name="**/*.jsp"/>
+            </fileset>
+        </copy>
+        
+        
         <!--
          #########################################################################
          ##                                                                     ##
@@ -72,21 +85,22 @@
                       value="org.apache.geronimo.testsuite.v22.ui.EclipseUITest"/>
         </ant>
 
-        <!-- 
+
+        <!--
          #########################################################################
          ##                                                                     ##
-         ## Copy the testsuite.v22 resources required for the SharedLib project ##
+         ## Run on Server testcase                                              ##
          ##                                                                     ##
          #########################################################################
          -->
-        <mkdir dir="${jdt-folder}/src"/>
-        <copy todir="${jdt-folder}/src">
-            <fileset dir="${eclipse-home}/../../../plugins/org.apache.geronimo.testsuite.v22/src">
-                <include name="**/*.java"/>
-                <include name="**/*.jsp"/>
-            </fileset>
-        </copy>
-        
+        <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.v22.ui.RunOnServerTest"/>
+        </ant>
+
+
         <!--
          #########################################################################                                                                     ##
          ##                                                                     ##
@@ -101,6 +115,7 @@
              value="org.apache.geronimo.testsuite.v22.ui.SharedLibPojoTest"/>
         </ant>
     
+    
         <!-- 
          #########################################################################
          ##                                                                     ##
@@ -115,20 +130,6 @@
                       value="org.apache.geronimo.testsuite.v22.ui.NewServerTest"/>
         </ant>
 
-        <!-- 
-         #########################################################################
-         ##                                                                     ##
-         ## Copy the testsuite.v22 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.v22/src">
-                <include name="**/*.java"/>
-                <include name="**/*.jsp"/>
-            </fileset>
-        </copy>
 
         <!-- 
          #########################################################################
@@ -143,6 +144,8 @@
             <property name="classname"
                       value="org.apache.geronimo.testsuite.v22.ui.Tutorial5MinuteTest"/>
         </ant>
+
+
     </target>
 
     <!-- This target holds code to cleanup the testing environment after -->



Mime
View raw message