From 9e6c28806535d4766fe3b93cb49873186d098679 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 13 Apr 2011 10:26:04 +0000
Subject: TUSCANY-3858: Eclipse update site doesn't build correctly from a
 top-level build

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

(limited to 'sca-java-1.x/trunk/tools/eclipse')

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 01249d8851..c3cf9f1974 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
@@ -38,6 +38,11 @@
     </dependencies>
 
     <build>
+        <!-- TUSCANY-3858: Specify filters here, not in plugin execution configuration -->
+        <filters>
+            <filter>${basedir}/../../target/filter.properties</filter>
+        </filters>
+
         <resources>
             <resource>
                 <directory>${basedir}</directory>
@@ -66,9 +71,6 @@
                         </goals>
                         <configuration>
                             <outputDirectory>${basedir}</outputDirectory>
-                            <filters>
-                                <filter>${basedir}/../../target/filter.properties</filter>
-                            </filters>
                             <resources>          
                                 <resource>
                                     <directory>${basedir}/filtered-resources</directory>
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 ad9c7dac4b..c5472cf0ce 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
@@ -68,6 +68,11 @@
     </dependencies>
 
     <build>
+        <!-- TUSCANY-3858: Specify filters here, not in plugin execution configuration -->
+        <filters>
+            <filter>${basedir}/../../target/filter.properties</filter>
+        </filters>
+
         <resources>
             <resource>
                 <directory>${basedir}</directory>
@@ -97,9 +102,6 @@
                         </goals>
                         <configuration>
                             <outputDirectory>${basedir}</outputDirectory>
-                            <filters>
-                                <filter>${basedir}/../../target/filter.properties</filter>
-                            </filters>
                             <resources>          
                                 <resource>
                                     <directory>${basedir}/filtered-resources</directory>
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 9efee93ea3..19dfd43c98 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
@@ -46,6 +46,11 @@
     </dependencies>
 
     <build>
+        <!-- TUSCANY-3858: Specify filters here, not in plugin execution configuration -->
+        <filters>
+            <filter>${basedir}/../../target/filter.properties</filter>
+        </filters>
+
         <resources>
             <resource>
                 <directory>${basedir}</directory>
@@ -74,9 +79,6 @@
                         </goals>
                         <configuration>
                             <outputDirectory>${basedir}</outputDirectory>
-                            <filters>
-                                <filter>${basedir}/../../target/filter.properties</filter>
-                            </filters>
                             <resources>          
                                 <resource>
                                     <directory>${basedir}/filtered-resources</directory>
-- 
cgit v1.2.3