diff options
author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-14 21:04:31 +0000 |
---|---|---|
committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-14 21:04:31 +0000 |
commit | 899655a7c9341f4886178e9cb36b04327ef8ac3f (patch) | |
tree | c3a5ddcdd3133b91b564e341328f733d452625b5 /sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core | |
parent | 4851aff3b9a72b19526fe4caf9e90094c4edf1fe (diff) |
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
Diffstat (limited to '')
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/filtered-resources/META-INF/MANIFEST.MF (renamed from sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/META-INF/MANIFEST.MF) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/filtered-resources/about.ini (renamed from sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about.ini) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/filtered-resources/about_files/NOTICE (renamed from sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/about_files/NOTICE) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/filtered-resources/org/apache/tuscany/sca/core/feature.version (renamed from sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/org/apache/tuscany/sca/core/feature.version) | 0 | ||||
-rw-r--r-- | sca-java-1.x/branches/sca-java-1.6.1/tools/eclipse/plugins/core/pom.xml | 53 |
5 files changed, 47 insertions, 6 deletions
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> |