You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2008/11/03 20:29:30 UTC

svn commit: r710137 - in /geronimo/devtools/eclipse-plugin/trunk: eclipse/ testsuite/eclipse/ testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/

Author: mcconne
Date: Mon Nov  3 11:29:29 2008
New Revision: 710137

URL: http://svn.apache.org/viewvc?rev=710137&view=rev
Log:
GERONIMODEVTOOLS-527 Upgrade testsuite to use Ganymede SR1

Modified:
    geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ProjectTasks.java
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/Tutorial5Minute.java

Modified: geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml?rev=710137&r1=710136&r2=710137&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml Mon Nov  3 11:29:29 2008
@@ -26,10 +26,10 @@
 <project name="GanymedeArtifacts">
 
     <target name="init">
-        <property name="ganymede_url"           value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/ganymede/R/"/>
-        <property name="ganymede_jee_win32"     value="eclipse-jee-ganymede-win32.zip"/>
-        <property name="ganymede_jee_linux"     value="eclipse-jee-ganymede-linux-gtk.tar"/>
-        <property name="ganymede_jee_macos"     value="eclipse-jee-ganymede-macosx-carbon.tar"/>
+        <property name="ganymede_url"           value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/ganymede/SR1/"/>
+        <property name="ganymede_jee_win32"     value="eclipse-jee-ganymede-SR1-win32.zip"/>
+        <property name="ganymede_jee_linux"     value="eclipse-jee-ganymede-SR1-linux-gtk.tar"/>
+        <property name="ganymede_jee_macos"     value="eclipse-jee-ganymede-SR1-macosx-carbon.tar"/>
         <property name="ganymede_jee_linux_gz"  value="${ganymede_jee_linux}.gz"/>
         <property name="ganymede_jee_macos_gz"  value="${ganymede_jee_macos}.gz"/>
         <property name="protocol"               value="&amp;r=1&amp;protocol=http"/>

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=710137&r1=710136&r2=710137&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml Mon Nov  3 11:29:29 2008
@@ -29,10 +29,10 @@
 <project name="TestsuiteArtifacts">
 
     <target name="init">
-        <property name="ganymede_url"           value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/ganymede/R/"/>
-        <property name="ganymede_jee_win32"     value="eclipse-jee-ganymede-win32.zip"/>
-        <property name="ganymede_jee_linux"     value="eclipse-jee-ganymede-linux-gtk.tar"/>
-        <property name="ganymede_jee_macos"     value="eclipse-jee-ganymede-macosx-carbon.tar"/>
+        <property name="ganymede_url"           value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/ganymede/SR1/"/>
+        <property name="ganymede_jee_win32"     value="eclipse-jee-ganymede-SR1-win32.zip"/>
+        <property name="ganymede_jee_linux"     value="eclipse-jee-ganymede-SR1-linux-gtk.tar"/>
+        <property name="ganymede_jee_macos"     value="eclipse-jee-ganymede-SR1-macosx-carbon.tar"/>
         <property name="ganymede_jee_linux_gz"  value="${ganymede_jee_linux}.gz"/>
         <property name="ganymede_jee_macos_gz"  value="${ganymede_jee_macos}.gz"/>
         <property name="protocol"               value="&amp;r=1&amp;protocol=http"/>

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ProjectTasks.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/ProjectTasks.java?rev=710137&r1=710136&r2=710137&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ProjectTasks.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ProjectTasks.java Mon Nov  3 11:29:29 2008
@@ -77,7 +77,7 @@
                 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, "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);
@@ -88,6 +88,7 @@
         
         aHelper.waitForDialogDisposal (wizardShell);
         
+        aHelper.doubleClickItem(workbenchShell, "SampleEJB");
         aHelper.doubleClickItem(workbenchShell, "ejbModule");
         aHelper.doubleClickItem(workbenchShell, "META-INF");
         Shell questionShell = aHelper.rightClickItem(workbenchShell, "openejb-jar.xml",
@@ -105,7 +106,7 @@
                 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, "Add &project to an EAR");
         aHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
         aHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
         aHelper.setTextField(wizardShell, "default", "sampleear");

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/Tutorial5Minute.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/Tutorial5Minute.java?rev=710137&r1=710136&r2=710137&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/Tutorial5Minute.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/Tutorial5Minute.java Mon Nov  3 11:29:29 2008
@@ -83,7 +83,7 @@
                 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, "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);
@@ -94,6 +94,7 @@
         
         aHelper.waitForDialogDisposal (wizardShell);
         
+        aHelper.doubleClickItem(workbenchShell, "SampleEJB");
         aHelper.doubleClickItem(workbenchShell, "ejbModule");
         aHelper.doubleClickItem(workbenchShell, "META-INF");
         Shell questionShell = aHelper.rightClickItem(workbenchShell, "openejb-jar.xml",
@@ -111,7 +112,7 @@
                 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, "Add &project to an EAR");
         aHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
         aHelper.clickButton (wizardShell, IDialogConstants.NEXT_LABEL);
         aHelper.setTextField(wizardShell, "default", "sampleear");