Return-Path: 
 <scm-return-31326-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 22826 invoked from network); 30 Aug 2008 04:10:21 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 30 Aug 2008 04:10:21 -0000
Received: (qmail 8547 invoked by uid 500); 30 Aug 2008 04:10:19 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 8501 invoked by uid 500); 30 Aug 2008 04:10:19 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 8492 invoked by uid 99); 30 Aug 2008 04:10:19 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Aug 2008 21:10:19 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Aug 2008 04:09:29 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 382D62388986; Fri, 29 Aug 2008 21:09:30 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r690451 - in
 /geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly:
 deployable.xml updatesite.xml
Date: Sat, 30 Aug 2008 04:09:29 -0000
To: scm@geronimo.apache.org
From: tkirby@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080830040930.382D62388986@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tkirby
Date: Fri Aug 29 21:09:29 2008
New Revision: 690451

URL: http://svn.apache.org/viewvc?rev=690451&view=rev
Log:
GERONIMODEVTOOLS-505 PLUGIN_RELEASE-NOTES-2.1.2.txt missing from distribution
${pom.version} does not get expanded by assembly filtering :-(, so use a filtered version from earlier in the build.


Modified:
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml?rev=690451&r1=690450&r2=690451&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml Fri Aug 29 21:09:29 2008
@@ -30,10 +30,19 @@
             <includes>
                 <include>LICENSE.txt</include>
                 <include>NOTICE.txt</include>
-                <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
             </includes>
         </fileSet>
     </fileSets>
+    <files>
+        <file>
+            <source>../features/org.apache.geronimo.v21.feature/target/classes/about_files/PLUGIN_RELEASE-NOTES-${pom.version}.txt</source>
+            <outputDirectory>eclipse</outputDirectory>
+            <!--  <filtered>true</filtered>
+                 ${pom.version} does not get expanded by this filtering :-(
+                 so I take a filtered version from earlier in the build for GERONIMODEVTOOLS-505
+              -->
+        </file>
+    </files>
     <dependencySets>
 
         <!-- 

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml?rev=690451&r1=690450&r2=690451&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml Fri Aug 29 21:09:29 2008
@@ -30,10 +30,23 @@
             <includes>
                 <include>LICENSE.txt</include>
                 <include>NOTICE.txt</include>
-                <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
             </includes>
         </fileSet>
     </fileSets>
+    <files>
+        <file>
+            <source>${basedir}/src/main/assembly/site.xml</source>
+            <outputDirectory>/</outputDirectory>
+        </file>
+        <file>
+            <source>../features/org.apache.geronimo.v21.feature/target/classes/about_files/PLUGIN_RELEASE-NOTES-${pom.version}.txt</source>
+            <outputDirectory></outputDirectory>
+            <!--  <filtered>true</filtered>
+                 ${pom.version} does not get expanded by this filtering :-(
+                 so I take a filtered version from earlier in the build for GERONIMODEVTOOLS-505
+              -->
+        </file>
+    </files>
     <dependencySets>
 
         <!-- 
@@ -74,10 +87,4 @@
         </dependencySet>
 
     </dependencySets>
-    <files>
-        <file>
-            <source>${basedir}/src/main/assembly/site.xml</source>
-            <outputDirectory>/</outputDirectory>
-        </file>
-    </files>
 </assembly>