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 2010/11/14 22:48:14 UTC
svn commit: r1035081 - in /tuscany/sca-java-1.x/trunk/tools/eclipse:
features/core/ features/core/pom.xml plugins/core/
plugins/core/about_files/ plugins/core/pom.xml site/updatesite/
site/updatesite/pom.xml
Author: nash
Date: Sun Nov 14 21:48:14 2010
New Revision: 1035081
URL: http://svn.apache.org/viewvc?rev=1035081&view=rev
Log:
Merge r1035075 TUSCANY-3762: Fix comments in pom.xml files and clean up handling of filtered resource files
Modified:
tuscany/sca-java-1.x/trunk/tools/eclipse/features/core/ (props changed)
tuscany/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml
tuscany/sca-java-1.x/trunk/tools/eclipse/plugins/core/ (props changed)
tuscany/sca-java-1.x/trunk/tools/eclipse/plugins/core/about_files/ (props changed)
tuscany/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml
tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/ (props changed)
tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml
Propchange: tuscany/sca-java-1.x/trunk/tools/eclipse/features/core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Nov 14 21:48:14 2010
@@ -6,8 +6,8 @@ dojo
*.iml
derby.log
maven.log
+maven-eclipse.xml
build.xml
-build-dependency.xml
velocity.log*
junit*.properties
surefire*.properties
@@ -17,3 +17,6 @@ surefire*.properties
.deployables
.wtpmodules
.externalToolBuilders
+META-INF
+NOTICE
+feature.xml
Modified: tuscany/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml?rev=1035081&r1=1035080&r2=1035081&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tools/eclipse/features/core/pom.xml Sun Nov 14 21:48:14 2010
@@ -57,7 +57,7 @@
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
<executions>
- <!-- TUSCANY-xxxx: Copy resource files that need to be filtered -->
+ <!-- TUSCANY-3762: Copy resource files that need to be filtered -->
<execution>
<id>copy-filtered-resources</id>
<phase>generate-resources</phase>
@@ -93,12 +93,12 @@
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
- <!-- TUSCANY-xxxx: Delete copied filtered resource files -->
+ <!-- TUSCANY-3762: Delete copied filtered resource files -->
<fileset>
<directory>${basedir}</directory>
<includes>
<include>NOTICE</include>
- <include>META-INF/MANIFEST.MF</include>
+ <include>META-INF/**</include>
<include>feature.xml</include>
</includes>
</fileset>
Propchange: tuscany/sca-java-1.x/trunk/tools/eclipse/plugins/core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Nov 14 21:48:14 2010
@@ -4,13 +4,19 @@ dojo
*.iws
*.ipr
*.iml
-.project
-.classpath
+derby.log
maven.log
+maven-eclipse.xml
+build.xml
velocity.log*
junit*.properties
surefire*.properties
+.project
+.classpath
.settings
.deployables
.wtpmodules
-
+.externalToolBuilders
+META-INF
+about.ini
+org
Propchange: tuscany/sca-java-1.x/trunk/tools/eclipse/plugins/core/about_files/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Nov 14 21:48:14 2010
@@ -0,0 +1 @@
+NOTICE
Modified: tuscany/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml?rev=1035081&r1=1035080&r2=1035081&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tools/eclipse/plugins/core/pom.xml Sun Nov 14 21:48:14 2010
@@ -88,7 +88,7 @@
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
<executions>
- <!-- TUSCANY-xxxx: Copy resource files that need to be filtered -->
+ <!-- TUSCANY-3762: Copy resource files that need to be filtered -->
<execution>
<id>copy-filtered-resources</id>
<phase>generate-resources</phase>
@@ -124,14 +124,14 @@
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
- <!-- TUSCANY-xxxx: Delete copied filtered resource files -->
+ <!-- TUSCANY-3762: 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>
+ <include>META-INF/**</include>
+ <include>org/**</include>
</includes>
</fileset>
</filesets>
Propchange: tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Nov 14 21:48:14 2010
@@ -4,13 +4,19 @@ dojo
*.iws
*.ipr
*.iml
-.project
-.classpath
+derby.log
maven.log
+maven-eclipse.xml
+build.xml
velocity.log*
junit*.properties
surefire*.properties
+.project
+.classpath
.settings
.deployables
.wtpmodules
-
+.externalToolBuilders
+NOTICE
+site.xml
+src
Modified: tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml?rev=1035081&r1=1035080&r2=1035081&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tools/eclipse/site/updatesite/pom.xml Sun Nov 14 21:48:14 2010
@@ -65,7 +65,7 @@
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
<executions>
- <!-- TUSCANY-xxxx: Copy resource files that need to be filtered -->
+ <!-- TUSCANY-3762: Copy resource files that need to be filtered -->
<execution>
<id>copy-filtered-resources</id>
<phase>generate-resources</phase>
@@ -112,13 +112,13 @@
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
- <!-- TUSCANY-xxxx: Delete copied filtered resource files -->
+ <!-- TUSCANY-3762: Delete copied filtered resource files -->
<fileset>
<directory>${basedir}</directory>
<includes>
<include>site.xml</include>
<include>NOTICE</include>
- <include>src/main/assembly/updatesite.xml</include>
+ <include>src/**</include>
</includes>
</fileset>
</filesets>