Tim, Thanks, Attaching these diffs to a Bugzilla report is the preferred method. The patches won't get overlooked with the Holidays(Thanksgiving) coming up.
-Rob > -----Original Message----- > From: Tim Chen [mailto:[EMAIL PROTECTED] > Sent: Friday, November 21, 2003 03:56 PM > To: [EMAIL PROTECTED] > Subject: project.xml patch and cleanup > > Removed deprecated use of <id> and replaced with <groupId><artifactId> > combo. > Updated versions based on versions suggests and used by default > build.properties and build.xml > Added corrected resources to unitTest > Cleaned up layout for easier readability > > ------------------------------------------ > cvs diff -u project.xml > Index: project.xml > =================================================================== > RCS file: /home/cvspublic/jakarta-struts/project.xml,v > retrieving revision 1.9 > diff -u -r1.9 project.xml > --- project.xml 21 Nov 2003 06:22:09 -0000 1.9 > +++ project.xml 21 Nov 2003 15:49:51 -0000 > @@ -1,25 +1,21 @@ > <?xml version="1.0"?> > <project> > - <pomVersion>3</pomVersion> > - <name>struts</name> > - <id>struts</id> > - <currentVersion>1.2.0</currentVersion> > - <organization> > - <name>Apache Software Foundation</name> > - <url>http://jakarta.apache.org/</url> > - <logo>http://jakarta.apache.org/images/jakarta-logo-blue.gif</logo> > - </organization> > - <logo>/images/struts-blue-1.gif</logo> > - <inceptionYear>2000</inceptionYear> > - > - <package>org.apache.struts</package> > - > - <shortDescription>MVC Web Application Framework</shortDescription> > - > - <!-- Gump integration --> > - <gumpRepositoryId>jakarta</gumpRepositoryId> > - > - <description> > + <pomVersion>3</pomVersion> > + <name>struts</name> > + <id>struts</id> > + <currentVersion>1.2.0</currentVersion> > + <organization> > + <name>Apache Software Foundation</name> > + <url>http://jakarta.apache.org/</url> > + <logo>http://jakarta.apache.org/images/jakarta-logo-blue.gif</logo> > + </organization> > + <logo>/images/struts-blue-1.gif</logo> > + <inceptionYear>2000</inceptionYear> > + <package>org.apache.struts</package> > + <shortDescription>MVC Web Application Framework</shortDescription> > + <!-- Gump integration --> > + <gumpRepositoryId>jakarta</gumpRepositoryId> > + <description> > The core of the Struts framework is a flexible control layer based on > standard > technologies like Java Servlets, JavaBeans, ResourceBundles, > and Extensible Markup Language (XML), as well as various Jakarta > Commons packages. > @@ -37,289 +33,266 @@ > development environment for your application, based on published standards > and proven design patterns. > </description> > - > - <url>http://jakarta.apache.org/</url> > - <issueTrackingUrl> > + <url>http://jakarta.apache.org/</url> > + <issueTrackingUrl> > http://issues.apache.org/bugzilla/ > </issueTrackingUrl> > - <siteAddress>jakarta.apache.org/struts</siteAddress> > - <siteDirectory> > + <siteAddress>jakarta.apache.org/struts</siteAddress> > + <siteDirectory> > /www/jakarta.apache.org/struts > </siteDirectory> > - <distributionDirectory> > + <distributionDirectory> > /www/apache.mirrors.pair.com/jakarta/struts/ > </distributionDirectory> > - > - <repository> > - > <connection>scm:cvs:pserver:[EMAIL > PROTECTED]:/home/cvspublic:jakarta-struts</connection> > - > <developerConnection>scm:cvs:pserver:[EMAIL > PROTECTED]:/home/cvs:jakarta-struts</developerConnection> > - <url> > + <repository> > + > <connection>scm:cvs:pserver:[EMAIL > PROTECTED]:/home/cvspublic:jakarta-struts</connection> > + > <developerConnection>scm:cvs:pserver:[EMAIL > PROTECTED]:/home/cvs:jakarta-struts</developerConnection> > + <url> > http://cvs.apache.org/viewcvs/jakarta-struts/ > </url> > - </repository> > - > - <versions> > - <version> > - <id>1.0.2</id> > - <name>1.0.2</name> > - <tag>STRUTS_1_0_2</tag> > - </version> > - <version> > - <id>1.1.0</id> > - <name>1.1.0</name> > - <tag>STRUTS_1_1</tag> > - </version> > - </versions> > - > - <mailingLists> > - <mailingList> > - <name>Struts User List</name> > - <subscribe> > + </repository> > + <versions> > + <version> > + <id>1.0.2</id> > + <name>1.0.2</name> > + <tag>STRUTS_1_0_2</tag> > + </version> > + <version> > + <id>1.1.0</id> > + <name>1.1.0</name> > + <tag>STRUTS_1_1</tag> > + </version> > + </versions> > + <mailingLists> > + <mailingList> > + <name>Struts User List</name> > + <subscribe> > [EMAIL PROTECTED] > </subscribe> > - <unsubscribe> > + <unsubscribe> > [EMAIL PROTECTED] > </unsubscribe> > - <archive> > + <archive> > http://nagoya.apache.org/eyebrowse/SummarizeList?listId=42 > </archive> > - </mailingList> > - <mailingList> > - <name>Struts Developer List</name> > - <subscribe> > + </mailingList> > + <mailingList> > + <name>Struts Developer List</name> > + <subscribe> > [EMAIL PROTECTED] > </subscribe> > - <unsubscribe> > + <unsubscribe> > [EMAIL PROTECTED] > </unsubscribe> > - <archive> > + <archive> > http://nagoya.apache.org/eyebrowse/SummarizeList?listId=41 > </archive> > - </mailingList> > - </mailingLists> > - > - <developers> > - > - <developer> > - <name>Craig R. McClanahan</name> > - <email>craigmcc at apache.org</email> > - <organization></organization> > - </developer> > - > - <developer> > - <name>Ted Husted</name> > - <email>husted at apache.org</email> > - <organization></organization> > - </developer> > - > - <developer> > - <name>Rob Leland</name> > - <email>rleland at apache.org</email> > - <organization></organization> > - </developer> > - > - <developer> > - <name>Cedric Dumoulin</name> > - <email>cedric.dumoulin at lifl.fr</email> > - <organization></organization> > - </developer> > - > - <developer> > - <name>Martin Cooper</name> > - <email>martinc at apache.org</email> > - <organization></organization> > - </developer> > - > - <developer> > - <name>Arron Bates</name> > - <email>arron at apache.org</email> > - <organization></organization> > - </developer> > - > - <developer> > - <name>James Holmes</name> > - <email>jholmes at apache.org</email> > - <organization></organization> > - </developer> > - > - <developer> > - <name>David M. Karr</name> > - <email>dmkarr at apache.org</email> > - <organization></organization> > - </developer> > - > - <developer> > - <name>Eddie Bush</name> > - <email>ekbush at apache.org</email> > - <organization></organization> > - </developer> > - > - <developer> > - <name>David Graham</name> > - <email>dgraham at apache.org</email> > - <organization></organization> > - </developer> > - > - <developer> > - <name>James Mitchell</name> > - <email>jmitchell at apache.org</email> > - <organization></organization> > - </developer> > - > - <developer> > - <name>James Turner</name> > - <email>turner at blackbear.com</email> > - <organization></organization> > - </developer> > - > - <developer> > - <name>Steve Raeburn</name> > - <email>sraeburn at apache.org</email> > - <organization></organization> > - </developer> > - > - </developers> > - <contributors> > - <contributor> > - <name>Tim Chen</name> > - <id></id> > - <email>tchen at ampabay.rr.com</email> > - <organization></organization> > - <roles> > - <role></role> > - </roles> > - </contributor> > - </contributors> > - > - <dependencies> > - <dependency> > - <id>commons-beanutils</id> > - <version>1.6.1</version> > - <url>http://jakarta.apache.org/commons/beanutils.html</url> > - </dependency> > - > - <dependency> > - <id>commons-collections</id> > - <version>2.1</version> > - <url>http://jakarta.apache.org/commons/collections.html</url> > - </dependency> > - > - <dependency> > - <id>commons-digester</id> > - <version>1.5</version> > - <url>http://jakarta.apache.org/commons/digester.html</url> > - </dependency> > - > - <dependency> > - <id>commons-fileupload</id> > - <version>1.0</version> > - <url>http://jakarta.apache.org/commons/fileupload.html</url> > - </dependency> > - > - <dependency> > - <id>commons-lang</id> > - <version>1.0.1</version> > - <url>http://jakarta.apache.org/commons/lang.html</url> > - </dependency> > - > - <dependency> > - <id>commons-logging</id> > - <version>1.0.3</version> > - <url>http://jakarta.apache.org/commons/logging.html</url> > - </dependency> > - > - <dependency> > - <id>commons-validator</id> > - <version>1.1.0</version> > - <url>http://jakarta.apache.org/commons/validator.html</url> > - </dependency> > - > - <dependency> > - <id>oro</id> > - <version>2.0.7</version> > - <url>http://jakarta.apache.org/oro/</url> > - </dependency> > - > - <dependency> > - <id>xml-apis</id> > - <version>2.0.2</version> > - <url>http://xml.apache.org/commons/</url> > - </dependency> > - > - <dependency> > - <id>servletapi</id> > - <version>2.2</version> > - </dependency> > - > - <dependency> > - <groupId>antlr</groupId> > - <artifactId>antlr</artifactId> > - <version>2.7.2</version> > - </dependency> > - > - <!-- for unit tests --> > - <dependency> > - <id>junit</id> > - <version>3.8.1</version> > - <url>http://www.junit.org</url> > - </dependency> > - > - <dependency> > - <groupId>cactus</groupId> > - <artifactId>cactus</artifactId> > - <version>12-1.4.1</version> > - <url>http://jakarta.apache.org/cactus</url> > - </dependency> > - <dependency> > - <groupId>cactus</groupId> > - <artifactId>cactus-ant</artifactId> > - <version>1.4.1</version> > - <url>http://jakarta.apache.org/cactus</url> > - </dependency> > - </dependencies> > - > - <build> > - > - <nagEmailAddress> > + </mailingList> > + </mailingLists> > + <developers> > + <developer> > + <name>Craig R. McClanahan</name> > + <email>craigmcc at apache.org</email> > + <organization/> > + </developer> > + <developer> > + <name>Ted Husted</name> > + <email>husted at apache.org</email> > + <organization/> > + </developer> > + <developer> > + <name>Rob Leland</name> > + <email>rleland at apache.org</email> > + <organization/> > + </developer> > + <developer> > + <name>Cedric Dumoulin</name> > + <email>cedric.dumoulin at lifl.fr</email> > + <organization/> > + </developer> > + <developer> > + <name>Martin Cooper</name> > + <email>martinc at apache.org</email> > + <organization/> > + </developer> > + <developer> > + <name>Arron Bates</name> > + <email>arron at apache.org</email> > + <organization/> > + </developer> > + <developer> > + <name>James Holmes</name> > + <email>jholmes at apache.org</email> > + <organization/> > + </developer> > + <developer> > + <name>David M. Karr</name> > + <email>dmkarr at apache.org</email> > + <organization/> > + </developer> > + <developer> > + <name>Eddie Bush</name> > + <email>ekbush at apache.org</email> > + <organization/> > + </developer> > + <developer> > + <name>David Graham</name> > + <email>dgraham at apache.org</email> > + <organization/> > + </developer> > + <developer> > + <name>James Mitchell</name> > + <email>jmitchell at apache.org</email> > + <organization/> > + </developer> > + <developer> > + <name>James Turner</name> > + <email>turner at blackbear.com</email> > + <organization/> > + </developer> > + <developer> > + <name>Steve Raeburn</name> > + <email>sraeburn at apache.org</email> > + <organization/> > + </developer> > + </developers> > + <contributors> > + <contributor> > + <name>Tim Chen</name> > + <id/> > + <email>tchen at ampabay.rr.com</email> > + <organization/> > + <roles> > + <role/> > + </roles> > + </contributor> > + </contributors> > + <dependencies> > + <dependency> > + <groupId>commons-beanutils</groupId> > + <artifactId>commons-beanutils</artifactId> > + <version>1.6.1</version> > + <url>http://jakarta.apache.org/commons/beanutils.html</url> > + </dependency> > + <dependency> > + <groupId>commons-collections</groupId> > + <artifactId>commons-collections</artifactId> > + <version>2.1</version> > + <url>http://jakarta.apache.org/commons/collections.html</url> > + </dependency> > + <dependency> > + <groupId>commons-digester</groupId> > + <artifactId>commons-digester</artifactId> > + <version>1.5</version> > + <url>http://jakarta.apache.org/commons/digester.html</url> > + </dependency> > + <dependency> > + <groupId>commons-fileupload</groupId> > + <artifactId>commons-fileupload</artifactId> > + <version>1.0</version> > + <url>http://jakarta.apache.org/commons/fileupload.html</url> > + </dependency> > + <dependency> > + <groupId>commons-lang</groupId> > + <artifactId>commons-lang</artifactId> > + <version>2.0</version> > + <url>http://jakarta.apache.org/commons/lang.html</url> > + </dependency> > + <dependency> > + <groupId>commons-logging</groupId> > + <artifactId>commons-logging</artifactId> > + <version>1.0.3</version> > + <url>http://jakarta.apache.org/commons/logging.html</url> > + </dependency> > + <dependency> > + <groupId>commons-validator</groupId> > + <artifactId>commons-validator</artifactId> > + <version>1.1.0</version> > + <url>http://jakarta.apache.org/commons/validator.html</url> > + </dependency> > + <dependency> > + <groupId>oro</groupId> > + <artifactId>oro</artifactId> > + <version>2.0.7</version> > + <url>http://jakarta.apache.org/oro/</url> > + </dependency> > + <dependency> > + <groupId>xml-apis</groupId> > + <artifactId>xml-apis</artifactId> > + <version>2.0.2</version> > + <url>http://xml.apache.org/commons/</url> > + </dependency> > + <dependency> > + <groupId>servletapi</groupId> > + <artifactId>servletapi</artifactId> > + <version>2.2</version> > + </dependency> > + <dependency> > + <groupId>antlr</groupId> > + <artifactId>antlr</artifactId> > + <version>2.7.2</version> > + </dependency> > + <!-- for unit tests --> > + <dependency> > + <groupId>junit</groupId> > + <artifactId>junit</artifactId> > + <version>3.8.1</version> > + <url>http://www.junit.org</url> > + </dependency> > + <dependency> > + <groupId>cactus</groupId> > + <artifactId>cactus</artifactId> > + <version>12-1.4.1</version> > + <url>http://jakarta.apache.org/cactus</url> > + </dependency> > + <dependency> > + <groupId>cactus</groupId> > + <artifactId>cactus-ant</artifactId> > + <version>1.4.1</version> > + <url>http://jakarta.apache.org/cactus</url> > + </dependency> > + </dependencies> > + <build> > + <nagEmailAddress> > [EMAIL PROTECTED] > </nagEmailAddress> > - > - <sourceDirectory>src/share</sourceDirectory> > - > - <unitTestSourceDirectory>src/test</unitTestSourceDirectory> > - <integrationUnitTestSourceDirectory/> > - > - <aspectSourceDirectory/> > - > - <!-- Unit test cases --> > - <unitTest> > - <includes> > - <include>**/*Test.java</include> > - </includes> > - <excludes> > - <exclude>**/RepositoryTest.java</exclude> > - </excludes> > - </unitTest> > - > - <!-- J A R R E S O U R C E S --> > - <!-- Resources that are packaged up inside the JAR file --> > - <resources> > - <resource> > - <directory>${basedir}/src/share</directory> > - <includes> > - <include>**/*.properties</include> > - </includes> > - </resource> > - </resources> > - > - <!-- Integration unit test cases --> > - <integrationUnitTest/> > - > - <jars> > - </jars> > - </build> > - > - <reports> > + <sourceDirectory>src/share</sourceDirectory> > + <unitTestSourceDirectory>src/test</unitTestSourceDirectory> > + <integrationUnitTestSourceDirectory/> > + <aspectSourceDirectory/> > + <!-- Unit test cases --> > + <unitTest> > + <includes> > + <include>**/*Test.java</include> > + </includes> > + <excludes> > + <exclude>**/RepositoryTest.java</exclude> > + </excludes> > + <resources> > + <resource> > + > <directory>src/test/org/apache/struts/upload/resources</directory> > + > <targetPath>org/apache/struts/upload/resources</targetPath> > + <includes> > + <include>**/*.txt</include> > + </includes> > + </resource> > + </resources> > + </unitTest> > + <!-- J A R R E S O U R C E S --> > + <!-- Resources that are packaged up inside the JAR file --> > + <resources> > + <resource> > + <directory>${basedir}/src/share</directory> > + <includes> > + <include>**/*.properties</include> > + </includes> > + </resource> > + </resources> > + <!-- Integration unit test cases --> > + <integrationUnitTest/> > + <jars/> > + </build> > + <reports> > <!-- > | > | These should all be completely self contained. You should be able > @@ -330,20 +303,18 @@ > | contain everything needed to produced the report. > | > --> > - > - <report>maven-jdepend-plugin</report> > - <report>maven-checkstyle-plugin</report> > - <report>maven-changes-plugin</report> > - <report>maven-changelog-plugin</report> > - <report>maven-file-activity-plugin</report> > - <report>maven-developer-activity-plugin</report> > - <report>maven-javadoc-plugin</report> > - <report>maven-jxr-plugin</report> > - <report>maven-junit-report-plugin</report> > - <report>maven-tasklist-plugin</report> > - <report>maven-pmd-plugin</report> > - <report>maven-simian-plugin</report> > - <report>maven-faq-plugin</report> > - </reports> > - > -</project> > \ No newline at end of file > + <report>maven-jdepend-plugin</report> > + <report>maven-checkstyle-plugin</report> > + <report>maven-changes-plugin</report> > + <report>maven-changelog-plugin</report> > + <report>maven-file-activity-plugin</report> > + <report>maven-developer-activity-plugin</report> > + <report>maven-javadoc-plugin</report> > + <report>maven-jxr-plugin</report> > + <report>maven-junit-report-plugin</report> > + <report>maven-tasklist-plugin</report> > + <report>maven-pmd-plugin</report> > + <report>maven-simian-plugin</report> > + <report>maven-faq-plugin</report> > + </reports> > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
