From eec2e27511654d899e2fcc81172dd97d490f6699 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 14 Nov 2010 21:48:14 +0000
Subject: Merge r1035075 TUSCANY-3762: Fix comments in pom.xml files and clean
 up handling of filtered resource files

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1035081 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml   | 6 +++---
 sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml    | 8 ++++----
 sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml | 6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'sca-java-1.x')

diff --git a/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml b/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml
index 9c912b050f..01249d8851 100644
--- a/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml
@@ -57,7 +57,7 @@
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.4.3</version>
                 <executions>
-                    <!-- TUSCANY-xxxx: Copy resource files that need to be filtered -->
+                    <!-- TUSCANY-3762: Copy resource files that need to be filtered -->
                     <execution>
                         <id>copy-filtered-resources</id>
                         <phase>generate-resources</phase>
@@ -93,12 +93,12 @@
                 <artifactId>maven-clean-plugin</artifactId>
                 <configuration>
                     <filesets>
-                        <!-- TUSCANY-xxxx: Delete copied filtered resource files -->
+                        <!-- TUSCANY-3762: Delete copied filtered resource files -->
                         <fileset>
                             <directory>${basedir}</directory>
                             <includes>
                                 <include>NOTICE</include>
-                                <include>META-INF/MANIFEST.MF</include>
+                                <include>META-INF/**</include>
                                 <include>feature.xml</include>
                             </includes>
                         </fileset>
diff --git a/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml b/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml
index f33c744cc4..ad9c7dac4b 100644
--- a/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml
@@ -88,7 +88,7 @@
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.4.3</version>
                 <executions>
-                    <!-- TUSCANY-xxxx: Copy resource files that need to be filtered -->
+                    <!-- TUSCANY-3762: Copy resource files that need to be filtered -->
                     <execution>
                         <id>copy-filtered-resources</id>
                         <phase>generate-resources</phase>
@@ -124,14 +124,14 @@
                 <artifactId>maven-clean-plugin</artifactId>
                 <configuration>
                     <filesets>
-                        <!-- TUSCANY-xxxx: Delete copied filtered resource files -->
+                        <!-- TUSCANY-3762: Delete copied filtered resource files -->
                         <fileset>
                             <directory>${basedir}</directory>
                             <includes>
                                 <include>about.ini</include>
                                 <include>about_files/NOTICE</include>
-                                <include>META-INF/MANIFEST.MF</include>
-                                <include>org/apache/tuscany/sca/core/feature.version</include>
+                                <include>META-INF/**</include>
+                                <include>org/**</include>
                             </includes>
                         </fileset>
                     </filesets>
diff --git a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml
index d3832313dc..9efee93ea3 100644
--- a/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml
+++ b/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml
@@ -65,7 +65,7 @@
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>2.4.3</version>
                 <executions>
-                    <!-- TUSCANY-xxxx: Copy resource files that need to be filtered -->
+                    <!-- TUSCANY-3762: Copy resource files that need to be filtered -->
                     <execution>
                         <id>copy-filtered-resources</id>
                         <phase>generate-resources</phase>
@@ -112,13 +112,13 @@
                 <artifactId>maven-clean-plugin</artifactId>
                 <configuration>
                     <filesets>
-                        <!-- TUSCANY-xxxx: Delete copied filtered resource files -->
+                        <!-- TUSCANY-3762: Delete copied filtered resource files -->
                         <fileset>
                             <directory>${basedir}</directory>
                             <includes>
                                 <include>site.xml</include>
                                 <include>NOTICE</include>
-                                <include>src/main/assembly/updatesite.xml</include>
+                                <include>src/**</include>
                             </includes>
                         </fileset>
                     </filesets>
-- 
cgit v1.2.3