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/10/17 00:50:23 UTC
svn commit: r705389 [1/2] - in /geronimo/devtools/eclipse-plugin/trunk:
plugins/org.apache.geronimo.runtime.v20/
plugins/org.apache.geronimo.runtime.v21/
plugins/org.apache.geronimo.runtime.v21/META-INF/
plugins/org.apache.geronimo.runtime.v22/ plugins...
Author: mcconne
Date: Thu Oct 16 15:50:21 2008
New Revision: 705389
URL: http://svn.apache.org/viewvc?rev=705389&view=rev
Log:
Synchronize testsuite with the three appropriate Geronimo servers
Added:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/G-logo-32x32.gif (with props)
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/about.ini
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/.options
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/.project
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/LICENSE.txt (with props)
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/META-INF/
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/NOTICE.txt (with props)
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/plugin.xml (with props)
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml (with props)
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/Activator.java (with props)
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/EclipseUITest.java (with props)
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/NewServerTest.java (with props)
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/Tutorial5MinuteTest.java (with props)
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/MyServlet.java (with props)
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/MyStatelessSessionBean.java (with props)
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/RemoteBusinessInterface.java (with props)
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/index.jsp (with props)
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/test.xml (with props)
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/about.ini
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/pom.xml
geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml
geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.properties
geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.xml
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/Constants.java
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/EclipseUITest.java
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/EclipseUITest.java
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/pom.xml
geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml
geronimo/devtools/eclipse-plugin/trunk/testsuite/server/pom.xml
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml?rev=705389&r1=705388&r2=705389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml Thu Oct 16 15:50:21 2008
@@ -61,27 +61,27 @@
<include>NOTICE.txt</include>
</includes>
</resource>
- <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
See also http://www.eclipse.org/legal/guidetolegaldoc.php
about.html references about_files to show licenses and notices to the user
at install time using Eclipse Update Manager, and after install.
-->
- <resource>
- <targetPath>about_files</targetPath>
- <directory>.</directory>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
- <resource>
- <targetPath>about_files</targetPath>
- <directory>../..</directory>
+ <resource>
+ <targetPath>about_files</targetPath>
+ <directory>.</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
+ <targetPath>about_files</targetPath>
+ <directory>../..</directory>
<filtering>true</filtering>
- <includes>
+ <includes>
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
- </includes>
- </resource>
+ </includes>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF?rev=705389&r1=705388&r2=705389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF Thu Oct 16 15:50:21 2008
@@ -4,18 +4,18 @@
Bundle-SymbolicName: org.apache.geronimo.runtime.v21;singleton:=true
Bundle-Version: 2.2.0
Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
-Bundle-ClassPath: lib/geronimo-common-2.1.3.jar,
- lib/geronimo-deploy-jsr88-2.1.3.jar,
- lib/geronimo-deployment-2.1.3.jar,
- lib/geronimo-j2ee-schema-2.1.3.jar,
- lib/geronimo-kernel-2.1.3.jar,
- lib/geronimo-plugin-2.1.3.jar,
- lib/geronimo-system-2.1.3.jar,
- lib/geronimo-util-2.1.3.jar,
- lib/geronimo-deploy-config-2.1.3.jar,
+Bundle-ClassPath: lib/geronimo-common-2.1.4-SNAPSHOT.jar,
+ lib/geronimo-deploy-jsr88-2.1.4-SNAPSHOT.jar,
+ lib/geronimo-deployment-2.1.4-SNAPSHOT.jar,
+ lib/geronimo-j2ee-schema-2.1.4-SNAPSHOT.jar,
+ lib/geronimo-kernel-2.1.4-SNAPSHOT.jar,
+ lib/geronimo-plugin-2.1.4-SNAPSHOT.jar,
+ lib/geronimo-system-2.1.4-SNAPSHOT.jar,
+ lib/geronimo-util-2.1.4-SNAPSHOT.jar,
+ lib/geronimo-deploy-config-2.1.4-SNAPSHOT.jar,
lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar,
lib/plexus-archiver-1.0-alpha-7.jar,
- lib/geronimo-crypto-2.1.3.jar,
+ lib/geronimo-crypto-2.1.4-SNAPSHOT.jar,
lib/slf4j-api-1.4.3.jar,
lib/slf4j-simple-1.4.3.jar
Export-Package:
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml?rev=705389&r1=705388&r2=705389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml Thu Oct 16 15:50:21 2008
@@ -27,7 +27,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
- <geronimoVersion>2.1.3</geronimoVersion>
+ <geronimoVersion>2.1.4-SNAPSHOT</geronimoVersion>
</properties>
<build>
<resources>
@@ -61,27 +61,27 @@
<include>NOTICE.txt</include>
</includes>
</resource>
- <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
See also http://www.eclipse.org/legal/guidetolegaldoc.php
about.html references about_files to show licenses and notices to the user
at install time using Eclipse Update Manager, and after install.
-->
- <resource>
- <targetPath>about_files</targetPath>
- <directory>.</directory>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
- <resource>
- <targetPath>about_files</targetPath>
- <directory>../..</directory>
+ <resource>
+ <targetPath>about_files</targetPath>
+ <directory>.</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
+ <targetPath>about_files</targetPath>
+ <directory>../..</directory>
<filtering>true</filtering>
- <includes>
+ <includes>
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
- </includes>
- </resource>
+ </includes>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/pom.xml?rev=705389&r1=705388&r2=705389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v22/pom.xml Thu Oct 16 15:50:21 2008
@@ -61,27 +61,27 @@
<include>NOTICE.txt</include>
</includes>
</resource>
- <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
See also http://www.eclipse.org/legal/guidetolegaldoc.php
about.html references about_files to show licenses and notices to the user
at install time using Eclipse Update Manager, and after install.
-->
- <resource>
- <targetPath>about_files</targetPath>
- <directory>.</directory>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
- <resource>
- <targetPath>about_files</targetPath>
- <directory>../..</directory>
+ <resource>
+ <targetPath>about_files</targetPath>
+ <directory>.</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
+ <targetPath>about_files</targetPath>
+ <directory>../..</directory>
<filtering>true</filtering>
- <includes>
+ <includes>
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
- </includes>
- </resource>
+ </includes>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/about.ini
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/about.ini?rev=705389&r1=705388&r2=705389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/about.ini (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/about.ini Thu Oct 16 15:50:21 2008
@@ -21,7 +21,7 @@
# Property "aboutText" contains blurb for feature details in the "About"
# dialog. Maximum 15 lines and 75 characters per line.
#
-aboutText=Apache Geronimo v2.2 Server Adapter\n\
+aboutText=Apache Geronimo v2.1 Server Adapter\n\
Version: ${pom.version}-${buildNumber}\n\
\n\
(c) Copyright 2003-2008 The Apache Software Foundation\n\
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml?rev=705389&r1=705388&r2=705389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/pom.xml Thu Oct 16 15:50:21 2008
@@ -35,6 +35,7 @@
<include>about.html</include>
</includes>
</resource>
+
<resource>
<directory>.</directory>
<filtering>true</filtering>
@@ -45,6 +46,7 @@
<include>about.ini</include>
</includes>
</resource>
+
<!--
|
| GERONIMODEVTOOLS-482: Ensure filtering is not used on a binary resource
@@ -57,6 +59,7 @@
<include>G-logo-32x32.gif</include>
</includes>
</resource>
+
<!-- The Geronimo covention puts license and notice for artifacts shipped in this jar
in the jar's meta-inf directory -->
<resource>
@@ -67,27 +70,29 @@
<include>NOTICE.txt</include>
</includes>
</resource>
- <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
- See also http://www.eclipse.org/legal/guidetolegaldoc.php
- about.html references about_files to show licenses and notices to the user
- at install time using Eclipse Update Manager, and after install.
- -->
- <resource>
- <targetPath>about_files</targetPath>
- <directory>.</directory>
- <includes>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
- <resource>
- <targetPath>about_files</targetPath>
- <directory>../..</directory>
+
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ See also http://www.eclipse.org/legal/guidetolegaldoc.php
+ about.html references about_files to show licenses and notices to the user
+ at install time using Eclipse Update Manager, and after install.
+ -->
+ <resource>
+ <targetPath>about_files</targetPath>
+ <directory>.</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+
+ <resource>
+ <targetPath>about_files</targetPath>
+ <directory>../..</directory>
<filtering>true</filtering>
- <includes>
+ <includes>
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
- </includes>
- </resource>
+ </includes>
+ </resource>
</resources>
<plugins>
<plugin>
@@ -103,6 +108,19 @@
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${pom.basedir}</directory>
+ <includes>
+ <include>bin</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/G-logo-32x32.gif
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/G-logo-32x32.gif?rev=705389&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/G-logo-32x32.gif
------------------------------------------------------------------------------
svn:mime-type = image/gif
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/about.ini
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/about.ini?rev=705389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/about.ini (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/about.ini Thu Oct 16 15:50:21 2008
@@ -0,0 +1,38 @@
+#
+# 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$
+#
+
+#
+# Property "aboutText" contains blurb for feature details in the "About"
+# dialog. Maximum 15 lines and 75 characters per line.
+#
+aboutText=Apache Geronimo v2.2 Server Adapter\n\
+Version: ${pom.version}-${buildNumber}\n\
+\n\
+(c) Copyright 2003-2008 The Apache Software Foundation\n\
+Visit http://www.apache.org/licenses/LICENSE-2.0.txt for additional details\n\
+\n\
+Visit http://geronimo.apache.org/development-tools.html\n\
+\n\
+This product includes software developed by the\n\
+Apache Software Foundation http://www.apache.org/
+
+#
+# Property "featureImage" contains path to feature image (32x32)
+#
+featureImage=G-logo-32x32.gif
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/pom.xml?rev=705389&r1=705388&r2=705389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/pom.xml Thu Oct 16 15:50:21 2008
@@ -35,6 +35,7 @@
<include>about.html</include>
</includes>
</resource>
+
<resource>
<directory>.</directory>
<filtering>true</filtering>
@@ -42,8 +43,10 @@
<include>plugin.xml</include>
<include>plugin.properties</include>
<include>.options</include>
+ <include>about.ini</include>
</includes>
</resource>
+
<!--
|
| GERONIMODEVTOOLS-482: Ensure filtering is not used on a binary resource
@@ -51,8 +54,15 @@
|
-->
<resource>
+ <directory>.</directory>
+ <includes>
+ <include>G-logo-32x32.gif</include>
+ </includes>
+ </resource>
+
<!-- The Geronimo covention puts license and notice for artifacts shipped in this jar
in the jar's meta-inf directory -->
+ <resource>
<targetPath>META-INF</targetPath>
<directory>.</directory>
<includes>
@@ -60,27 +70,29 @@
<include>NOTICE.txt</include>
</includes>
</resource>
- <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
- See also http://www.eclipse.org/legal/guidetolegaldoc.php
- about.html references about_files to show licenses and notices to the user
- at install time using Eclipse Update Manager, and after install.
- -->
- <resource>
- <targetPath>about_files</targetPath>
+
+ <!-- GERONIMODEVTOOLS-406 Display license and notice in Eclipse Update Manager
+ See also http://www.eclipse.org/legal/guidetolegaldoc.php
+ about.html references about_files to show licenses and notices to the user
+ at install time using Eclipse Update Manager, and after install.
+ -->
+ <resource>
+ <targetPath>about_files</targetPath>
<directory>.</directory>
<includes>
<include>LICENSE.txt</include>
<include>NOTICE.txt</include>
</includes>
</resource>
- <resource>
- <targetPath>about_files</targetPath>
- <directory>../..</directory>
+
+ <resource>
+ <targetPath>about_files</targetPath>
+ <directory>../..</directory>
<filtering>true</filtering>
- <includes>
+ <includes>
<include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
- </includes>
- </resource>
+ </includes>
+ </resource>
</resources>
<plugins>
<plugin>
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=705389&r1=705388&r2=705389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml Thu Oct 16 15:50:21 2008
@@ -230,7 +230,7 @@
<target name="gep-plugins" depends="init" description="Copy the GEP plugin(s) into the test_eclipse installation">
<!--
|
- | Copy the GEP plugins to the testsuite Eclipse plugins directory
+ | Copy the GEP plugins to the launcher Eclipse plugins directory
|
-->
<mkdir dir="${test_eclipse}"/>
@@ -241,6 +241,9 @@
<fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.runtime.common/${gep_version}">
<include name="**/*.jar"/>
</fileset>
+ <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.runtime.v22/${gep_version}">
+ <include name="**/*.jar"/>
+ </fileset>
<fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.runtime.v21/${gep_version}">
<include name="**/*.jar"/>
</fileset>
@@ -256,6 +259,12 @@
<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.v22.core/${gep_version}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.v22.ui/${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>
@@ -271,15 +280,15 @@
</copy>
</target>
- <target name="gep-features" depends="init" description="Copy the GEP feature(s) into the test_eclipse installation">
+ <target name="gep-features" depends="init" description="Unzip the GEP latest feature to the launcher Eclipse features directory">
<!--
|
- | Unzip the GEP feature(s) to the testsuite Eclipse features directory
+ | Unzip the GEP latest feature to the launcher Eclipse features directory (for one branding testcase)
|
-->
<mkdir dir="${test_eclipse}"/>
- <unzip src="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.v21.feature/${gep_version}/org.apache.geronimo.v21.feature-${gep_version}.jar"
- dest="${test_eclipse}eclipse/features/org.apache.geronimo.v21.feature_${gep_version}"
+ <unzip src="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.v22.feature/${gep_version}/org.apache.geronimo.v22.feature-${gep_version}.jar"
+ dest="${test_eclipse}eclipse/features/org.apache.geronimo.v22.feature_${gep_version}"
overwrite="true"/>
</target>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.properties?rev=705389&r1=705388&r2=705389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.properties (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.properties Thu Oct 16 15:50:21 2008
@@ -16,6 +16,7 @@
#
# @version $Rev$ $Date$
#
+org.apache.geronimo.testsuite.v22=org.apache.geronimo.testsuite.v22-2.2.0
org.apache.geronimo.testsuite.v21=org.apache.geronimo.testsuite.v21-2.2.0
org.apache.geronimo.testsuite.v20=org.apache.geronimo.testsuite.v20-2.2.0
org.apache.geronimo.testsuite.common=org.apache.geronimo.testsuite.common-2.2.0
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.xml?rev=705389&r1=705388&r2=705389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.xml Thu Oct 16 15:50:21 2008
@@ -52,6 +52,10 @@
<style style="${eclipse-home}/plugins/org.eclipse.test/JUNIT.XSL" basedir="${results}/xml" destdir="${results}/html" />
</target>
+ <target name="testsuite.v22">
+ <runTests testPlugin="org.apache.geronimo.testsuite.v22"/>
+ </target>
+
<target name="testsuite.v21">
<runTests testPlugin="org.apache.geronimo.testsuite.v21"/>
</target>
@@ -61,6 +65,7 @@
</target>
<target name="all">
+ <antcall target="testsuite.v22" />
<antcall target="testsuite.v21" />
<antcall target="testsuite.v20" />
</target>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/Constants.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/Constants.java?rev=705389&r1=705388&r2=705389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/Constants.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/Constants.java Thu Oct 16 15:50:21 2008
@@ -21,6 +21,7 @@
import java.util.Map;
public final class Constants {
+ public final static String SERVER_V22 = "v22";
public final static String SERVER_V21 = "v21";
public final static String SERVER_V20 = "v20";
@@ -33,15 +34,19 @@
private final static Map constants;
static {
constants = new Hashtable();
+ addConstant( SERVER_V22, SERVERNAME, "Apache Geronimo v2.2 Server" );
addConstant( SERVER_V21, SERVERNAME, "Apache Geronimo v2.1 Server" );
addConstant( SERVER_V20, SERVERNAME, "Apache Geronimo v2.0 Server" );
+ addConstant( SERVER_V22, SERVERDISPLAY, "Apache Geronimo v2.2 Server at localhost" );
addConstant( SERVER_V21, SERVERDISPLAY, "Apache Geronimo v2.1 Server at localhost" );
addConstant( SERVER_V20, SERVERDISPLAY, "Apache Geronimo v2.0 Server at localhost" );
+ addConstant( SERVER_V22, SERVERRUNTIME, "Apache Geronimo v2.2" );
addConstant( SERVER_V21, SERVERRUNTIME, "Apache Geronimo v2.1" );
addConstant( SERVER_V20, SERVERRUNTIME, "Apache Geronimo v2.0" );
+ addConstant( SERVER_V22, SERVERPATH, "server_v2.2" );
addConstant( SERVER_V21, SERVERPATH, "server_v2.1" );
addConstant( SERVER_V20, SERVERPATH, "server_v2.0" );
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/EclipseUITest.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/EclipseUITest.java?rev=705389&r1=705388&r2=705389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/EclipseUITest.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/EclipseUITest.java Thu Oct 16 15:50:21 2008
@@ -45,18 +45,6 @@
{
boolean success = false;
try {
- // About Eclipse Test Case. There are three Shell newShell, nextShell and nextNextShell
- //used because we need to save the states for newShell and nextShell
- //newShell->nextShell->nextNextShell this is the order in which shell comes up
- aShell = WorkbenchUtilities.getWorkbenchWindow().getShell();
- aHelper = new AbbotHelper(aShell);
- Shell newShell = aHelper.clickMenuItem(aShell, new String[]{"&Help","&About Eclipse Platform"},"About Eclipse Platform");
- Shell nextShell = aHelper.clickImageButton(newShell, "Apache.org - Geronimo v21 Server Tools Core Plug-in","About Eclipse Platform Features");
- Shell nextNextShell = aHelper.clickButton(nextShell, "&Plug-in Details", "Feature Plug-ins");
- aHelper.clickButton(nextNextShell, IDialogConstants.OK_LABEL);
- aHelper.clickButton(nextShell, IDialogConstants.OK_LABEL);
- aHelper.clickButton(newShell, IDialogConstants.OK_LABEL);
-
success = true;
}
catch(Exception e)
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/EclipseUITest.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/EclipseUITest.java?rev=705389&r1=705388&r2=705389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/EclipseUITest.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/EclipseUITest.java Thu Oct 16 15:50:21 2008
@@ -45,18 +45,6 @@
{
boolean success = false;
try {
- // About Eclipse Test Case. There are three Shell newShell, nextShell and nextNextShell
- //used because we need to save the states for newShell and nextShell
- //newShell->nextShell->nextNextShell this is the order in which shell comes up
- aShell = WorkbenchUtilities.getWorkbenchWindow().getShell();
- aHelper = new AbbotHelper(aShell);
- Shell newShell = aHelper.clickMenuItem(aShell, new String[]{"&Help","&About Eclipse Platform"},"About Eclipse Platform");
- Shell nextShell = aHelper.clickImageButton(newShell, "Apache.org - Geronimo v21 Server Tools Core Plug-in","About Eclipse Platform Features");
- Shell nextNextShell = aHelper.clickButton(nextShell, "&Plug-in Details", "Feature Plug-ins");
- aHelper.clickButton(nextNextShell, IDialogConstants.OK_LABEL);
- aHelper.clickButton(nextShell, IDialogConstants.OK_LABEL);
- aHelper.clickButton(newShell, IDialogConstants.OK_LABEL);
-
success = true;
}
catch(Exception e)
Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/.options
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/.options?rev=705389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/.options (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/.options Thu Oct 16 15:50:21 2008
@@ -0,0 +1 @@
+org.apache.geronimo.testsuite.v22.core/debug=true
\ No newline at end of file
Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/.project
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/.project?rev=705389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/.project (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/.project Thu Oct 16 15:50:21 2008
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.apache.geronimo.testsuite.v22</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/LICENSE.txt?rev=705389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/LICENSE.txt (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/LICENSE.txt Thu Oct 16 15:50:21 2008
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/META-INF/MANIFEST.MF?rev=705389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/META-INF/MANIFEST.MF (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/META-INF/MANIFEST.MF Thu Oct 16 15:50:21 2008
@@ -0,0 +1,30 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Geronimo v22 Server Tools Testsuite Plug-in
+Bundle-SymbolicName: org.apache.geronimo.testsuite.v22;singleton:=true
+Bundle-Version: 2.2.0
+Bundle-Activator: org.apache.geronimo.testsuite.v22.Activator
+Bundle-Vendor: Apache.org
+Bundle-Localization: plugin
+Require-Bundle: abbot.swt,
+ abbot.swt.eclipse,
+ org.eclipse.core.runtime,
+ org.eclipse.debug.ui,
+ org.eclipse.debug.core,
+ org.eclipse.jdt.core,
+ org.eclipse.jdt.launching;visibility:=reexport,
+ org.eclipse.jst.common.frameworks,
+ org.eclipse.jst.j2ee,
+ org.eclipse.jst.j2ee.ejb,
+ org.eclipse.jst.j2ee.jca,
+ org.eclipse.jst.j2ee.web,
+ org.eclipse.jst.server.core;visibility:=reexport,
+ org.eclipse.ui,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.forms,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.apache.geronimo.testsuite.common
+Bundle-ActivationPolicy: lazy
+Export-Package: org.apache.geronimo.testsuite.v22
+Import-Package: junit.framework;version="3.8.2"
Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/NOTICE.txt?rev=705389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/NOTICE.txt (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/NOTICE.txt Thu Oct 16 15:50:21 2008
@@ -0,0 +1,7 @@
+Apache Geronimo
+Copyright 2003-2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/plugin.xml?rev=705389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/plugin.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/plugin.xml Thu Oct 16 15:50:21 2008
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<!--
+ ~ 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$ -->
+
+<plugin
+ id="org.apache.geronimo.testsuite.v22"
+ name="Geronimo v22 Server Tools Testsuite Plug-in"
+ provider-name="Apache.org"
+ version="2.2.0"
+ class="org.apache.geronimo.testsuite.v22.Activator">
+
+ <requires>
+ <import plugin="abbot.swt"/>
+ <import plugin="abbot.swt.eclipse"/>
+ <import plugin="org.eclipse.ui.ide" optional="true"/>
+ <import plugin="org.eclipse.jface.text" optional="true"/>
+ <import plugin="org.eclipse.ui.workbench.texteditor" optional="true"/>
+ <import plugin="org.eclipse.ui.editors" optional="true"/>
+ <import plugin="org.junit"/>
+ <import plugin="org.eclipse.core.resources"/>
+ <import plugin="org.eclipse.jdt.core"/>
+ <import plugin="org.eclipse.jdt.launching"/>
+ <import plugin="org.eclipse.ui"/>
+ <import plugin="org.eclipse.ant.core"/>
+ <import plugin="org.eclipse.debug.core"/>
+ <import plugin="org.eclipse.debug.ui"/>
+ <import plugin="org.eclipse.ui.externaltools"/>
+ <import plugin="org.eclipse.ant.ui"/>
+ <import plugin="org.eclipse.core.runtime"/>
+ <import plugin="org.eclipse.ui.console"/>
+ <import plugin="org.apache.geronimo.testsuite.common"/>
+ </requires>
+
+</plugin>
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/plugin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/plugin.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/plugin.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml?rev=705389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml Thu Oct 16 15:50:21 2008
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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$ -->
+
+<project>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>org.apache.geronimo.testsuite.v22</artifactId>
+ <packaging>jar</packaging>
+ <version>2.2.0</version>
+ <name>${artifactId}</name>
+
+ <parent>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>testsuite-plugins</artifactId>
+ <version>2.2.0</version>
+ </parent>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>test.xml</include>
+ <include>plugin.xml</include>
+ <include>plugin.properties</include>
+ </includes>
+ </resource>
+
+ <resource>
+ <targetPath>META-INF</targetPath>
+ <directory>.</directory>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>maven-eclipsepde-plugin</artifactId>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+
+ <!--
+ |
+ | Unzip the resulting plugin jar into the launcher eclipse directory for later usage
+ |
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.testsuite.v22-2.2.0"/>
+ <unzip src="${project.build.directory}/org.apache.geronimo.testsuite.v22-2.2.0.jar"
+ dest="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.testsuite.v22-2.2.0"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Exclude tutorial java files -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/MyServlet.java</exclude>
+ <exclude>**/MyStatelessSessionBean.java</exclude>
+ <exclude>**/RemoteBusinessInterface.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>eclipse</artifactId>
+ <version>${version}</version>
+ <type>pom</type>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>org.apache.geronimo.st.core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>org.apache.geronimo.st.v22.core</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>org.apache.geronimo.jee.v21.jaxbmodel</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>org.apache.geronimo.runtime.common</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>org.apache.geronimo.runtime.v22</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>abbot</groupId>
+ <artifactId>abbot.swt</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>abbot</groupId>
+ <artifactId>abbot.swt.eclipse</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>org.apache.geronimo.testsuite.common</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/Activator.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/Activator.java?rev=705389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/Activator.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/Activator.java Thu Oct 16 15:50:21 2008
@@ -0,0 +1,93 @@
+/*
+ * 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;
+
+import org.apache.geronimo.testsuite.common.selenium.EclipseSeleniumServer;
+import org.apache.geronimo.testsuite.common.ui.AbbotHelper;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.SafeRunner;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.swt.widgets.Shell;
+import org.osgi.framework.BundleContext;
+
+import abbot.swt.eclipse.utils.WorkbenchUtilities;
+
+/**
+ * The activator class controls the plug-in life cycle
+ *
+ * @version $Rev$ $Date$
+ */
+public class Activator extends Plugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.apache.geronimo.st.v22.core";
+
+ // The shared instance
+ private static Activator plugin;
+
+ private EclipseSeleniumServer seleniumServer;
+ /**
+ * The constructor
+ */
+ public Activator() {
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ Shell workbenchShell = WorkbenchUtilities.getWorkbenchWindow().getShell();
+ AbbotHelper aHelper = new AbbotHelper (workbenchShell);
+ seleniumServer = new EclipseSeleniumServer(aHelper, workbenchShell);
+ try {
+ SafeRunner.run( seleniumServer );
+ Thread.sleep(5000);
+// new Exception("sdsfsdf").printStackTrace();
+ } catch ( Exception e ) {
+ e.printStackTrace();
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ seleniumServer.stop();
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+ public static void log(int severity, String message, Throwable throwable) {
+ plugin.getLog().log(new Status(severity, PLUGIN_ID, 0, message, throwable));
+ }
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/Activator.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/Activator.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/Activator.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/EclipseUITest.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/EclipseUITest.java?rev=705389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/EclipseUITest.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/EclipseUITest.java Thu Oct 16 15:50:21 2008
@@ -0,0 +1,68 @@
+/*
+ * 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 org.apache.geronimo.testsuite.common.ui.AbbotHelper;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.swt.widgets.Shell;
+
+import abbot.swt.eclipse.junit.extensions.WorkbenchTestCase;
+import abbot.swt.eclipse.utils.Preferences;
+import abbot.swt.eclipse.utils.WorkbenchUtilities;
+import abbot.swt.eclipse.utils.Preferences.Mode;
+
+/*
+ * @version $Rev$ $Date$
+ */
+public class EclipseUITest extends WorkbenchTestCase {
+ Shell aShell;
+ AbbotHelper aHelper;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ Preferences.setPerspectiveSwitchPrompt(Mode.Always);
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ public void testEclipseUI()
+ {
+ boolean success = false;
+ try {
+ // About Eclipse Test Case. There are three Shell newShell, nextShell and nextNextShell
+ //used because we need to save the states for newShell and nextShell
+ //newShell->nextShell->nextNextShell this is the order in which shell comes up
+ aShell = WorkbenchUtilities.getWorkbenchWindow().getShell();
+ aHelper = new AbbotHelper(aShell);
+ Shell newShell = aHelper.clickMenuItem(aShell, new String[]{"&Help","&About Eclipse Platform"},"About Eclipse Platform");
+ Shell nextShell = aHelper.clickImageButton(newShell, "Apache.org - Geronimo v22 Server Tools Core Plug-in","About Eclipse Platform Features");
+ Shell nextNextShell = aHelper.clickButton(nextShell, "&Plug-in Details", "Feature Plug-ins");
+ aHelper.clickButton(nextNextShell, IDialogConstants.OK_LABEL);
+ aHelper.clickButton(nextShell, IDialogConstants.OK_LABEL);
+ aHelper.clickButton(newShell, IDialogConstants.OK_LABEL);
+
+ 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/EclipseUITest.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/EclipseUITest.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/EclipseUITest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/NewServerTest.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/NewServerTest.java?rev=705389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/NewServerTest.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/NewServerTest.java Thu Oct 16 15:50:21 2008
@@ -0,0 +1,91 @@
+/*
+ * 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 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.ServerTasks;
+import org.apache.geronimo.testsuite.common.ui.WorkbenchTasks;
+import org.eclipse.swt.widgets.Shell;
+
+import abbot.swt.eclipse.junit.extensions.WorkbenchTestCase;
+import abbot.swt.eclipse.utils.Preferences;
+import abbot.swt.eclipse.utils.WorkbenchUtilities;
+import abbot.swt.eclipse.utils.Preferences.Mode;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class NewServerTest 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);
+
+ ServerTasks serverTasks = new ServerTasks(workbenchShell, aHelper, Constants.SERVER_V22 );
+ WorkbenchTasks workbenchTasks = new WorkbenchTasks(workbenchShell, aHelper);
+
+ // so we are sure that we are looking in the desired perspective
+ workbenchTasks.showJEEPerspective();
+
+ // create server from an installed instance
+ serverTasks.createServer();
+
+ serverTasks.startServer();
+
+ EclipseSelenium selenium = new EclipseSelenium();
+ selenium.start();
+
+ selenium.open( "http://localhost:8080/console/" );
+ selenium.waitForPageToLoad( "2000" );
+ selenium.type("j_username", "system");
+ selenium.type("j_password", "manager");
+ selenium.click("submit");
+
+ serverTasks.stopServer();
+
+ // remove the server
+ serverTasks.removeServer();
+
+ selenium.stop();
+
+ 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/NewServerTest.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/NewServerTest.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/NewServerTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/Tutorial5MinuteTest.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/Tutorial5MinuteTest.java?rev=705389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/Tutorial5MinuteTest.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/java/org/apache/geronimo/testsuite/v22/ui/Tutorial5MinuteTest.java Thu Oct 16 15:50:21 2008
@@ -0,0 +1,103 @@
+/*
+ * 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.File;
+
+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.Tutorial5Minute;
+import org.apache.geronimo.testsuite.common.ui.WorkbenchTasks;
+import org.eclipse.core.resources.IWorkspace;
+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.Preferences;
+import abbot.swt.eclipse.utils.WorkbenchUtilities;
+import abbot.swt.eclipse.utils.Preferences.Mode;
+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);
+
+ ServerTasks serverTasks = new ServerTasks(workbenchShell, aHelper, Constants.SERVER_V22 );
+ WorkbenchTasks workbenchTasks = new WorkbenchTasks(workbenchShell, aHelper);
+ ProjectTasks projectTasks = new ProjectTasks(workbenchShell, aHelper, Constants.SERVER_V22 );
+
+ // so we are sure that we are looking in the desired perspective
+ workbenchTasks.showJEEPerspective();
+
+ // create server from an installed instance
+ serverTasks.createServer();
+
+ Tutorial5Minute tutorial = new Tutorial5Minute (workbenchShell, aHelper);
+ tutorial.createProjects ();
+
+ serverTasks.publishAllProjects();
+ serverTasks.startServer();
+
+ tutorial.webTesting();
+
+ serverTasks.stopServer();
+
+ // delete the projects that have been created
+ // reverse alphabetical is a little smoother
+ projectTasks.deleteProject ("SampleWAR");
+ projectTasks.deleteProject ("SampleEJB");
+ projectTasks.deleteProject ("SampleEAR");
+
+ // remove the server
+ 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/Tutorial5MinuteTest.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/Tutorial5MinuteTest.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/Tutorial5MinuteTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/MyServlet.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/MyServlet.java?rev=705389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/MyServlet.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/MyServlet.java Thu Oct 16 15:50:21 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.v22/src/main/resources/ui-tutorial/MyServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/MyServlet.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/MyServlet.java
------------------------------------------------------------------------------
svn:mime-type = text/plain