TUSCANY-3762: Move filtered resources into new filtered-resources directory

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1035067 13f79535-47bb-0310-9956-ffa450edef68

13 files changed, 147 insertions, 26 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/filtered-resources/META-INF/MANIFEST.MF
index c259c8c6d8..c259c8c6d8 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/filtered-resources/META-INF/MANIFEST.MF
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/NOTICE b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/filtered-resources/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/filtered-resources/NOTICE
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/feature.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/filtered-resources/feature.xml
index 649bffe695..649bffe695 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/feature.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/filtered-resources/feature.xml
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/pom.xml
index 04c60ef04d..6033b273d6 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/features/core/pom.xml
@@ -38,26 +38,49 @@
     </dependencies>
 
     <build>
-        <filters>
-            <filter>../../target/filter.properties</filter>
-        </filters>
-
         <resources>
-           <resource>
-               <directory>${basedir}</directory>
-               <filtering>true</filtering>
-               <excludes>
-                   <exclude>**/.*/**</exclude>
-                   <exclude>pom.xml</exclude>
-                   <exclude>build.*</exclude>
-                   <exclude>target/**</exclude>
-               </excludes>
-           </resource>
+            <resource>
+                <directory>${basedir}</directory>
+                <excludes>
+                    <exclude>**/.*/**</exclude>
+                    <exclude>pom.xml</exclude>
+                    <exclude>build.*</exclude>
+                    <exclude>filtered-resources/**</exclude>
+                    <exclude>target/**</exclude>
+                </excludes>
+            </resource>
         </resources>
 
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.4.3</version>
+                <executions>
+                    <!-- TUSCANY-xxxx: Copy resource files that need to be filtered -->
+                    <execution>
+                        <id>copy-filtered-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}</outputDirectory>
+                            <filters>
+                                <filter>${basedir}/../../target/filter.properties</filter>
+                            </filters>
+                            <resources>          
+                                <resource>
+                                    <directory>${basedir}/filtered-resources</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>              
+                        </configuration>            
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
@@ -65,6 +88,23 @@
                     </archive>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <filesets>
+                        <!-- TUSCANY-xxxx: Delete copied filtered resource files -->
+                        <fileset>
+                            <directory>${basedir}</directory>
+                            <includes>
+                                <include>NOTICE</include>
+                                <include>META-INF/MANIFEST.MF</include>
+                                <include>feature.xml</include>
+                            </includes>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/META-INF/MANIFEST.MF b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/filtered-resources/META-INF/MANIFEST.MF
index df88abf138..df88abf138 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/filtered-resources/META-INF/MANIFEST.MF
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.ini b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/filtered-resources/about.ini
index 40f7cb3437..40f7cb3437 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.ini
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/filtered-resources/about.ini
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/NOTICE b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/filtered-resources/about_files/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/filtered-resources/about_files/NOTICE
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/feature.version b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/filtered-resources/org/apache/tuscany/sca/core/feature.version
index 6bcf8a724b..6bcf8a724b 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/feature.version
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/filtered-resources/org/apache/tuscany/sca/core/feature.version
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/pom.xml
index 125201dedb..af3c204a40 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/pom.xml
@@ -68,27 +68,50 @@
     </dependencies>
 
     <build>
-        <filters>
-            <filter>../../target/filter.properties</filter>
-        </filters>
-
         <resources>
             <resource>
                 <directory>${basedir}</directory>
-                <filtering>true</filtering>
                 <excludes>
                     <exclude>src/**</exclude>
                     <exclude>**/.*/**</exclude>
                     <exclude>pom.xml</exclude>
                     <exclude>build.*</exclude>
+                    <exclude>filtered-resources/**</exclude>
                     <exclude>target/**</exclude>
                 </excludes>
             </resource>
         </resources>
-       
+
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.4.3</version>
+                <executions>
+                    <!-- TUSCANY-xxxx: Copy resource files that need to be filtered -->
+                    <execution>
+                        <id>copy-filtered-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}</outputDirectory>
+                            <filters>
+                                <filter>${basedir}/../../target/filter.properties</filter>
+                            </filters>
+                            <resources>          
+                                <resource>
+                                    <directory>${basedir}/filtered-resources</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>              
+                        </configuration>            
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
@@ -96,6 +119,24 @@
                     </archive>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <filesets>
+                        <!-- TUSCANY-xxxx: 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>
+                            </includes>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/NOTICE b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/filtered-resources/NOTICE
index ad2ba40961..ad2ba40961 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/filtered-resources/NOTICE
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/site.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/filtered-resources/site.xml
index 0a433ee065..0a433ee065 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/site.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/filtered-resources/site.xml
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/filtered-resources/src/main/assembly/updatesite.xml
index 6d11e978af..6d11e978af 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/filtered-resources/src/main/assembly/updatesite.xml
diff --git a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/pom.xml b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/pom.xml
index bba8c6a5a2..7a6f68cd47 100644
--- a/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/site/updatesite/pom.xml
@@ -46,15 +46,11 @@
     </dependencies>
 
     <build>
-        <filters>
-            <filter>../../target/filter.properties</filter>
-        </filters>
-
         <resources>
             <resource>
                 <directory>${basedir}</directory>
-                <filtering>true</filtering>
                 <excludes>
+                    <exclude>src/**</exclude>
                     <exclude>**/.*/**</exclude>
                     <exclude>pom.xml</exclude>
                     <exclude>build.*</exclude>
@@ -66,6 +62,33 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.4.3</version>
+                <executions>
+                    <!-- TUSCANY-xxxx: Copy resource files that need to be filtered -->
+                    <execution>
+                        <id>copy-filtered-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}</outputDirectory>
+                            <filters>
+                                <filter>${basedir}/../../target/filter.properties</filter>
+                            </filters>
+                            <resources>          
+                                <resource>
+                                    <directory>${basedir}/filtered-resources</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>              
+                        </configuration>            
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
                     <execution>
@@ -76,7 +99,7 @@
                         </goals>
                         <configuration>
                             <descriptors>
-                                <descriptor>target/classes/src/main/assembly/updatesite.xml</descriptor>
+                                <descriptor>src/main/assembly/updatesite.xml</descriptor>
                             </descriptors>
                             <tarLongFileMode>gnu</tarLongFileMode>
                             <finalName>apache-tuscany-sca-${pom.version}</finalName>
@@ -84,6 +107,23 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <filesets>
+                        <!-- TUSCANY-xxxx: Delete copied filtered resource files -->
+                        <fileset>
+                            <directory>${basedir}</directory>
+                            <includes>
+                                <include>site.xml</include>
+                                <include>NOTICE</include>
+                                <include>src/main/assembly/updatesite.xml</include>
+                            </includes>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
         </plugins>
     </build>