You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2011/04/05 18:59:37 UTC

svn commit: r1089134 - in /tuscany/sca-java-1.x/branches/sca-java-1.6.2/tools/eclipse: features/core/pom.xml plugins/core/pom.xml site/updatesite/pom.xml

Author: nash
Date: Tue Apr  5 16:59:37 2011
New Revision: 1089134

URL: http://svn.apache.org/viewvc?rev=1089134&view=rev
Log:
TUSCANY-3858: Specify resource filters in build section, not in plugin execution configuration

Modified:
    tuscany/sca-java-1.x/branches/sca-java-1.6.2/tools/eclipse/features/core/pom.xml
    tuscany/sca-java-1.x/branches/sca-java-1.6.2/tools/eclipse/plugins/core/pom.xml
    tuscany/sca-java-1.x/branches/sca-java-1.6.2/tools/eclipse/site/updatesite/pom.xml

Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.2/tools/eclipse/features/core/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.2/tools/eclipse/features/core/pom.xml?rev=1089134&r1=1089133&r2=1089134&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.2/tools/eclipse/features/core/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.2/tools/eclipse/features/core/pom.xml Tue Apr  5 16:59:37 2011
@@ -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>

Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.2/tools/eclipse/plugins/core/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.2/tools/eclipse/plugins/core/pom.xml?rev=1089134&r1=1089133&r2=1089134&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.2/tools/eclipse/plugins/core/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.2/tools/eclipse/plugins/core/pom.xml Tue Apr  5 16:59:37 2011
@@ -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>

Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.2/tools/eclipse/site/updatesite/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.2/tools/eclipse/site/updatesite/pom.xml?rev=1089134&r1=1089133&r2=1089134&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.2/tools/eclipse/site/updatesite/pom.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.2/tools/eclipse/site/updatesite/pom.xml Tue Apr  5 16:59:37 2011
@@ -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>