Merge r1035067 TUSCANY-3762: Move filtered resources into new filtered-resources directory
git-svn-id: https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk@1035079 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tools/eclipse/features/core/META-INF/MANIFEST.MF b/tools/eclipse/features/core/filtered-resources/META-INF/MANIFEST.MF
similarity index 100%
rename from tools/eclipse/features/core/META-INF/MANIFEST.MF
rename to tools/eclipse/features/core/filtered-resources/META-INF/MANIFEST.MF
diff --git a/tools/eclipse/features/core/NOTICE b/tools/eclipse/features/core/filtered-resources/NOTICE
similarity index 100%
rename from tools/eclipse/features/core/NOTICE
rename to tools/eclipse/features/core/filtered-resources/NOTICE
diff --git a/tools/eclipse/features/core/feature.xml b/tools/eclipse/features/core/filtered-resources/feature.xml
similarity index 100%
rename from tools/eclipse/features/core/feature.xml
rename to tools/eclipse/features/core/filtered-resources/feature.xml
diff --git a/tools/eclipse/features/core/pom.xml b/tools/eclipse/features/core/pom.xml
index 8ca96f1..9c912b0 100644
--- a/tools/eclipse/features/core/pom.xml
+++ b/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/tools/eclipse/plugins/core/META-INF/MANIFEST.MF b/tools/eclipse/plugins/core/filtered-resources/META-INF/MANIFEST.MF
similarity index 100%
rename from tools/eclipse/plugins/core/META-INF/MANIFEST.MF
rename to tools/eclipse/plugins/core/filtered-resources/META-INF/MANIFEST.MF
diff --git a/tools/eclipse/plugins/core/about.ini b/tools/eclipse/plugins/core/filtered-resources/about.ini
similarity index 100%
rename from tools/eclipse/plugins/core/about.ini
rename to tools/eclipse/plugins/core/filtered-resources/about.ini
diff --git a/tools/eclipse/plugins/core/about_files/NOTICE b/tools/eclipse/plugins/core/filtered-resources/about_files/NOTICE
similarity index 100%
rename from tools/eclipse/plugins/core/about_files/NOTICE
rename to tools/eclipse/plugins/core/filtered-resources/about_files/NOTICE
diff --git a/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/feature.version b/tools/eclipse/plugins/core/filtered-resources/org/apache/tuscany/sca/core/feature.version
similarity index 100%
rename from tools/eclipse/plugins/core/org/apache/tuscany/sca/core/feature.version
rename to tools/eclipse/plugins/core/filtered-resources/org/apache/tuscany/sca/core/feature.version
diff --git a/tools/eclipse/plugins/core/pom.xml b/tools/eclipse/plugins/core/pom.xml
index 9529806..f33c744 100644
--- a/tools/eclipse/plugins/core/pom.xml
+++ b/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/tools/eclipse/site/updatesite/NOTICE b/tools/eclipse/site/updatesite/filtered-resources/NOTICE
similarity index 100%
rename from tools/eclipse/site/updatesite/NOTICE
rename to tools/eclipse/site/updatesite/filtered-resources/NOTICE
diff --git a/tools/eclipse/site/updatesite/site.xml b/tools/eclipse/site/updatesite/filtered-resources/site.xml
similarity index 100%
rename from tools/eclipse/site/updatesite/site.xml
rename to tools/eclipse/site/updatesite/filtered-resources/site.xml
diff --git a/tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml b/tools/eclipse/site/updatesite/filtered-resources/src/main/assembly/updatesite.xml
similarity index 100%
rename from tools/eclipse/site/updatesite/src/main/assembly/updatesite.xml
rename to tools/eclipse/site/updatesite/filtered-resources/src/main/assembly/updatesite.xml
diff --git a/tools/eclipse/site/updatesite/pom.xml b/tools/eclipse/site/updatesite/pom.xml
index baa08ff..d383231 100644
--- a/tools/eclipse/site/updatesite/pom.xml
+++ b/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>
