geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r670016 - in /geronimo/devtools/eclipse-plugin/trunk: ./ testsuite/ testsuite/eclipse/ testsuite/launcher/ testsuite/plugins/ testsuite/plugins/org.apache.geronimo.devtools.helloworld/ testsuite/plugins/org.apache.geronimo.devtools.hellowor...
Date Fri, 20 Jun 2008 18:19:10 GMT
Author: mcconne
Date: Fri Jun 20 11:19:10 2008
New Revision: 670016

URL: http://svn.apache.org/viewvc?rev=670016&view=rev
Log:
GERONIMODEVTOOLS-266 Complete testsuite framework for GEP 2.1.1

Added:
    geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.properties   (with props)
    geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.xml   (with props)
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/LICENSE.txt   (with props)
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/NOTICE.txt   (with props)
Modified:
    geronimo/devtools/eclipse-plugin/trunk/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/build.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/test.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=670016&r1=670015&r2=670016&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Fri Jun 20 11:19:10 2008
@@ -433,6 +433,7 @@
         <module>plugins</module>
         <module>features</module>
         <module>assembly</module>
+        <module>testsuite</module>
     </modules>
                         
 </project>

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=670016&r1=670015&r2=670016&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml Fri Jun 20 11:19:10 2008
@@ -27,7 +27,7 @@
  | @version $Rev$ $Date$                                                                                            
  |                                                                                             
  -->
-<project name="EuropaArtifacts">
+<project name="EuropaSDKArtifacts">
 
     <target name="init">
         <property name="base_url"               value="http://www.eclipse.org/downloads/download.php?file="/>
@@ -38,9 +38,9 @@
         <property name="europa_jee_linux_gz"    value="${europa_jee_linux}.gz"/>
         <property name="europa_jee_macos_gz"    value="${europa_jee_macos}.gz"/>
         <property name="protocol"               value="&amp;r=1&amp;protocol=http"/>
-        <property name="TEST_ECLIPSE"           value="${basedir}/../launcher/test-eclipse/"/>
-        <property name="TEST_FRAMEWORK_URL"     value="${base_url}/eclipse/downloads/drops/R-3.3.2-200802211800/"/>
-        <property name="TEST_FRAMEWORK"         value="eclipse-test-framework-3.3.2.zip"/>
+        <property name="test_eclipse"           value="${basedir}/../launcher/eclipse/"/>
+        <property name="test_framework_url"     value="${base_url}/eclipse/downloads/drops/R-3.3.2-200802211800/"/>
+        <property name="test_framework"         value="eclipse-test-framework-3.3.2.zip"/>
     </target>
 
     <target name="win32" depends="init,common" description="Download Windows-specific artifact(s)">
@@ -62,9 +62,9 @@
         <echo>## Unzipping: ${europa_jee_win32}                                                </echo>                                                                            
         <echo>##                                                                               </echo>
         <echo>#################################################################################</echo>
-        <mkdir dir="${TEST_ECLIPSE}"/>
+        <mkdir dir="${test_eclipse}"/>
         <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_win32}" 
-              dest="${TEST_ECLIPSE}"/>
+              dest="${test_eclipse}"/>
     </target>
 
     <target name="linux" depends="init,common" description="Download Linux-specific artifact(s)">
@@ -86,10 +86,10 @@
         <echo>## Unzipping: ${europa_jee_linux_gz}                                             </echo>
         <echo>##                                                                               </echo>
         <echo>#################################################################################</echo>
-        <mkdir  dir="${TEST_ECLIPSE}"/>
+        <mkdir  dir="${test_eclipse}"/>
         <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_linux_gz}"/>
         <untar  src="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_linux}" 
-               dest="${TEST_ECLIPSE}"/>
+               dest="${test_eclipse}"/>
     </target>
 
     <target name="macos" depends="init,common" description="Download Mac-specific artifact(s)">
@@ -111,10 +111,10 @@
         <echo>## Unzipping: ${europa_jee_macos_gz}                                             </echo>
         <echo>##                                                                               </echo>
         <echo>#################################################################################</echo>
-        <mkdir  dir="${TEST_ECLIPSE}"/>
+        <mkdir  dir="${test_eclipse}"/>
         <gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_macos_gz}"/>
         <untar  src="${LOCAL_M2_REPO}/eclipse-downloads/${europa_jee_macos}" 
-               dest="${TEST_ECLIPSE}"/>
+               dest="${test_eclipse}"/>
     </target>
 
     <target name="common" depends="init" description="Download artifacts common to all OS'es">
@@ -124,25 +124,25 @@
     <target name="test-framework" depends="init" description="JUnit Plugin Tests and Automated Testing Framework artifact">
         <echo>#################################################################################</echo>
         <echo>##                                                                               </echo>
-        <echo>## Downloading: ${TEST_FRAMEWORK}                                                </echo>
+        <echo>## Downloading: ${test_framework}                                                </echo>
         <echo>##                                                                               </echo>
-        <echo>## From: ${TEST_FRAMEWORK_URL}                                                   </echo>                                                                            
+        <echo>## From: ${test_framework_url}                                                   </echo>                                                                            
         <echo>##                                                                               </echo>
         <echo>#################################################################################</echo>
         <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
-        <get src="${TEST_FRAMEWORK_URL}${TEST_FRAMEWORK}${protocol}"
-             dest="${LOCAL_M2_REPO}/eclipse-downloads/${TEST_FRAMEWORK}" 
+        <get src="${test_framework_url}${test_framework}${protocol}"
+             dest="${LOCAL_M2_REPO}/eclipse-downloads/${test_framework}" 
              verbose="true"
              ignoreerrors="true"
              usetimestamp="true"/>
         <echo>#################################################################################</echo>
         <echo>##                                                                               </echo>
-        <echo>## Unzipping: ${TEST_FRAMEWORK}                                                  </echo>
+        <echo>## Unzipping: ${test_framework}                                                  </echo>
         <echo>##                                                                               </echo>
         <echo>#################################################################################</echo>
-        <mkdir dir="${TEST_ECLIPSE}"/>
-        <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${TEST_FRAMEWORK}"
-              dest="${TEST_ECLIPSE}"/>
+        <mkdir dir="${test_eclipse}"/>
+        <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${test_framework}"
+              dest="${test_eclipse}"/>
     </target>
 
 </project>

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml?rev=670016&r1=670015&r2=670016&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/pom.xml Fri Jun 20 11:19:10 2008
@@ -26,7 +26,7 @@
     <artifactId>testsuite-eclipse</artifactId>
     <packaging>pom</packaging>
     <version>2.1.1</version>
-    <name>Geronimo Devtools Testsuite :: Eclipse</name>
+    <name>Geronimo Devtools Testsuite :: Eclipse Downloads</name>
                                                 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
@@ -41,7 +41,7 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>create-test-eclipse</id>
+                        <id>create-launcher-eclipse</id>
                         <phase>validate</phase>
                         <configuration>
                             <tasks>

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/build.xml?rev=670016&r1=670015&r2=670016&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/build.xml Fri Jun 20 11:19:10 2008
@@ -18,7 +18,7 @@
 
 <!--
  |  
- | Ant script to start Eclipse via the equinox launcher
+ | Ant script to start Eclipse via the Equinox launcher
  |                                                                                             
  |                                                                                             
  | @version $Rev$ $Date$                                                                                            
@@ -26,92 +26,84 @@
  -->
 <project name="GEP Automated Testsuite Launcher">
 
+    <!--
+     |  
+     | Copy and rename the eqiunox launcher jar, 
+     | Copy and rename the org.eclipse.test folder
+     |                                                                                             
+     -->
     <target name="init">
-
-        <property name="ECLIPSE_HOME" value="test-eclipse"/>
-
-        <!--
-         |  
-         | Copy and rename the eqiunox launcher jar
-         |                                                                                             
-         -->
-        <copy tofile="${ECLIPSE_HOME}/eclipse/plugins/org.eclipse.equinox.launcher.jar">
-            <fileset dir="${ECLIPSE_HOME}/eclipse/plugins"
+        <property name="eclipse-home" value="eclipse"/>
+        <copy tofile="${eclipse-home}/eclipse/plugins/org.eclipse.equinox.launcher.jar">
+            <fileset dir="${eclipse-home}/eclipse/plugins"
               includes="**/org.eclipse.equinox.launcher_*.jar"/>
         </copy>
-
-        <!--
-         |  
-         | Copy and rename the org.eclipse.test folder
-         |                                                                                             
-         -->
-        <mkdir dir="${ECLIPSE_HOME}/eclipse/plugins/org.eclipse.test"/>
-        <copy todir="${ECLIPSE_HOME}/eclipse/plugins/org.eclipse.test">
-            <fileset dir="${ECLIPSE_HOME}/eclipse/plugins/org.eclipse.test_3.2.0"/>
+        <mkdir dir="${eclipse-home}/eclipse/plugins/org.eclipse.test"/>
+        <copy todir="${eclipse-home}/eclipse/plugins/org.eclipse.test">
+            <fileset dir="${eclipse-home}/eclipse/plugins/org.eclipse.test_3.2.0"/>
         </copy>
     </target>
 
-    <target name="win32" depends="init" description="Start equinox launcher on Windows">
-        <!--
-         |  
-         | Start Eclipse via the equinox launcher 
-         |                                                                                             
-         -->
+
+    <!--
+     |  
+     | Start Eclipse via the Equinox launcher (Windows)
+     |                                                                                             
+     -->
+    <target name="win32" depends="init" description="Start Equinox launcher on Windows">
         <java classname="org.eclipse.equinox.launcher.Main" fork="true">
             <classpath>
-                <pathelement path="${ECLIPSE_HOME}/eclipse/plugins/org.eclipse.equinox.launcher.jar"/>
+                <pathelement path="${eclipse-home}/eclipse/plugins/org.eclipse.equinox.launcher.jar"/>
             </classpath>
             <arg line="-data workspace" />
             <arg line="-application org.eclipse.ant.core.antRunner"/>
             <arg line="-file testsuite.xml"/>
-            <arg value="helloworld"/>
-            <arg value="-Dws=win32"/>
+            <arg value="all"/>
             <arg value="-Dos=win32"/>
+            <arg value="-Dws=win32"/>
             <arg value="-Darch=x86"/>
-            <arg value="-Dnoclean=true"/>
-            <arg line="-logger org.apache.tools.ant.DefaultLogger" />
+        </java>
     </target>
 
-    <target name="linux" depends="init" description="Start equinox launcher on Linux">
-        <!--
-         |  
-         | Start Eclipse via the equinox launcher 
-         |                                                                                             
-         -->
+    <!--
+     |  
+     | Start Eclipse via the Equinox launcher (Linux)
+     |                                                                                             
+     -->
+    <target name="linux" depends="init" description="Start Equinox launcher on Linux">
         <java classname="org.eclipse.equinox.launcher.Main" fork="true">
             <classpath>
-                <pathelement path="${ECLIPSE_HOME}/eclipse/plugins/org.eclipse.equinox.launcher.jar"/>
+                <pathelement path="${eclipse-home}/eclipse/plugins/org.eclipse.equinox.launcher.jar"/>
             </classpath>
             <arg line="-data workspace" />
             <arg line="-application org.eclipse.ant.core.antRunner"/>
             <arg line="-file testsuite.xml"/>
-            <arg value="helloworld"/>
-            <arg value="-Dws=motif"/>
+            <arg value="all"/>
             <arg value="-Dos=linux"/>
+            <arg value="-Dws=gtk"/>
             <arg value="-Darch=x86"/>
-            <arg value="-Dnoclean=true"/>
-            <arg line="-logger org.apache.tools.ant.DefaultLogger" />
+        </java>
     </target>
 
-    <target name="macos" depends="init" description="Start equinox launcher on Mac">
-        <!--
-         |  
-         | Start Eclipse via the equinox launcher 
-         |                                                                                             
-         -->
+    <!--
+     |  
+     | Start Eclipse via the Equinox launcher (Mac)
+     |                                                                                             
+     -->
+    <target name="macos" depends="init" description="Start Equinox launcher on Mac">
         <java classname="org.eclipse.equinox.launcher.Main" fork="true">
             <classpath>
-                <pathelement path="${ECLIPSE_HOME}/eclipse/plugins/org.eclipse.equinox.launcher.jar"/>
+                <pathelement path="${eclipse-home}/eclipse/plugins/org.eclipse.equinox.launcher.jar"/>
             </classpath>
             <arg line="-data workspace" />
             <arg line="-application org.eclipse.ant.core.antRunner"/>
             <arg line="-file testsuite.xml"/>
-            <arg value="helloworld"/>
-            <arg value="-Dws=carbon"/>
+            <arg value="all"/>
             <arg value="-Dos=macosx"/>
-            <arg value="-Darch=x86"/>
-            <arg value="-Dnoclean=true"/>
-            <arg line="-logger org.apache.tools.ant.DefaultLogger" />
+            <arg value="-Dws=carbon"/>
+            <arg value="-Darch=ppc"/>
+        </java>
     </target>
 
 </project>
+

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/pom.xml?rev=670016&r1=670015&r2=670016&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/pom.xml Fri Jun 20 11:19:10 2008
@@ -26,36 +26,18 @@
     <artifactId>testsuite-launcher</artifactId>
     <packaging>pom</packaging>
     <version>2.1.1</version>
-    <name>Geronimo Devtools Testsuite :: Launcher</name>
+    <name>Geronimo Devtools Testsuite :: Equinox Launcher</name>
 
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>testsuite</artifactId>
         <version>2.1.1</version>
     </parent>
-                        
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-clean-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <failOnError>false</failOnError>
-                    <filesets>
-                        <fileset>
-                            <directory>${pom.basedir}</directory>
-                            <includes>
-                                <include>results</include>
-                                <include>test-eclipse</include>
-                                <include>workspace</include>
-                            </includes>
-                        </fileset>
-                    </filesets>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>

Added: 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=670016&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.properties (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.properties Fri Jun 20 11:19:10 2008
@@ -0,0 +1,19 @@
+#
+# 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$
+#
+org.apache.geronimo.devtools.helloworld=org.apache.geronimo.devtools.helloworld-2.1.1

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.properties
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: 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=670016&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.xml Fri Jun 20 11:19:10 2008
@@ -0,0 +1,64 @@
+<!--
+  ~ 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="GEP Automated Testsuite" basedir="." >
+
+    <property file="testsuite.properties" />
+    <property name="eclipse-home" value="${basedir}/eclipse/eclipse" />
+    <property name="results" value="${basedir}/results" />
+    <property name="junit-report-output" value="${results}/junit" />
+
+    <target name="init">
+        <mkdir dir="${results}/xml" />
+        <mkdir dir="${results}/html" />
+        <mkdir dir="${junit-report-output}" />
+    </target>
+
+    <macrodef name="runTests">
+        <attribute name="testPlugin" />
+        <sequential>
+            <property name="test.target" value="junit" />
+            <property name="report" value="@{testPlugin}" />
+            <antcall target="${test.target}">
+                <param name="testPlugin" value="${@{testPlugin}}" />
+                <param name="output-file" value="@{testPlugin}.xml" />
+            </antcall>
+        </sequential>
+    </macrodef>
+
+    <target name="junit">
+        <ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}" />
+        <antcall target="genResults" />
+    </target>
+
+    <target name="genResults">
+        <copy file="${eclipse-home}/${report}.xml" tofile="${results}/xml/${report}.xml" failonerror="false" />
+        <style style="${eclipse-home}/plugins/org.eclipse.test/JUNIT.XSL" basedir="${results}/xml" destdir="${results}/html" />
+    </target>
+
+    <target name="helloworld">
+        <runTests testPlugin="org.apache.geronimo.devtools.helloworld" />
+    </target>
+
+    <target name="all">
+        <antcall target="helloworld" />
+    </target>
+
+</project>
+

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/LICENSE.txt?rev=670016&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/LICENSE.txt (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/LICENSE.txt Fri Jun 20 11:19:10 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.devtools.helloworld/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/META-INF/MANIFEST.MF?rev=670016&r1=670015&r2=670016&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/META-INF/MANIFEST.MF Fri Jun 20 11:19:10 2008
@@ -27,8 +27,7 @@
  org.eclipse.wst.common.project.facet.core,
  org.eclipse.jdt.core,
  org.eclipse.debug.core,
- org.eclipse.wst.web,
- org.eclipse.jem.util
+ org.eclipse.wst.web
 Eclipse-LazyStart: true
 Export-Package: org.apache.geronimo.devtools.helloworld
 Import-Package: junit.framework;version="3.8.2"

Added: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/NOTICE.txt?rev=670016&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/NOTICE.txt (added)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/NOTICE.txt Fri Jun 20 11:19:10 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.devtools.helloworld/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/plugin.xml?rev=670016&r1=670015&r2=670016&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/plugin.xml Fri Jun 20 11:19:10 2008
@@ -31,7 +31,7 @@
         <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.apache.ant"/>
+<!--    <import plugin="org.apache.ant"/> -->
         <import plugin="org.junit"/>
         <import plugin="org.eclipse.core.resources"/>
         <import plugin="org.eclipse.jdt.core"/>

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/pom.xml?rev=670016&r1=670015&r2=670016&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/pom.xml Fri Jun 20 11:19:10 2008
@@ -66,7 +66,7 @@
 
             <!--
              |
-             | Unzip the resulting target jar into the test-eclipse directory for later usage
+             | Unzip the resulting plugin jar into the launcher eclipse directory for later usage
              |
              -->
             <plugin>
@@ -80,9 +80,9 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <mkdir dir="${basedir}/../../launcher/test-eclipse/eclipse/plugins/org.apache.geronimo.devtools.helloworld-2.1.1"/>
+                                <mkdir dir="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.devtools.helloworld-2.1.1"/>
                                 <unzip src="${project.build.directory}/org.apache.geronimo.devtools.helloworld-2.1.1.jar"
-                                      dest="${basedir}/../../launcher/test-eclipse/eclipse/plugins/org.apache.geronimo.devtools.helloworld-2.1.1"/>
+                                      dest="${basedir}/../../launcher/eclipse/eclipse/plugins/org.apache.geronimo.devtools.helloworld-2.1.1"/>
                             </tasks>
                         </configuration>
                     </execution>

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/test.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/test.xml?rev=670016&r1=670015&r2=670016&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/test.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.devtools.helloworld/test.xml Fri Jun 20 11:19:10 2008
@@ -51,19 +51,6 @@
         </ant>
     </target>
 	
-    <!-- This target defines the performance tests that need to be run. -->
-    <target name="perfsuite">
-        <property name="jdt-folder"
-                  value="${eclipse-home}/jdt_folder"/>
-        <delete dir="${jdt-folder}" quiet="true"/>
-        <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.devtools.helloworld.HelloWorldTests"/>
-        </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. -->
@@ -79,12 +66,4 @@
         </ant>
     </target>
 
-    <!--This target runs the performance test suites and collects results.-->
-    <target name="performance" depends="init, perfsuite, 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>

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=670016&r1=670015&r2=670016&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/pom.xml Fri Jun 20 11:19:10 2008
@@ -26,7 +26,7 @@
     <artifactId>testsuite-plugins</artifactId>
     <packaging>pom</packaging>
     <version>2.1.1</version>
-    <name>Geronimo Devtools Testsuite :: Plugins</name>
+    <name>Geronimo Devtools Testsuite :: Eclipse Plugins</name>
         
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>

Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml?rev=670016&r1=670015&r2=670016&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml Fri Jun 20 11:19:10 2008
@@ -15,9 +15,9 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-                        
+
 <!-- @version $Rev$ $Date$ -->
-                        
+
 <project>
                         
     <modelVersion>4.0.0</modelVersion>
@@ -34,10 +34,37 @@
         <version>2.1.1</version>
     </parent>
 
+    <build>
+        <plugins>
+            <!--
+             |
+             | Clean up the eclipse artifacts from previous launches
+             |
+             -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <failOnError>false</failOnError>
+                    <filesets>
+                        <fileset>
+                            <directory>${pom.basedir}</directory>
+                            <includes>
+                                <include>launcher/results</include>
+                                <include>launcher/eclipse</include>
+                                <include>launcher/workspace</include>
+                            </includes>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <modules>
         <module>eclipse</module>
-        <module>plugins</module> 
-        <module>launcher</module> 
+        <module>plugins</module>
+        <module>launcher</module>
     </modules>
-                        
+
 </project>



Mime
View raw message