GERONIMODEVTOOLS-507 Ship only one feature that provides v20 and v21 …

…server support

add version and build date to about.html files from build, so we don't have to manually muck with the date each release.
Use one about.html file, not one per plugin, since they're all the same.
Add a pointer to release notes in about.html
update license to cover both server versions
manually update plugin sizes while I was there, since we are close to release.


git-svn-id: https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/trunk@689718 13f79535-47bb-0310-9956-ffa450edef68

assembly/src/main/assembly/deployable.xml

@@ -70,7 +70,6 @@
             <outputDirectory>eclipse/features/</outputDirectory>
             <unpack>true</unpack>
             <includes>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.v20.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.v21.feature</include>
             </includes>
         </dependencySet>

assembly/src/main/assembly/site.xml

@@ -82,9 +82,6 @@
     <feature url="features/org.apache.geronimo.v21.feature_2.1.2.jar" id="org.apache.geronimo.v21.feature" version="2.1.2">
         <category name="org.eclipse.wst.server.core.serverAdapter"/>
     </feature>
-    <feature url="features/org.apache.geronimo.v20.feature_2.1.3.jar" id="org.apache.geronimo.v20.feature" version="2.1.3">
-        <category name="org.eclipse.wst.server.core.serverAdapter"/>
-    </feature>
     <feature url="features/org.apache.geronimo.v21.feature_2.1.3.jar" id="org.apache.geronimo.v21.feature" version="2.1.3">
         <category name="org.eclipse.wst.server.core.serverAdapter"/>
     </feature>

assembly/src/main/assembly/updatesite.xml

@@ -69,7 +69,6 @@
             <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
             <outputDirectory>features/</outputDirectory>
             <includes>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.v20.feature</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.v21.feature</include>
             </includes>
         </dependencySet>

features/org.apache.geronimo.v21.feature/feature.xml

@@ -47,56 +47,77 @@
 
     <plugin
          id="org.apache.geronimo.st.core"
-         download-size="115"
-         install-size="115"
+         download-size="132"
+         install-size="132"
          version="2.1.3"
          unpack="false"/>
 
    <plugin
          id="org.apache.geronimo.st.ui"
-         download-size="144"
-         install-size="144"
+         download-size="164"
+         install-size="164"
          version="2.1.3"
          unpack="false"/>
 
    <plugin
          id="org.apache.geronimo.st.schemas"
-         download-size="70"
-         install-size="70"
+         download-size="72"
+         install-size="72"
          version="2.1.3"
          unpack="false"/>
 
    <plugin
          id="org.apache.geronimo.runtime.common"
-         download-size="1145"
-         install-size="1145"
+         download-size="1160"
+         install-size="1160"
          version="2.1.3"/>
 
     <plugin
          id="org.apache.geronimo.st.v21.core"
-         download-size="35"
-         install-size="35"
+         download-size="48"
+         install-size="48"
          version="2.1.3"
          unpack="false"/>
 
     <plugin
          id="org.apache.geronimo.st.v21.ui"
-         download-size="104"
-         install-size="104"
+         download-size="164"
+         install-size="164"
          version="2.1.3"
          unpack="false"/>
 
     <plugin
          id="org.apache.geronimo.runtime.v21"
-         download-size="1221"
-         install-size="1221"
+         download-size="1252"
+         install-size="1252"
          version="2.1.3"/>
 
     <plugin
          id="org.apache.geronimo.jee.v21.jaxbmodel"
-         download-size="132"
-         install-size="132"
+         download-size="140"
+         install-size="140"
+         version="2.1.3"
+         unpack="false"/>
+
+    <plugin
+         id="org.apache.geronimo.st.v20.core"
+         download-size="20"
+         install-size="20"
          version="2.1.3"
          unpack="false"/>
+
+    <plugin
+         id="org.apache.geronimo.st.v20.ui"
+         download-size="16"
+         install-size="16"
+         version="2.1.3"
+         unpack="false"/>
+
+    <plugin
+         id="org.apache.geronimo.runtime.v20"
+         download-size="1052"
+         install-size="1052"
+         version="2.1.3"/>
+
 
 </feature>

features/org.apache.geronimo.v21.feature/license.html

@@ -1,8 +1,16 @@
 <html>
 <body>
+Version: ${pom.version}-${buildNumber}
 <h3>License</h3>
 The license for this feature is found here in the <a href="about_files/LICENSE.txt">about_files/LICENSE.txt</a> file.
 <h3>Notices</h3>
 The notices for this feature are found here in the <a href="about_files/NOTICE.txt">about_files/NOTICE.txt</a> file.
+<h3>Release Notes</h3>
+For detailed information about this feature, see these
+<a href="http://apache.org/dist/geronimo/eclipse/2.1.3/PLUGIN_RELEASE-NOTES-2.1.3.txt">Release Notes</a>.
+<h3>The Geronimo Devtools project</h3>
+For more information on using this feature, getting the source code and/or contributing to the project,
+visit the project home page 
+<a href="http://geronimo.apache.org/development-tools.html">http://geronimo.apache.org/development-tools.html</a>.
 </body>
 </html>

features/org.apache.geronimo.v21.feature/pom.xml

@@ -61,13 +61,14 @@
               -->
             <resource>
                 <directory>.</directory>
+                <filtering>true</filtering>
                 <includes>
                     <include>license.html</include>
                 </includes>
             </resource>
             <resource>
                 <targetPath>about_files</targetPath>
-                <directory>../../plugins/org.apache.geronimo.runtime.v21</directory>
+                <directory>../..</directory>
                 <includes>
                     <include>LICENSE.txt</include>
                     <include>NOTICE.txt</include>

features/pom.xml

@@ -29,7 +29,6 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modules>
-        <module>org.apache.geronimo.v20.feature</module>
         <module>org.apache.geronimo.v21.feature</module>
     </modules>
 </project>

plugins/about.html

@@ -0,0 +1,17 @@
+<html>
+<body>
+<h2>About This Content</h2>
+<p>Version: ${pom.version}-${buildNumber}</p>
+<h3>License</h3>
+The license for this plugin is found here in the <a href="about_files/LICENSE.txt">about_files/LICENSE.txt</a> file.
+<h3>Notices</h3>
+The notices for this plugin are found here in the <a href="about_files/NOTICE.txt">about_files/NOTICE.txt</a> file.
+<h3>Release Notes</h3>
+For detailed information about this feature, see these
+<a href="http://apache.org/dist/geronimo/eclipse/2.1.3/PLUGIN_RELEASE-NOTES-2.1.3.txt">Release Notes</a>.
+<h3>The Geronimo Devtools project</h3>
+For more information on using this feature, getting the source code and/or contributing to the project,
+visit the project home page 
+<a href="http://geronimo.apache.org/development-tools.html">http://geronimo.apache.org/development-tools.html</a>.
+</body>
+</html>

plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml

@@ -70,7 +70,8 @@
                  at install time using Eclipse Update Manager, and after install.
               -->
             <resource>
-                <directory>.</directory>
+                <directory>..</directory>
+                <filtering>true</filtering>
                 <includes>
                     <include>about.html</include>
                 </includes>

plugins/org.apache.geronimo.runtime.common/pom.xml

@@ -28,11 +28,17 @@
     </parent>
     <build>
         <resources>
+            <resource>
+                <directory>..</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>about.html</include>
+                </includes>
+            </resource>
             <resource>
                 <directory>.</directory>
                 <includes>
                     <include>plugin.xml</include>
-                    <include>about.html</include>
                 </includes>
             </resource>
             <resource>

plugins/org.apache.geronimo.runtime.v20/pom.xml

@@ -31,11 +31,17 @@
     </properties>
     <build>
         <resources>
+            <resource>
+                <directory>..</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>about.html</include>
+                </includes>
+            </resource>
             <resource>
                 <directory>.</directory>
                 <includes>
                     <include>plugin.xml</include>
-                    <include>about.html</include>
                 </includes>
             </resource>
             <resource>

plugins/org.apache.geronimo.runtime.v21/pom.xml

@@ -32,12 +32,18 @@
     <build>
         <resources>
             <resource>
-                <directory>.</directory>
+                <directory>..</directory>
+                <filtering>true</filtering>
                 <includes>
-                    <include>plugin.xml</include>
                     <include>about.html</include>
                 </includes>
             </resource>
+            <resource>
+                <directory>.</directory>
+                <includes>
+                    <include>plugin.xml</include>
+                </includes>
+            </resource>
             <resource>
                 <directory>lib</directory>
                 <targetPath>lib</targetPath>

plugins/org.apache.geronimo.st.core/pom.xml

@@ -28,13 +28,19 @@
     </parent>
     <build>
         <resources>
+            <resource>
+                <directory>..</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>about.html</include>
+                </includes>
+            </resource>
             <resource>
                 <directory>.</directory>
                 <includes>
                     <include>.options</include>
                     <include>plugin.xml</include>
-                    <include>plugin.properties</include>
-                    <include>about.html</include>
+                    <include>plugin.properties</include>
                 </includes>
             </resource>
             <resource>

plugins/org.apache.geronimo.st.schemas/pom.xml

@@ -28,11 +28,17 @@
     </parent>
     <build>
         <resources>
+            <resource>
+                <directory>..</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>about.html</include>
+                </includes>
+            </resource>
             <resource>
                 <directory>.</directory>
                 <includes>
                     <include>plugin.xml</include>
-                    <include>about.html</include>
                 </includes>
             </resource>
             <resource>

plugins/org.apache.geronimo.st.ui/pom.xml

@@ -28,13 +28,19 @@
     </parent>
     <build>
         <resources>
+            <resource>
+                <directory>..</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>about.html</include>
+                </includes>
+            </resource>
             <resource>
                 <directory>.</directory>
                 <includes>
                     <include>plugin.xml</include>
                     <include>plugin.properties</include>
                     <include>.options</include>
-                    <include>about.html</include>
                 </includes>
             </resource>
             <resource>