diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-14 21:45:57 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-11-14 21:45:57 +0000 |
| commit | fdb890085bc1fd3f4cc15f89c7c0aa2fa6cda0ec (patch) | |
| tree | 1c5af732b632aadfa1e5c1c945d93120d3392f34 /sca-java-1.x/trunk/tools/eclipse/features | |
| parent | 47a3037d48c468fd728370d79e4fb48fa440c29b (diff) | |
Merge r1035067 TUSCANY-3762: Move filtered resources into new filtered-resources directory
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1035079 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/trunk/tools/eclipse/features')
| -rw-r--r-- | sca-java-1.x/trunk/tools/eclipse/features/core/filtered-resources/META-INF/MANIFEST.MF (renamed from sca-java-1.x/trunk/tools/eclipse/features/core/META-INF/MANIFEST.MF) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/tools/eclipse/features/core/filtered-resources/NOTICE (renamed from sca-java-1.x/trunk/tools/eclipse/features/core/NOTICE) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/tools/eclipse/features/core/filtered-resources/feature.xml (renamed from sca-java-1.x/trunk/tools/eclipse/features/core/feature.xml) | 0 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml | 68 |
4 files changed, 54 insertions, 14 deletions
diff --git a/sca-java-1.x/trunk/tools/eclipse/features/core/META-INF/MANIFEST.MF b/sca-java-1.x/trunk/tools/eclipse/features/core/filtered-resources/META-INF/MANIFEST.MF index c259c8c6d8..c259c8c6d8 100644 --- a/sca-java-1.x/trunk/tools/eclipse/features/core/META-INF/MANIFEST.MF +++ b/sca-java-1.x/trunk/tools/eclipse/features/core/filtered-resources/META-INF/MANIFEST.MF diff --git a/sca-java-1.x/trunk/tools/eclipse/features/core/NOTICE b/sca-java-1.x/trunk/tools/eclipse/features/core/filtered-resources/NOTICE index ad2ba40961..ad2ba40961 100644 --- a/sca-java-1.x/trunk/tools/eclipse/features/core/NOTICE +++ b/sca-java-1.x/trunk/tools/eclipse/features/core/filtered-resources/NOTICE diff --git a/sca-java-1.x/trunk/tools/eclipse/features/core/feature.xml b/sca-java-1.x/trunk/tools/eclipse/features/core/filtered-resources/feature.xml index 649bffe695..649bffe695 100644 --- a/sca-java-1.x/trunk/tools/eclipse/features/core/feature.xml +++ b/sca-java-1.x/trunk/tools/eclipse/features/core/filtered-resources/feature.xml 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 8ca96f1556..9c912b050f 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,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> |