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 [2/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...
Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/MyStatelessSessionBean.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/MyStatelessSessionBean.java?rev=705389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/MyStatelessSessionBean.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/MyStatelessSessionBean.java Thu Oct 16 15:50:21 2008
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sampleear;
+
+import javax.ejb.Stateless;
+
+/**
+ * MyStatelessSessionBean
+ *
+ * @version $Rev$ $Date$
+ */
+@Stateless
+public class MyStatelessSessionBean implements RemoteBusinessInterface {
+
+ public String sayHello(String name) {
+ return getClass().getName() + " says hello to " + name + ".";
+ }
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/MyStatelessSessionBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/MyStatelessSessionBean.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/MyStatelessSessionBean.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/RemoteBusinessInterface.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/RemoteBusinessInterface.java?rev=705389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/RemoteBusinessInterface.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/RemoteBusinessInterface.java Thu Oct 16 15:50:21 2008
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sampleear;
+
+import javax.ejb.Remote;
+
+/**
+ * RemoteBusinessInterface
+ *
+ * @version $Rev$ $Date$
+ */
+@Remote
+public interface RemoteBusinessInterface {
+ public String sayHello(String name);
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/RemoteBusinessInterface.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/RemoteBusinessInterface.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/RemoteBusinessInterface.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/index.jsp?rev=705389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/index.jsp (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/index.jsp Thu Oct 16 15:50:21 2008
@@ -0,0 +1,32 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- @version $Rev$ $Date$ -->
+
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>5-minute Tutorial on Enterprise Application Development with Eclipse and Geronimo</title>
+ </head>
+ <body>
+ <form action="${pageContext.request.contextPath}/sayHello">
+ <input type="text" name="name" /><input type="submit" name="submit" value="Press me!" />
+ </form>
+ </body>
+</html>
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/index.jsp
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/src/main/resources/ui-tutorial/index.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: 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=705389&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/test.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/test.xml Thu Oct 16 15:50:21 2008
@@ -0,0 +1,134 @@
+<?xml version="1.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$ -->
+
+<project name="testsuite" default="run" basedir=".">
+
+ <!-- sets the properties eclipse-home, and library-file -->
+ <!-- The property ${eclipse-home} should be passed into this script -->
+ <!-- Set a meaningful default value for when it is not. -->
+ <property name="eclipse-home" value="${basedir}\..\.."/>
+ <property name="plugin-name" value="org.apache.geronimo.testsuite.v22"/>
+ <property name="library-file"
+ value="${eclipse-home}/../../../plugins/org.apache.geronimo.testsuite.common/library.xml"/>
+
+ <!-- This target holds all initialization code that needs to be done for -->
+ <!-- all tests that are to be run. Initialization for individual tests -->
+ <!-- should be done within the body of the suite target. -->
+ <target name="init">
+ <tstamp/>
+ <delete>
+ <fileset dir="${eclipse-home}" includes="org*.xml"/>
+ </delete>
+ </target>
+
+ <!-- This target defines the tests that need to be run. -->
+ <target name="suite">
+ <property name="jdt-folder"
+ value="${eclipse-home}/jdt_folder"/>
+ <delete dir="${jdt-folder}" quiet="true"/>
+
+ <!--
+ #########################################################################
+ ## ##
+ ## Extra permgen memory required for this testsuite ##
+ ## ##
+ #########################################################################
+ -->
+ <property name="extraVMargs" value="-XX:MaxPermSize=128m" />
+ <echo message="######################################################" />
+ <echo message="## " />
+ <echo message="## extraVMargs: ${extraVMargs}" />
+ <echo message="## " />
+ <echo message="######################################################" />
+
+ <!--
+ #########################################################################
+ ## ##
+ ## Check UI Installation testcase ##
+ ## ##
+ #########################################################################
+ -->
+ <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="data-dir" value="${jdt-folder}"/>
+ <property name="plugin-name" value="${plugin-name}"/>
+ <property name="classname"
+ value="org.apache.geronimo.testsuite.v22.ui.EclipseUITest"/>
+ </ant>
+
+ <!--
+ #########################################################################
+ ## ##
+ ## Define new server testcase ##
+ ## ##
+ #########################################################################
+ -->
+ <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="data-dir" value="${jdt-folder}"/>
+ <property name="plugin-name" value="${plugin-name}"/>
+ <property name="classname"
+ value="org.apache.geronimo.testsuite.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>
+
+ <!--
+ #########################################################################
+ ## ##
+ ## 5 minute tutorial testcase ##
+ ## ##
+ #########################################################################
+ -->
+ <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="data-dir" value="${jdt-folder}"/>
+ <property name="plugin-name" value="${plugin-name}"/>
+ <property name="classname"
+ value="org.apache.geronimo.testsuite.v22.ui.Tutorial5MinuteTest"/>
+ </ant>
+ </target>
+
+ <!-- This target holds code to cleanup the testing environment after -->
+ <!-- after all of the tests have been run. You can use this target to -->
+ <!-- delete temporary files that have been created. -->
+ <target name="cleanup">
+ </target>
+
+ <!-- This target runs the test suite. Any actions that need to happen -->
+ <!-- after all the tests have been run should go here. -->
+ <target name="run" depends="init,suite,cleanup">
+ <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="includes" value="org*.xml"/>
+ <property name="output-file" value="${plugin-name}.xml"/>
+ </ant>
+ </target>
+
+</project>
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/test.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/test.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/test.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/pom.xml?rev=705389&r1=705388&r2=705389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/pom.xml Thu Oct 16 15:50:21 2008
@@ -110,6 +110,7 @@
<modules>
<module>org.apache.geronimo.testsuite.common</module>
+ <module>org.apache.geronimo.testsuite.v22</module>
<module>org.apache.geronimo.testsuite.v21</module>
<module>org.apache.geronimo.testsuite.v20</module>
</modules>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml?rev=705389&r1=705388&r2=705389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml Thu Oct 16 15:50:21 2008
@@ -38,16 +38,87 @@
Geronimo Eclipse Plugin Integration Testsuite
</description>
+ <properties>
+ <geronimoVersion_1>2.2-SNAPSHOT</geronimoVersion_1>
+ <geronimoVersion_2>2.1.4-SNAPSHOT</geronimoVersion_2>
+ <geronimoVersion_3>2.0.2</geronimoVersion_3>
+ </properties>
+
<dependencies>
<!--
|
+ | Geronimo server v2.2
+ |
+ -->
+ <dependency>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-tomcat6-javaee5</artifactId>
+ <version>${geronimoVersion_1}</version>
+ <type>zip</type>
+ <classifier>bin</classifier>
+ <scope>test</scope>
+ <!--
+ |
+ | Exclude server dependencies not used by the GEP
+ |
+ -->
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-tools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>jasper</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-portal-driver</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-portal-driver-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-container</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-taglib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-descriptor-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-descriptor-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>juddi</groupId>
+ <artifactId>juddi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!--
+ |
| Geronimo server v2.1
|
-->
<dependency>
<groupId>org.apache.geronimo.assemblies</groupId>
<artifactId>geronimo-tomcat6-javaee5</artifactId>
- <version>2.1.3</version>
+ <version>${geronimoVersion_2}</version>
<type>zip</type>
<classifier>bin</classifier>
<scope>test</scope>
@@ -112,7 +183,7 @@
<dependency>
<groupId>org.apache.geronimo.assemblies</groupId>
<artifactId>geronimo-tomcat6-jee5</artifactId>
- <version>2.0.2</version>
+ <version>${geronimoVersion_3}</version>
<type>zip</type>
<classifier>bin</classifier>
<scope>test</scope>
@@ -137,6 +208,7 @@
<includes>
<include>launcher/eclipse</include>
<include>launcher/results</include>
+ <include>launcher/server_v2.2</include>
<include>launcher/server_v2.1</include>
<include>launcher/server_v2.0</include>
<include>launcher/workspace</include>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/server/pom.xml?rev=705389&r1=705388&r2=705389&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/server/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/server/pom.xml Thu Oct 16 15:50:21 2008
@@ -47,34 +47,50 @@
<tasks>
<!--
|
- | Unzip and rename the testsuite Geronimo server v2.1.3
+ | Unzip and rename the testsuite Geronimo server v2.2.0
|
-->
<property name="geronimo_install1" value="${basedir}/../launcher/"/>
<property name="geronimo_assembly1" value="org/apache/geronimo/assemblies"/>
<property name="geronimo_name1" value="geronimo-tomcat6-javaee5"/>
- <property name="geronimo_version1" value="2.1.3"/>
+ <property name="geronimoVersion_1" value="2.2-SNAPSHOT"/>
<mkdir dir="${geronimo_install1}"/>
- <unzip src="${settings.localRepository}/${geronimo_assembly1}/${geronimo_name1}/${geronimo_version1}/${geronimo_name1}-${geronimo_version1}-bin.zip"
+ <unzip src="${settings.localRepository}/${geronimo_assembly1}/${geronimo_name1}/${geronimoVersion_1}/${geronimo_name1}-${geronimoVersion_1}-bin.zip"
dest="${geronimo_install1}"/>
- <move todir="${geronimo_install1}server_v2.1">
- <fileset dir="${geronimo_install1}/${geronimo_name1}-${geronimo_version1}"/>
+ <move todir="${geronimo_install1}server_v2.2">
+ <fileset dir="${geronimo_install1}/${geronimo_name1}-${geronimoVersion_1}"/>
</move>
<!--
|
- | Unzip and rename the testsuite Geronimo server v2.0.2
+ | Unzip and rename the testsuite Geronimo server v2.1.4
|
-->
<property name="geronimo_install2" value="${basedir}/../launcher/"/>
<property name="geronimo_assembly2" value="org/apache/geronimo/assemblies"/>
- <property name="geronimo_name2" value="geronimo-tomcat6-jee5"/>
- <property name="geronimo_version2" value="2.0.2"/>
+ <property name="geronimo_name2" value="geronimo-tomcat6-javaee5"/>
+ <property name="geronimoVersion_2" value="2.1.4-SNAPSHOT"/>
<mkdir dir="${geronimo_install2}"/>
- <unzip src="${settings.localRepository}/${geronimo_assembly2}/${geronimo_name2}/${geronimo_version2}/${geronimo_name2}-${geronimo_version2}-bin.zip"
+ <unzip src="${settings.localRepository}/${geronimo_assembly2}/${geronimo_name2}/${geronimoVersion_2}/${geronimo_name2}-${geronimoVersion_2}-bin.zip"
dest="${geronimo_install2}"/>
- <move todir="${geronimo_install2}server_v2.0">
- <fileset dir="${geronimo_install2}/${geronimo_name2}-${geronimo_version2}"/>
+ <move todir="${geronimo_install2}server_v2.1">
+ <fileset dir="${geronimo_install2}/${geronimo_name2}-${geronimoVersion_2}"/>
+ </move>
+
+ <!--
+ |
+ | Unzip and rename the testsuite Geronimo server v2.0.2
+ |
+ -->
+ <property name="geronimo_install3" value="${basedir}/../launcher/"/>
+ <property name="geronimo_assembly3" value="org/apache/geronimo/assemblies"/>
+ <property name="geronimo_name3" value="geronimo-tomcat6-jee5"/>
+ <property name="geronimoVersion_3" value="2.0.2"/>
+ <mkdir dir="${geronimo_install3}"/>
+ <unzip src="${settings.localRepository}/${geronimo_assembly3}/${geronimo_name3}/${geronimoVersion_3}/${geronimo_name3}-${geronimoVersion_3}-bin.zip"
+ dest="${geronimo_install3}"/>
+ <move todir="${geronimo_install3}server_v2.0">
+ <fileset dir="${geronimo_install3}/${geronimo_name3}-${geronimoVersion_3}"/>
</move>
</tasks>
</configuration>