You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by Jason van Zyl <jv...@maven.org> on 2003/09/05 19:41:08 UTC
RE: cvs commit: maven/src/test/java/org/apache/maven/project
BaseObjectTest.java BuildTest.java ContributorTest.java DependencyTest.java
ProjectTest.java ResourceTest.java SourceModificationTest.java
VersionTest.java
On Fri, 2003-09-05 at 12:41, Vincent Massol wrote:
> Emmanuel,
>
> At first, I thought you would have been better using javax.xml.parsers.
> DocumentBuilderFactory.setIgnoringElementContentWhitespace(true).
> However, according to the javadoc, that works only if you validate the
> XML when you parse it.
>
> Does anyone know if there's any other solution at the parsing level
> rather than doing it in our business logic? I'm a bit wary of doing it
> in our business classes.
It is a very bad idea. There is probably a way using either betwixt or
digester.
> Thanks
> -Vincent
>
> > -----Original Message-----
> > From: evenisse@apache.org [mailto:evenisse@apache.org]
> > Sent: 05 September 2003 17:29
> > To: maven-cvs@apache.org
> > Subject: cvs commit: maven/src/test/java/org/apache/maven/project
> > BaseObjectTest.java BuildTest.java ContributorTest.java
> > DependencyTest.java ProjectTest.java ResourceTest.java
> > SourceModificationTest.java VersionTest.java
> >
> > evenisse 2003/09/05 08:28:42
> >
> > Modified: src/java/org/apache/maven/project BaseObject.java
> > Branch.java Build.java Contributor.java
> > Dependency.java Project.java Repository.java
> > Resource.java SourceModification.java
> Version.java
> > src/java/org/apache/maven/util StringTool.java
> > src/test/java/org/apache/maven/project
> BaseObjectTest.java
> > BuildTest.java ContributorTest.java
> > DependencyTest.java ProjectTest.java
> > ResourceTest.java SourceModificationTest.java
> > VersionTest.java
> > Log:
> > Trims all necessary strings from pom.
> >
> > Now, we can write entries in pom like this :
> >
> > <report>maven-jdepend-plugin</report>
> >
> > or
> >
> > <report>
> > maven-jdepend-plugin
> > </report>
> >
> > Revision Changes Path
> > 1.28 +5 -3
> > maven/src/java/org/apache/maven/project/BaseObject.java
> >
> > Index: BaseObject.java
> > ===================================================================
> > RCS file:
> > /home/cvs/maven/src/java/org/apache/maven/project/BaseObject.java,v
> > retrieving revision 1.27
> > retrieving revision 1.28
> > diff -u -r1.27 -r1.28
> > --- BaseObject.java 26 Aug 2003 09:52:08 -0000 1.27
> > +++ BaseObject.java 5 Sep 2003 15:28:41 -0000 1.28
> > @@ -58,6 +58,8 @@
> >
> > import org.apache.commons.lang.StringUtils;
> >
> > +import org.apache.maven.util.StringTool;
> > +
> > import java.util.ArrayList;
> > import java.util.HashMap;
> > import java.util.Iterator;
> > @@ -104,7 +106,7 @@
> > */
> > public void setName( String name )
> > {
> > - this.name = name;
> > + this.name = StringTool.trim(name);
> > }
> >
> > /**
> > @@ -124,7 +126,7 @@
> > */
> > public void setId( String id )
> > {
> > - this.id = id;
> > + this.id = StringTool.trim(id);
> > }
> >
> > /**
> >
> >
> >
> > 1.5 +4 -2
> maven/src/java/org/apache/maven/project/Branch.java
> >
> > Index: Branch.java
> > ===================================================================
> > RCS file:
> > /home/cvs/maven/src/java/org/apache/maven/project/Branch.java,v
> > retrieving revision 1.4
> > retrieving revision 1.5
> > diff -u -r1.4 -r1.5
> > --- Branch.java 19 Aug 2003 04:29:25 -0000 1.4
> > +++ Branch.java 5 Sep 2003 15:28:41 -0000 1.5
> > @@ -56,6 +56,8 @@
> > *
> ====================================================================
> > */
> >
> > +import org.apache.maven.util.StringTool;
> > +
> > /**
> > * @author <a href="mailto:evenisse@ifrance.com">Emmanuel
> Venisse</a>
> > * @version $Id$
> > @@ -83,7 +85,7 @@
> > */
> > public void setTag( String tag )
> > {
> > - this.tag = tag;
> > + this.tag = StringTool.trim(tag);
> > }
> >
> > /**
> >
> >
> >
> > 1.24 +7 -6
> maven/src/java/org/apache/maven/project/Build.java
> >
> > Index: Build.java
> > ===================================================================
> > RCS file:
> /home/cvs/maven/src/java/org/apache/maven/project/Build.java,v
> > retrieving revision 1.23
> > retrieving revision 1.24
> > diff -u -r1.23 -r1.24
> > --- Build.java 19 Aug 2003 04:29:25 -0000 1.23
> > +++ Build.java 5 Sep 2003 15:28:41 -0000 1.24
> > @@ -57,6 +57,7 @@
> > */
> >
> > import org.apache.maven.MavenUtils;
> > +import org.apache.maven.util.StringTool;
> >
> > import java.util.ArrayList;
> > import java.util.List;
> > @@ -135,7 +136,7 @@
> > */
> > public void setIntegrationUnitTestSourceDirectory( String
> > utDirectory )
> > {
> > - this.integrationUnitTestSourceDirectory = utDirectory;
> > + this.integrationUnitTestSourceDirectory =
> > StringTool.trim(utDirectory);
> > }
> >
> > /**
> > @@ -155,7 +156,7 @@
> > */
> > public void setUnitTestSourceDirectory( String utDirectory )
> > {
> > - this.unitTestSourceDirectory = utDirectory;
> > + this.unitTestSourceDirectory =
> StringTool.trim(utDirectory);
> > }
> >
> > /**
> > @@ -195,7 +196,7 @@
> > */
> > public void setSourceDirectory( String sourceDirectory )
> > {
> > - this.sourceDirectory = sourceDirectory;
> > + this.sourceDirectory = StringTool.trim(sourceDirectory);
> > }
> >
> > /**
> > @@ -215,7 +216,7 @@
> > */
> > public void setAspectSourceDirectory( String
> aspectSourceDirectory
> > )
> > {
> > - this.aspectSourceDirectory = aspectSourceDirectory;
> > + this.aspectSourceDirectory =
> > StringTool.trim(aspectSourceDirectory);
> > }
> >
> > /**
> > @@ -235,7 +236,7 @@
> > */
> > public void setNagEmailAddress( String nagEmailAddress )
> > {
> > - this.nagEmailAddress = nagEmailAddress;
> > + this.nagEmailAddress = StringTool.trim(nagEmailAddress);
> > }
> >
> > /**
> >
> >
> >
> > 1.8 +4 -2
> > maven/src/java/org/apache/maven/project/Contributor.java
> >
> > Index: Contributor.java
> > ===================================================================
> > RCS file:
> > /home/cvs/maven/src/java/org/apache/maven/project/Contributor.java,v
> > retrieving revision 1.7
> > retrieving revision 1.8
> > diff -u -r1.7 -r1.8
> > --- Contributor.java 12 Apr 2003 00:26:26 -0000 1.7
> > +++ Contributor.java 5 Sep 2003 15:28:41 -0000 1.8
> > @@ -56,6 +56,8 @@
> > *
> ====================================================================
> > */
> >
> > +import org.apache.maven.util.StringTool;
> > +
> > import java.util.SortedSet;
> > import java.util.TreeSet;
> >
> > @@ -112,7 +114,7 @@
> > */
> > public void setEmail( String email )
> > {
> > - this.email = email;
> > + this.email = StringTool.trim(email);
> > }
> >
> > /**
> >
> >
> >
> > 1.40 +10 -8
> > maven/src/java/org/apache/maven/project/Dependency.java
> >
> > Index: Dependency.java
> > ===================================================================
> > RCS file:
> > /home/cvs/maven/src/java/org/apache/maven/project/Dependency.java,v
> > retrieving revision 1.39
> > retrieving revision 1.40
> > diff -u -r1.39 -r1.40
> > --- Dependency.java 27 Aug 2003 16:28:02 -0000 1.39
> > +++ Dependency.java 5 Sep 2003 15:28:41 -0000 1.40
> > @@ -56,6 +56,8 @@
> > *
> ====================================================================
> > */
> >
> > +import org.apache.maven.util.StringTool;
> > +
> > /**
> > * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
> > * @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
> > @@ -158,7 +160,7 @@
> > */
> > public void setGroupId( String groupId )
> > {
> > - this.groupId = groupId;
> > + this.groupId = StringTool.trim(groupId);
> > }
> >
> > /**
> > @@ -204,7 +206,7 @@
> > */
> > public void setArtifactId( String artifactId )
> > {
> > - this.artifactId = artifactId;
> > + this.artifactId = StringTool.trim(artifactId);
> > }
> >
> > /**
> > @@ -233,7 +235,7 @@
> > */
> > public void setVersion( String version )
> > {
> > - this.version = version;
> > + this.version = StringTool.trim(version);
> > }
> >
> > /**
> > @@ -257,12 +259,12 @@
> > // This is a check we need because of the jelly
> interpolation
> > // process. If we don't check an empty string will be set
> and
> > // screw up getArtifact() above.
> > - if ( jar.trim().length() == 0 )
> > + if ( StringTool.trim(jar).length() == 0 )
> > {
> > return;
> > }
> >
> > - this.jar = jar;
> > + this.jar = StringTool.trim(jar);
> > }
> >
> > /**
> > @@ -283,7 +285,7 @@
> > */
> > public void setUrl( String url )
> > {
> > - this.url = url;
> > + this.url = StringTool.trim(url);
> > }
> >
> > /**
> > @@ -332,7 +334,7 @@
> > */
> > public void setType( String type )
> > {
> > - this.type = ArtifactType.findType(type);
> > + this.type = ArtifactType.findType(StringTool.trim(type));
> > }
> >
> > /**
> >
> >
> >
> > 1.91 +21 -19
> > maven/src/java/org/apache/maven/project/Project.java
> >
> > Index: Project.java
> > ===================================================================
> > RCS file:
> > /home/cvs/maven/src/java/org/apache/maven/project/Project.java,v
> > retrieving revision 1.90
> > retrieving revision 1.91
> > diff -u -r1.90 -r1.91
> > --- Project.java 2 Sep 2003 10:46:28 -0000 1.90
> > +++ Project.java 5 Sep 2003 15:28:41 -0000 1.91
> > @@ -69,6 +69,7 @@
> > import org.apache.maven.verifier.ChecksumVerificationException;
> > import org.apache.maven.jelly.MavenJellyContext;
> > import org.apache.maven.jelly.JellyUtils;
> > +import org.apache.maven.util.StringTool;
> > import org.apache.tools.ant.types.Path;
> > import org.apache.commons.grant.GrantProject;
> > import org.apache.commons.logging.Log;
> > @@ -293,7 +294,7 @@
> > */
> > public void setArtifactId( String artifactId )
> > {
> > - this.artifactId = artifactId;
> > + this.artifactId = StringTool.trim(artifactId);
> > }
> >
> > /**
> > @@ -313,7 +314,7 @@
> > */
> > public void setGroupId( String groupId )
> > {
> > - this.groupId = groupId;
> > + this.groupId = StringTool.trim(groupId);
> > }
> >
> > /**
> > @@ -437,7 +438,7 @@
> > */
> > public void setExtend( String pomToExtend )
> > {
> > - this.pomToExtend = pomToExtend;
> > + this.pomToExtend = StringTool.trim(pomToExtend);
> > }
> >
> > /**
> > @@ -487,7 +488,7 @@
> > */
> > public void setGumpRepositoryId( String gumpRepositoryId )
> > {
> > - this.gumpRepositoryId = gumpRepositoryId;
> > + this.gumpRepositoryId = StringTool.trim(gumpRepositoryId);
> > }
> >
> > /**
> > @@ -541,7 +542,7 @@
> > */
> > public void setSiteAddress( String siteAddress )
> > {
> > - this.siteAddress = siteAddress;
> > + this.siteAddress = StringTool.trim(siteAddress);
> > }
> >
> > /**
> > @@ -560,11 +561,11 @@
> > *
> > * @param siteDirectory the directory on the web server where
> the
> > public
> > * web site for this project resides
> > - * (ex: "/www/jakarta.apache.org/turbine/maven/")
> > + * (ex: "/www/maven.apache.org/")
> > */
> > public void setSiteDirectory( String siteDirectory )
> > {
> > - this.siteDirectory = siteDirectory;
> > + this.siteDirectory = StringTool.trim(siteDirectory);
> > }
> >
> > /**
> > @@ -585,7 +586,7 @@
> > */
> > public void setDistributionSite( String distributionSite )
> > {
> > - this.distributionSite = distributionSite;
> > + this.distributionSite = StringTool.trim(distributionSite);
> > }
> >
> > /**
> > @@ -607,7 +608,7 @@
> > */
> > public void setDistributionDirectory( String
> distributionDirectory
> > )
> > {
> > - this.distributionDirectory = distributionDirectory;
> > + this.distributionDirectory =
> > StringTool.trim(distributionDirectory);
> > }
> >
> > /**
> > @@ -720,9 +721,10 @@
> > */
> > public void addReport( String report )
> > {
> > - if ( reports.contains( report ) == false )
> > + String reportName = StringTool.trim(report);
> > + if ( reports.contains( reportName ) == false )
> > {
> > - reports.add( report );
> > + reports.add( reportName );
> > }
> > }
> >
> > @@ -914,7 +916,7 @@
> > */
> > public void setUrl( String url )
> > {
> > - this.url = url;
> > + this.url = StringTool.trim(url);
> > }
> >
> > /**
> > @@ -934,7 +936,7 @@
> > */
> > public void setIssueTrackingUrl( String issueTrackingUrl )
> > {
> > - this.issueTrackingUrl = issueTrackingUrl;
> > + this.issueTrackingUrl = StringTool.trim(issueTrackingUrl);
> > }
> >
> > /**
> > @@ -986,7 +988,7 @@
> > */
> > public void setCurrentVersion( String currentVersion )
> > {
> > - this.currentVersion = currentVersion;
> > + this.currentVersion = StringTool.trim(currentVersion);
> > }
> >
> > /**
> > @@ -1028,7 +1030,7 @@
> > */
> > public void setPackage( String projectPackage )
> > {
> > - this.projectPackage = projectPackage;
> > + this.projectPackage = StringTool.trim(projectPackage);
> > }
> >
> > /**
> > @@ -1049,7 +1051,7 @@
> > */
> > public void setInceptionYear( String inceptionYear )
> > {
> > - this.inceptionYear = inceptionYear;
> > + this.inceptionYear = StringTool.trim(inceptionYear);
> > }
> >
> > /**
> > @@ -1069,7 +1071,7 @@
> > */
> > public void setPomVersion( String pomVersion )
> > {
> > - this.pomVersion = pomVersion;
> > + this.pomVersion = StringTool.trim(pomVersion);
> > }
> >
> > /**
> > @@ -1191,7 +1193,7 @@
> > */
> > public void setLogo( String logo )
> > {
> > - this.logo = logo;
> > + this.logo = StringTool.trim(logo);
> > }
> >
> > /**
> >
> >
> >
> > 1.16 +5 -4
> > maven/src/java/org/apache/maven/project/Repository.java
> >
> > Index: Repository.java
> > ===================================================================
> > RCS file:
> > /home/cvs/maven/src/java/org/apache/maven/project/Repository.java,v
> > retrieving revision 1.15
> > retrieving revision 1.16
> > diff -u -r1.15 -r1.16
> > --- Repository.java 19 Aug 2003 04:29:25 -0000 1.15
> > +++ Repository.java 5 Sep 2003 15:28:42 -0000 1.16
> > @@ -60,6 +60,7 @@
> > import java.util.List;
> >
> > import org.apache.maven.util.EnhancedStringTokenizer;
> > +import org.apache.maven.util.StringTool;
> >
> > /**
> > * NOTE: This is very CVS specific, but I would like to try
> additional
> > SCM
> > @@ -91,7 +92,7 @@
> > */
> > public void setConnection( String connection )
> > {
> > - this.connection = connection;
> > + this.connection = StringTool.trim(connection);
> > }
> >
> > /**
> > @@ -101,7 +102,7 @@
> > */
> > public void setDeveloperConnection( String developerConnection
> )
> > {
> > - this.developerConnection = developerConnection;
> > + this.developerConnection =
> > StringTool.trim(developerConnection);
> > }
> >
> > /**
> > @@ -131,7 +132,7 @@
> > */
> > public void setUrl( String url )
> > {
> > - this.url = url;
> > + this.url = StringTool.trim(url);
> > }
> >
> > /**
> >
> >
> >
> > 1.12 +5 -4
> > maven/src/java/org/apache/maven/project/Resource.java
> >
> > Index: Resource.java
> > ===================================================================
> > RCS file:
> > /home/cvs/maven/src/java/org/apache/maven/project/Resource.java,v
> > retrieving revision 1.11
> > retrieving revision 1.12
> > diff -u -r1.11 -r1.12
> > --- Resource.java 19 Aug 2003 04:29:25 -0000 1.11
> > +++ Resource.java 5 Sep 2003 15:28:42 -0000 1.12
> > @@ -57,6 +57,7 @@
> > */
> >
> > import org.apache.maven.MavenUtils;
> > +import org.apache.maven.util.StringTool;
> >
> > import java.util.ArrayList;
> > import java.util.List;
> > @@ -95,7 +96,7 @@
> > */
> > public void addInclude( String pattern )
> > {
> > - this.includes.add( pattern );
> > + this.includes.add( StringTool.trim(pattern) );
> > }
> >
> > /**
> > @@ -105,7 +106,7 @@
> > */
> > public void addExclude( String pattern )
> > {
> > - this.excludes.add( pattern );
> > + this.excludes.add( StringTool.trim(pattern) );
> > }
> >
> > /**
> > @@ -135,7 +136,7 @@
> > */
> > public void setDirectory( String dir )
> > {
> > - this.dir = dir;
> > + this.dir = StringTool.trim(dir);
> > }
> >
> > /**
> > @@ -155,7 +156,7 @@
> > */
> > public void setTargetPath( String targetPath )
> > {
> > - this.targetPath = targetPath;
> > + this.targetPath = StringTool.trim(targetPath);
> > }
> >
> > /**
> >
> >
> >
> > 1.9 +5 -3
> > maven/src/java/org/apache/maven/project/SourceModification.java
> >
> > Index: SourceModification.java
> > ===================================================================
> > RCS file:
> >
> /home/cvs/maven/src/java/org/apache/maven/project/SourceModification.jav
> a,
> > v
> > retrieving revision 1.8
> > retrieving revision 1.9
> > diff -u -r1.8 -r1.9
> > --- SourceModification.java 12 Apr 2003 00:02:03 -0000 1.8
> > +++ SourceModification.java 5 Sep 2003 15:28:42 -0000 1.9
> > @@ -56,6 +56,8 @@
> > *
> ====================================================================
> > */
> >
> > +import org.apache.maven.util.StringTool;
> > +
> > /**
> > * A source modification is made when a given class or property is
> > present
> > * during a build. Currently with the way Maven works an exclusion
> is
> > the only thing
> > @@ -88,7 +90,7 @@
> > */
> > public void setClassName( String className )
> > {
> > - this.className = className;
> > + this.className = StringTool.trim(className);
> > }
> >
> > /**
> > @@ -108,7 +110,7 @@
> > */
> > public void setProperty( String property )
> > {
> > - this.property = property;
> > + this.property = StringTool.trim(property);
> > }
> >
> > /**
> >
> >
> >
> > 1.6 +4 -2
> > maven/src/java/org/apache/maven/project/Version.java
> >
> > Index: Version.java
> > ===================================================================
> > RCS file:
> > /home/cvs/maven/src/java/org/apache/maven/project/Version.java,v
> > retrieving revision 1.5
> > retrieving revision 1.6
> > diff -u -r1.5 -r1.6
> > --- Version.java 12 Apr 2003 00:02:03 -0000 1.5
> > +++ Version.java 5 Sep 2003 15:28:42 -0000 1.6
> > @@ -56,6 +56,8 @@
> > *
> ====================================================================
> > */
> >
> > +import org.apache.maven.util.StringTool;
> > +
> > /**
> > * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
> > * @version $Id$
> > @@ -83,7 +85,7 @@
> > */
> > public void setTag( String tag )
> > {
> > - this.tag = tag;
> > + this.tag = StringTool.trim(tag);
> > }
> >
> > /**
> >
> >
> >
> > 1.3 +17 -1
> > maven/src/java/org/apache/maven/util/StringTool.java
> >
> > Index: StringTool.java
> > ===================================================================
> > RCS file:
> > /home/cvs/maven/src/java/org/apache/maven/util/StringTool.java,v
> > retrieving revision 1.2
> > retrieving revision 1.3
> > diff -u -r1.2 -r1.3
> > --- StringTool.java 19 Aug 2003 04:31:38 -0000 1.2
> > +++ StringTool.java 5 Sep 2003 15:28:42 -0000 1.3
> > @@ -59,6 +59,8 @@
> > import java.util.Arrays;
> > import java.util.List;
> >
> > +import org.apache.commons.lang.StringUtils;
> > +
> > /**
> > * @author <a href="mailto:bwalding@jakarta.org">Ben Walding</a>
> > * @version $Id$
> > @@ -95,5 +97,19 @@
> > String[] result = { s.substring(0, index),
> > s.substring(index + 1)};
> > return Arrays.asList(result);
> > }
> > + }
> > +
> > + /**
> > + * <p>Removes all whitespace characters from the start and end
> of a
> > String.</p>
> > + *
> > + * <p>This is similar to {@link #trim(String)} but removes
> > whitespace.
> > + * Whitespace is defined by {@link
> > Character#isWhitespace(char)}.</p>
> > + *
> > + * @param str the String to remove characters from, may be null
> > + * @return the trimmed String, <code>null</code> if null String
> > input
> > + */
> > + public static String trim(String s)
> > + {
> > + return StringUtils.strip(s);
> > }
> > }
> >
> >
> >
> > 1.5 +2 -2
> > maven/src/test/java/org/apache/maven/project/BaseObjectTest.java
> >
> > Index: BaseObjectTest.java
> > ===================================================================
> > RCS file:
> >
> /home/cvs/maven/src/test/java/org/apache/maven/project/BaseObjectTest.ja
> va
> > ,v
> > retrieving revision 1.4
> > retrieving revision 1.5
> > diff -u -r1.4 -r1.5
> > --- BaseObjectTest.java 26 Aug 2003 09:52:08 -0000 1.4
> > +++ BaseObjectTest.java 5 Sep 2003 15:28:42 -0000 1.5
> > @@ -55,7 +55,7 @@
> > public void testSetGetName() throws Exception
> > {
> > // JUnitDoclet begin method setName getName
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -68,7 +68,7 @@
> > public void testSetGetId() throws Exception
> > {
> > // JUnitDoclet begin method setId getId
> > - java.lang.String[] tests = {" ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n"};
> > + java.lang.String[] tests = {"a", "A", "ä", "ß",
> "0123456789",
> > "012345678901234567890"};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> >
> >
> >
> > 1.5 +1 -1
> > maven/src/test/java/org/apache/maven/project/BuildTest.java
> >
> > Index: BuildTest.java
> > ===================================================================
> > RCS file:
> >
> /home/cvs/maven/src/test/java/org/apache/maven/project/BuildTest.java,v
> > retrieving revision 1.4
> > retrieving revision 1.5
> > diff -u -r1.4 -r1.5
> > --- BuildTest.java 21 Aug 2003 22:48:43 -0000 1.4
> > +++ BuildTest.java 5 Sep 2003 15:28:42 -0000 1.5
> > @@ -85,7 +85,7 @@
> > public void testSetGetNagEmailAddress() throws Exception
> > {
> > // JUnitDoclet begin method setNagEmailAddress
> > getNagEmailAddress
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> >
> >
> >
> > 1.3 +1 -1
> > maven/src/test/java/org/apache/maven/project/ContributorTest.java
> >
> > Index: ContributorTest.java
> > ===================================================================
> > RCS file:
> >
> /home/cvs/maven/src/test/java/org/apache/maven/project/ContributorTest.j
> av
> > a,v
> > retrieving revision 1.2
> > retrieving revision 1.3
> > diff -u -r1.2 -r1.3
> > --- ContributorTest.java 5 Dec 2002 15:55:35 -0000 1.2
> > +++ ContributorTest.java 5 Sep 2003 15:28:42 -0000 1.3
> > @@ -55,7 +55,7 @@
> > public void testSetGetEmail() throws Exception
> > {
> > // JUnitDoclet begin method setEmail getEmail
> > - java.lang.String[] tests = {"", " ", "a", "A", "?", "?",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "?", "?",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> >
> >
> >
> > 1.7 +4 -4
> > maven/src/test/java/org/apache/maven/project/DependencyTest.java
> >
> > Index: DependencyTest.java
> > ===================================================================
> > RCS file:
> >
> /home/cvs/maven/src/test/java/org/apache/maven/project/DependencyTest.ja
> va
> > ,v
> > retrieving revision 1.6
> > retrieving revision 1.7
> > diff -u -r1.6 -r1.7
> > --- DependencyTest.java 19 Aug 2003 04:45:37 -0000 1.6
> > +++ DependencyTest.java 5 Sep 2003 15:28:42 -0000 1.7
> > @@ -67,7 +67,7 @@
> > public void testSetGetGroupId() throws Exception
> > {
> > // JUnitDoclet begin method setGroupId getGroupId
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -101,7 +101,7 @@
> > public void testSetGetVersion() throws Exception
> > {
> > // JUnitDoclet begin method setVersion getVersion
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -114,7 +114,7 @@
> > public void testSetGetUrl() throws Exception
> > {
> > // JUnitDoclet begin method setUrl getUrl
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -127,7 +127,7 @@
> > public void testSetGetType() throws Exception
> > {
> > // JUnitDoclet begin method setType getType
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> >
> >
> >
> > 1.5 +16 -16
> > maven/src/test/java/org/apache/maven/project/ProjectTest.java
> >
> > Index: ProjectTest.java
> > ===================================================================
> > RCS file:
> >
> /home/cvs/maven/src/test/java/org/apache/maven/project/ProjectTest.java,
> v
> > retrieving revision 1.4
> > retrieving revision 1.5
> > diff -u -r1.4 -r1.5
> > --- ProjectTest.java 18 Jan 2003 02:48:29 -0000 1.4
> > +++ ProjectTest.java 5 Sep 2003 15:28:42 -0000 1.5
> > @@ -68,7 +68,7 @@
> > public void testSetGetExtend() throws Exception
> > {
> > // JUnitDoclet begin method setExtend getExtend
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -81,7 +81,7 @@
> > public void testSetGetGumpRepositoryId() throws Exception
> > {
> > // JUnitDoclet begin method setGumpRepositoryId
> > getGumpRepositoryId
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -94,7 +94,7 @@
> > public void testSetGetShortDescription() throws Exception
> > {
> > // JUnitDoclet begin method setShortDescription
> > getShortDescription
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -107,7 +107,7 @@
> > public void testSetGetGroupId() throws Exception
> > {
> > // JUnitDoclet begin method setGroupId getGroupId
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n"};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890"};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -120,7 +120,7 @@
> > public void testSetGetSiteAddress() throws Exception
> > {
> > // JUnitDoclet begin method setSiteAddress getSiteAddress
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -133,7 +133,7 @@
> > public void testSetGetSiteDirectory() throws Exception
> > {
> > // JUnitDoclet begin method setSiteDirectory
> getSiteDirectory
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -146,7 +146,7 @@
> > public void testSetGetDistributionSite() throws Exception
> > {
> > // JUnitDoclet begin method setDistributionSite
> > getDistributionSite
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -159,7 +159,7 @@
> > public void testSetGetDistributionDirectory() throws Exception
> > {
> > // JUnitDoclet begin method setDistributionDirectory
> > getDistributionDirectory
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -298,7 +298,7 @@
> > public void testSetGetUrl() throws Exception
> > {
> > // JUnitDoclet begin method setUrl getUrl
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -311,7 +311,7 @@
> > public void testSetGetIssueTrackingUrl() throws Exception
> > {
> > // JUnitDoclet begin method setIssueTrackingUrl
> > getIssueTrackingUrl
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -324,7 +324,7 @@
> > public void testSetGetDescription() throws Exception
> > {
> > // JUnitDoclet begin method setDescription getDescription
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -343,7 +343,7 @@
> > public void testSetGetCurrentVersion() throws Exception
> > {
> > // JUnitDoclet begin method setCurrentVersion
> getCurrentVersion
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -369,7 +369,7 @@
> > public void testSetGetPackage() throws Exception
> > {
> > // JUnitDoclet begin method setPackage getPackage
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -382,7 +382,7 @@
> > public void testSetGetInceptionYear() throws Exception
> > {
> > // JUnitDoclet begin method setInceptionYear
> getInceptionYear
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -395,7 +395,7 @@
> > public void testSetGetPomVersion() throws Exception
> > {
> > // JUnitDoclet begin method setPomVersion getPomVersion
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n"};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890"};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -451,7 +451,7 @@
> > public void testSetGetLogo() throws Exception
> > {
> > // JUnitDoclet begin method setLogo getLogo
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> >
> >
> >
> > 1.2 +1 -1
> > maven/src/test/java/org/apache/maven/project/ResourceTest.java
> >
> > Index: ResourceTest.java
> > ===================================================================
> > RCS file:
> >
> /home/cvs/maven/src/test/java/org/apache/maven/project/ResourceTest.java
> ,v
> > retrieving revision 1.1
> > retrieving revision 1.2
> > diff -u -r1.1 -r1.2
> > --- ResourceTest.java 26 Nov 2002 23:38:54 -0000 1.1
> > +++ ResourceTest.java 5 Sep 2003 15:28:42 -0000 1.2
> > @@ -79,7 +79,7 @@
> > public void testSetGetDirectory() throws Exception
> > {
> > // JUnitDoclet begin method setDirectory getDirectory
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> >
> >
> >
> > 1.2 +2 -2
> >
> maven/src/test/java/org/apache/maven/project/SourceModificationTest.java
> >
> > Index: SourceModificationTest.java
> > ===================================================================
> > RCS file:
> >
> /home/cvs/maven/src/test/java/org/apache/maven/project/SourceModificatio
> nT
> > est.java,v
> > retrieving revision 1.1
> > retrieving revision 1.2
> > diff -u -r1.1 -r1.2
> > --- SourceModificationTest.java 26 Nov 2002 23:39:01 -0000
> 1.1
> > +++ SourceModificationTest.java 5 Sep 2003 15:28:42 -0000
> 1.2
> > @@ -55,7 +55,7 @@
> > public void testSetGetClassName() throws Exception
> > {
> > // JUnitDoclet begin method setClassName getClassName
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> > @@ -68,7 +68,7 @@
> > public void testSetGetProperty() throws Exception
> > {
> > // JUnitDoclet begin method setProperty getProperty
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> >
> >
> >
> > 1.2 +1 -1
> > maven/src/test/java/org/apache/maven/project/VersionTest.java
> >
> > Index: VersionTest.java
> > ===================================================================
> > RCS file:
> >
> /home/cvs/maven/src/test/java/org/apache/maven/project/VersionTest.java,
> v
> > retrieving revision 1.1
> > retrieving revision 1.2
> > diff -u -r1.1 -r1.2
> > --- VersionTest.java 26 Nov 2002 23:39:17 -0000 1.1
> > +++ VersionTest.java 5 Sep 2003 15:28:42 -0000 1.2
> > @@ -55,7 +55,7 @@
> > public void testSetGetTag() throws Exception
> > {
> > // JUnitDoclet begin method setTag getTag
> > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", "\n", null};
> > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > "0123456789", "012345678901234567890", null};
> >
> > for ( int i = 0; i < tests.length; i++ )
> > {
> >
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > For additional commands, e-mail: dev-help@maven.apache.org
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
--
jvz.
Jason van Zyl
jason@zenplex.com
http://tambora.zenplex.org
In short, man creates for himself a new religion of a rational
and technical order to justify his work and to be justified in it.
-- Jacques Ellul, The Technological Society
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: cvs commit: maven/src/test/java/org/apache/maven/projectBaseObjectTest.java BuildTest.java ContributorTest.java DependencyTest.javaProjectTest.java ResourceTest.java SourceModificationTest.javaVersionTest.java
Posted by Emmanuel Venisse <ev...@ifrance.com>.
Can we use DefaultProjectUnmarshaller with XmlPullParser instead of
betwixt/digester.
With this, we can replace parser.nextText() with strip(parser.nextText)
Emmanuel
----- Original Message -----
From: <di...@multitask.com.au>
To: "Maven Developers List" <de...@maven.apache.org>
Sent: Saturday, September 06, 2003 10:04 AM
Subject: Re: cvs commit:
maven/src/test/java/org/apache/maven/projectBaseObjectTest.java
BuildTest.java ContributorTest.java DependencyTest.javaProjectTest.java
ResourceTest.java SourceModificationTest.javaVersionTest.java
Yep, as a short term idea, it's one that works and is easily revertable.
It's lots better than leaving the bug unfixed :-)
--
dIon Gillard, Multitask Consulting
Blog: http://blogs.codehaus.org/people/dion/
"Emmanuel Venisse" <ev...@ifrance.com> wrote on 06/09/2003 05:37:51 PM:
>
> ----- Original Message -----
> From: "Jason van Zyl" <jv...@maven.org>
> To: "Maven Developers List" <de...@maven.apache.org>
> Sent: Friday, September 05, 2003 7:41 PM
> Subject: RE: cvs commit:
> maven/src/test/java/org/apache/maven/projectBaseObjectTest.java
> BuildTest.java ContributorTest.java DependencyTest.javaProjectTest.java
> ResourceTest.java SourceModificationTest.javaVersionTest.java
>
>
> > On Fri, 2003-09-05 at 12:41, Vincent Massol wrote:
> > > Emmanuel,
> > >
> > > At first, I thought you would have been better using
javax.xml.parsers.
> > > DocumentBuilderFactory.setIgnoringElementContentWhitespace(true).
> > > However, according to the javadoc, that works only if you validate
the
> > > XML when you parse it.
> > >
> > > Does anyone know if there's any other solution at the parsing level
> > > rather than doing it in our business logic? I'm a bit wary of doing
it
> > > in our business classes.
> >
> > It is a very bad idea. There is probably a way using either betwixt or
> > digester.
> >
> I'm ok with you but it's a temporary solution. If you know how to
resolve
> this I revert my modifications. I have no time this weekend for search
an
> other solution.
>
> > > Thanks
> > > -Vincent
> > >
> > > > -----Original Message-----
> > > > From: evenisse@apache.org [mailto:evenisse@apache.org]
> > > > Sent: 05 September 2003 17:29
> > > > To: maven-cvs@apache.org
> > > > Subject: cvs commit: maven/src/test/java/org/apache/maven/project
> > > > BaseObjectTest.java BuildTest.java ContributorTest.java
> > > > DependencyTest.java ProjectTest.java ResourceTest.java
> > > > SourceModificationTest.java VersionTest.java
> > > >
> > > > evenisse 2003/09/05 08:28:42
> > > >
> > > > Modified: src/java/org/apache/maven/project BaseObject.java
> > > > Branch.java Build.java Contributor.java
> > > > Dependency.java Project.java
Repository.java
> > > > Resource.java SourceModification.java
> > > Version.java
> > > > src/java/org/apache/maven/util StringTool.java
> > > > src/test/java/org/apache/maven/project
> > > BaseObjectTest.java
> > > > BuildTest.java ContributorTest.java
> > > > DependencyTest.java ProjectTest.java
> > > > ResourceTest.java
SourceModificationTest.java
> > > > VersionTest.java
> > > > Log:
> > > > Trims all necessary strings from pom.
> > > >
> > > > Now, we can write entries in pom like this :
> > > >
> > > > <report>maven-jdepend-plugin</report>
> > > >
> > > > or
> > > >
> > > > <report>
> > > > maven-jdepend-plugin
> > > > </report>
> > > >
> > > > Revision Changes Path
> > > > 1.28 +5 -3
> > > > maven/src/java/org/apache/maven/project/BaseObject.java
> > > >
> > > > Index: BaseObject.java
> > > >
===================================================================
> > > > RCS file:
> > > >
/home/cvs/maven/src/java/org/apache/maven/project/BaseObject.java,v
> > > > retrieving revision 1.27
> > > > retrieving revision 1.28
> > > > diff -u -r1.27 -r1.28
> > > > --- BaseObject.java 26 Aug 2003 09:52:08 -0000 1.27
> > > > +++ BaseObject.java 5 Sep 2003 15:28:41 -0000 1.28
> > > > @@ -58,6 +58,8 @@
> > > >
> > > > import org.apache.commons.lang.StringUtils;
> > > >
> > > > +import org.apache.maven.util.StringTool;
> > > > +
> > > > import java.util.ArrayList;
> > > > import java.util.HashMap;
> > > > import java.util.Iterator;
> > > > @@ -104,7 +106,7 @@
> > > > */
> > > > public void setName( String name )
> > > > {
> > > > - this.name = name;
> > > > + this.name = StringTool.trim(name);
> > > > }
> > > >
> > > > /**
> > > > @@ -124,7 +126,7 @@
> > > > */
> > > > public void setId( String id )
> > > > {
> > > > - this.id = id;
> > > > + this.id = StringTool.trim(id);
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.5 +4 -2
> > > maven/src/java/org/apache/maven/project/Branch.java
> > > >
> > > > Index: Branch.java
> > > >
===================================================================
> > > > RCS file:
> > > > /home/cvs/maven/src/java/org/apache/maven/project/Branch.java,v
> > > > retrieving revision 1.4
> > > > retrieving revision 1.5
> > > > diff -u -r1.4 -r1.5
> > > > --- Branch.java 19 Aug 2003 04:29:25 -0000 1.4
> > > > +++ Branch.java 5 Sep 2003 15:28:41 -0000 1.5
> > > > @@ -56,6 +56,8 @@
> > > > *
> > > ====================================================================
> > > > */
> > > >
> > > > +import org.apache.maven.util.StringTool;
> > > > +
> > > > /**
> > > > * @author <a href="mailto:evenisse@ifrance.com">Emmanuel
> > > Venisse</a>
> > > > * @version $Id$
> > > > @@ -83,7 +85,7 @@
> > > > */
> > > > public void setTag( String tag )
> > > > {
> > > > - this.tag = tag;
> > > > + this.tag = StringTool.trim(tag);
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.24 +7 -6
> > > maven/src/java/org/apache/maven/project/Build.java
> > > >
> > > > Index: Build.java
> > > >
===================================================================
> > > > RCS file:
> > > /home/cvs/maven/src/java/org/apache/maven/project/Build.java,v
> > > > retrieving revision 1.23
> > > > retrieving revision 1.24
> > > > diff -u -r1.23 -r1.24
> > > > --- Build.java 19 Aug 2003 04:29:25 -0000 1.23
> > > > +++ Build.java 5 Sep 2003 15:28:41 -0000 1.24
> > > > @@ -57,6 +57,7 @@
> > > > */
> > > >
> > > > import org.apache.maven.MavenUtils;
> > > > +import org.apache.maven.util.StringTool;
> > > >
> > > > import java.util.ArrayList;
> > > > import java.util.List;
> > > > @@ -135,7 +136,7 @@
> > > > */
> > > > public void setIntegrationUnitTestSourceDirectory( String
> > > > utDirectory )
> > > > {
> > > > - this.integrationUnitTestSourceDirectory = utDirectory;
> > > > + this.integrationUnitTestSourceDirectory =
> > > > StringTool.trim(utDirectory);
> > > > }
> > > >
> > > > /**
> > > > @@ -155,7 +156,7 @@
> > > > */
> > > > public void setUnitTestSourceDirectory( String utDirectory
)
> > > > {
> > > > - this.unitTestSourceDirectory = utDirectory;
> > > > + this.unitTestSourceDirectory =
> > > StringTool.trim(utDirectory);
> > > > }
> > > >
> > > > /**
> > > > @@ -195,7 +196,7 @@
> > > > */
> > > > public void setSourceDirectory( String sourceDirectory )
> > > > {
> > > > - this.sourceDirectory = sourceDirectory;
> > > > + this.sourceDirectory =
StringTool.trim(sourceDirectory);
> > > > }
> > > >
> > > > /**
> > > > @@ -215,7 +216,7 @@
> > > > */
> > > > public void setAspectSourceDirectory( String
> > > aspectSourceDirectory
> > > > )
> > > > {
> > > > - this.aspectSourceDirectory = aspectSourceDirectory;
> > > > + this.aspectSourceDirectory =
> > > > StringTool.trim(aspectSourceDirectory);
> > > > }
> > > >
> > > > /**
> > > > @@ -235,7 +236,7 @@
> > > > */
> > > > public void setNagEmailAddress( String nagEmailAddress )
> > > > {
> > > > - this.nagEmailAddress = nagEmailAddress;
> > > > + this.nagEmailAddress =
StringTool.trim(nagEmailAddress);
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.8 +4 -2
> > > > maven/src/java/org/apache/maven/project/Contributor.java
> > > >
> > > > Index: Contributor.java
> > > >
===================================================================
> > > > RCS file:
> > > >
/home/cvs/maven/src/java/org/apache/maven/project/Contributor.java,v
> > > > retrieving revision 1.7
> > > > retrieving revision 1.8
> > > > diff -u -r1.7 -r1.8
> > > > --- Contributor.java 12 Apr 2003 00:26:26 -0000 1.7
> > > > +++ Contributor.java 5 Sep 2003 15:28:41 -0000 1.8
> > > > @@ -56,6 +56,8 @@
> > > > *
> > > ====================================================================
> > > > */
> > > >
> > > > +import org.apache.maven.util.StringTool;
> > > > +
> > > > import java.util.SortedSet;
> > > > import java.util.TreeSet;
> > > >
> > > > @@ -112,7 +114,7 @@
> > > > */
> > > > public void setEmail( String email )
> > > > {
> > > > - this.email = email;
> > > > + this.email = StringTool.trim(email);
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.40 +10 -8
> > > > maven/src/java/org/apache/maven/project/Dependency.java
> > > >
> > > > Index: Dependency.java
> > > >
===================================================================
> > > > RCS file:
> > > >
/home/cvs/maven/src/java/org/apache/maven/project/Dependency.java,v
> > > > retrieving revision 1.39
> > > > retrieving revision 1.40
> > > > diff -u -r1.39 -r1.40
> > > > --- Dependency.java 27 Aug 2003 16:28:02 -0000 1.39
> > > > +++ Dependency.java 5 Sep 2003 15:28:41 -0000 1.40
> > > > @@ -56,6 +56,8 @@
> > > > *
> > > ====================================================================
> > > > */
> > > >
> > > > +import org.apache.maven.util.StringTool;
> > > > +
> > > > /**
> > > > * @author <a href="mailto:jvanzyl@apache.org">Jason van
Zyl</a>
> > > > * @author <a href="mailto:vmassol@apache.org">Vincent
Massol</a>
> > > > @@ -158,7 +160,7 @@
> > > > */
> > > > public void setGroupId( String groupId )
> > > > {
> > > > - this.groupId = groupId;
> > > > + this.groupId = StringTool.trim(groupId);
> > > > }
> > > >
> > > > /**
> > > > @@ -204,7 +206,7 @@
> > > > */
> > > > public void setArtifactId( String artifactId )
> > > > {
> > > > - this.artifactId = artifactId;
> > > > + this.artifactId = StringTool.trim(artifactId);
> > > > }
> > > >
> > > > /**
> > > > @@ -233,7 +235,7 @@
> > > > */
> > > > public void setVersion( String version )
> > > > {
> > > > - this.version = version;
> > > > + this.version = StringTool.trim(version);
> > > > }
> > > >
> > > > /**
> > > > @@ -257,12 +259,12 @@
> > > > // This is a check we need because of the jelly
> > > interpolation
> > > > // process. If we don't check an empty string will be
set
> > > and
> > > > // screw up getArtifact() above.
> > > > - if ( jar.trim().length() == 0 )
> > > > + if ( StringTool.trim(jar).length() == 0 )
> > > > {
> > > > return;
> > > > }
> > > >
> > > > - this.jar = jar;
> > > > + this.jar = StringTool.trim(jar);
> > > > }
> > > >
> > > > /**
> > > > @@ -283,7 +285,7 @@
> > > > */
> > > > public void setUrl( String url )
> > > > {
> > > > - this.url = url;
> > > > + this.url = StringTool.trim(url);
> > > > }
> > > >
> > > > /**
> > > > @@ -332,7 +334,7 @@
> > > > */
> > > > public void setType( String type )
> > > > {
> > > > - this.type = ArtifactType.findType(type);
> > > > + this.type =
ArtifactType.findType(StringTool.trim(type));
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.91 +21 -19
> > > > maven/src/java/org/apache/maven/project/Project.java
> > > >
> > > > Index: Project.java
> > > >
===================================================================
> > > > RCS file:
> > > > /home/cvs/maven/src/java/org/apache/maven/project/Project.java,v
> > > > retrieving revision 1.90
> > > > retrieving revision 1.91
> > > > diff -u -r1.90 -r1.91
> > > > --- Project.java 2 Sep 2003 10:46:28 -0000 1.90
> > > > +++ Project.java 5 Sep 2003 15:28:41 -0000 1.91
> > > > @@ -69,6 +69,7 @@
> > > > import org.apache.maven.verifier.ChecksumVerificationException;
> > > > import org.apache.maven.jelly.MavenJellyContext;
> > > > import org.apache.maven.jelly.JellyUtils;
> > > > +import org.apache.maven.util.StringTool;
> > > > import org.apache.tools.ant.types.Path;
> > > > import org.apache.commons.grant.GrantProject;
> > > > import org.apache.commons.logging.Log;
> > > > @@ -293,7 +294,7 @@
> > > > */
> > > > public void setArtifactId( String artifactId )
> > > > {
> > > > - this.artifactId = artifactId;
> > > > + this.artifactId = StringTool.trim(artifactId);
> > > > }
> > > >
> > > > /**
> > > > @@ -313,7 +314,7 @@
> > > > */
> > > > public void setGroupId( String groupId )
> > > > {
> > > > - this.groupId = groupId;
> > > > + this.groupId = StringTool.trim(groupId);
> > > > }
> > > >
> > > > /**
> > > > @@ -437,7 +438,7 @@
> > > > */
> > > > public void setExtend( String pomToExtend )
> > > > {
> > > > - this.pomToExtend = pomToExtend;
> > > > + this.pomToExtend = StringTool.trim(pomToExtend);
> > > > }
> > > >
> > > > /**
> > > > @@ -487,7 +488,7 @@
> > > > */
> > > > public void setGumpRepositoryId( String gumpRepositoryId )
> > > > {
> > > > - this.gumpRepositoryId = gumpRepositoryId;
> > > > + this.gumpRepositoryId =
StringTool.trim(gumpRepositoryId);
> > > > }
> > > >
> > > > /**
> > > > @@ -541,7 +542,7 @@
> > > > */
> > > > public void setSiteAddress( String siteAddress )
> > > > {
> > > > - this.siteAddress = siteAddress;
> > > > + this.siteAddress = StringTool.trim(siteAddress);
> > > > }
> > > >
> > > > /**
> > > > @@ -560,11 +561,11 @@
> > > > *
> > > > * @param siteDirectory the directory on the web server
where
> > > the
> > > > public
> > > > * web site for this project resides
> > > > - * (ex: "/www/jakarta.apache.org/turbine/maven/")
> > > > + * (ex: "/www/maven.apache.org/")
> > > > */
> > > > public void setSiteDirectory( String siteDirectory )
> > > > {
> > > > - this.siteDirectory = siteDirectory;
> > > > + this.siteDirectory = StringTool.trim(siteDirectory);
> > > > }
> > > >
> > > > /**
> > > > @@ -585,7 +586,7 @@
> > > > */
> > > > public void setDistributionSite( String distributionSite )
> > > > {
> > > > - this.distributionSite = distributionSite;
> > > > + this.distributionSite =
StringTool.trim(distributionSite);
> > > > }
> > > >
> > > > /**
> > > > @@ -607,7 +608,7 @@
> > > > */
> > > > public void setDistributionDirectory( String
> > > distributionDirectory
> > > > )
> > > > {
> > > > - this.distributionDirectory = distributionDirectory;
> > > > + this.distributionDirectory =
> > > > StringTool.trim(distributionDirectory);
> > > > }
> > > >
> > > > /**
> > > > @@ -720,9 +721,10 @@
> > > > */
> > > > public void addReport( String report )
> > > > {
> > > > - if ( reports.contains( report ) == false )
> > > > + String reportName = StringTool.trim(report);
> > > > + if ( reports.contains( reportName ) == false )
> > > > {
> > > > - reports.add( report );
> > > > + reports.add( reportName );
> > > > }
> > > > }
> > > >
> > > > @@ -914,7 +916,7 @@
> > > > */
> > > > public void setUrl( String url )
> > > > {
> > > > - this.url = url;
> > > > + this.url = StringTool.trim(url);
> > > > }
> > > >
> > > > /**
> > > > @@ -934,7 +936,7 @@
> > > > */
> > > > public void setIssueTrackingUrl( String issueTrackingUrl )
> > > > {
> > > > - this.issueTrackingUrl = issueTrackingUrl;
> > > > + this.issueTrackingUrl =
StringTool.trim(issueTrackingUrl);
> > > > }
> > > >
> > > > /**
> > > > @@ -986,7 +988,7 @@
> > > > */
> > > > public void setCurrentVersion( String currentVersion )
> > > > {
> > > > - this.currentVersion = currentVersion;
> > > > + this.currentVersion = StringTool.trim(currentVersion);
> > > > }
> > > >
> > > > /**
> > > > @@ -1028,7 +1030,7 @@
> > > > */
> > > > public void setPackage( String projectPackage )
> > > > {
> > > > - this.projectPackage = projectPackage;
> > > > + this.projectPackage = StringTool.trim(projectPackage);
> > > > }
> > > >
> > > > /**
> > > > @@ -1049,7 +1051,7 @@
> > > > */
> > > > public void setInceptionYear( String inceptionYear )
> > > > {
> > > > - this.inceptionYear = inceptionYear;
> > > > + this.inceptionYear = StringTool.trim(inceptionYear);
> > > > }
> > > >
> > > > /**
> > > > @@ -1069,7 +1071,7 @@
> > > > */
> > > > public void setPomVersion( String pomVersion )
> > > > {
> > > > - this.pomVersion = pomVersion;
> > > > + this.pomVersion = StringTool.trim(pomVersion);
> > > > }
> > > >
> > > > /**
> > > > @@ -1191,7 +1193,7 @@
> > > > */
> > > > public void setLogo( String logo )
> > > > {
> > > > - this.logo = logo;
> > > > + this.logo = StringTool.trim(logo);
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.16 +5 -4
> > > > maven/src/java/org/apache/maven/project/Repository.java
> > > >
> > > > Index: Repository.java
> > > >
===================================================================
> > > > RCS file:
> > > >
/home/cvs/maven/src/java/org/apache/maven/project/Repository.java,v
> > > > retrieving revision 1.15
> > > > retrieving revision 1.16
> > > > diff -u -r1.15 -r1.16
> > > > --- Repository.java 19 Aug 2003 04:29:25 -0000 1.15
> > > > +++ Repository.java 5 Sep 2003 15:28:42 -0000 1.16
> > > > @@ -60,6 +60,7 @@
> > > > import java.util.List;
> > > >
> > > > import org.apache.maven.util.EnhancedStringTokenizer;
> > > > +import org.apache.maven.util.StringTool;
> > > >
> > > > /**
> > > > * NOTE: This is very CVS specific, but I would like to try
> > > additional
> > > > SCM
> > > > @@ -91,7 +92,7 @@
> > > > */
> > > > public void setConnection( String connection )
> > > > {
> > > > - this.connection = connection;
> > > > + this.connection = StringTool.trim(connection);
> > > > }
> > > >
> > > > /**
> > > > @@ -101,7 +102,7 @@
> > > > */
> > > > public void setDeveloperConnection( String
developerConnection
> > > )
> > > > {
> > > > - this.developerConnection = developerConnection;
> > > > + this.developerConnection =
> > > > StringTool.trim(developerConnection);
> > > > }
> > > >
> > > > /**
> > > > @@ -131,7 +132,7 @@
> > > > */
> > > > public void setUrl( String url )
> > > > {
> > > > - this.url = url;
> > > > + this.url = StringTool.trim(url);
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.12 +5 -4
> > > > maven/src/java/org/apache/maven/project/Resource.java
> > > >
> > > > Index: Resource.java
> > > >
===================================================================
> > > > RCS file:
> > > > /home/cvs/maven/src/java/org/apache/maven/project/Resource.java,v
> > > > retrieving revision 1.11
> > > > retrieving revision 1.12
> > > > diff -u -r1.11 -r1.12
> > > > --- Resource.java 19 Aug 2003 04:29:25 -0000 1.11
> > > > +++ Resource.java 5 Sep 2003 15:28:42 -0000 1.12
> > > > @@ -57,6 +57,7 @@
> > > > */
> > > >
> > > > import org.apache.maven.MavenUtils;
> > > > +import org.apache.maven.util.StringTool;
> > > >
> > > > import java.util.ArrayList;
> > > > import java.util.List;
> > > > @@ -95,7 +96,7 @@
> > > > */
> > > > public void addInclude( String pattern )
> > > > {
> > > > - this.includes.add( pattern );
> > > > + this.includes.add( StringTool.trim(pattern) );
> > > > }
> > > >
> > > > /**
> > > > @@ -105,7 +106,7 @@
> > > > */
> > > > public void addExclude( String pattern )
> > > > {
> > > > - this.excludes.add( pattern );
> > > > + this.excludes.add( StringTool.trim(pattern) );
> > > > }
> > > >
> > > > /**
> > > > @@ -135,7 +136,7 @@
> > > > */
> > > > public void setDirectory( String dir )
> > > > {
> > > > - this.dir = dir;
> > > > + this.dir = StringTool.trim(dir);
> > > > }
> > > >
> > > > /**
> > > > @@ -155,7 +156,7 @@
> > > > */
> > > > public void setTargetPath( String targetPath )
> > > > {
> > > > - this.targetPath = targetPath;
> > > > + this.targetPath = StringTool.trim(targetPath);
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.9 +5 -3
> > > > maven/src/java/org/apache/maven/project/SourceModification.java
> > > >
> > > > Index: SourceModification.java
> > > >
===================================================================
> > > > RCS file:
> > > >
> > >
/home/cvs/maven/src/java/org/apache/maven/project/SourceModification.jav
> > > a,
> > > > v
> > > > retrieving revision 1.8
> > > > retrieving revision 1.9
> > > > diff -u -r1.8 -r1.9
> > > > --- SourceModification.java 12 Apr 2003 00:02:03 -0000 1.8
> > > > +++ SourceModification.java 5 Sep 2003 15:28:42 -0000 1.9
> > > > @@ -56,6 +56,8 @@
> > > > *
> > > ====================================================================
> > > > */
> > > >
> > > > +import org.apache.maven.util.StringTool;
> > > > +
> > > > /**
> > > > * A source modification is made when a given class or property
is
> > > > present
> > > > * during a build. Currently with the way Maven works an
exclusion
> > > is
> > > > the only thing
> > > > @@ -88,7 +90,7 @@
> > > > */
> > > > public void setClassName( String className )
> > > > {
> > > > - this.className = className;
> > > > + this.className = StringTool.trim(className);
> > > > }
> > > >
> > > > /**
> > > > @@ -108,7 +110,7 @@
> > > > */
> > > > public void setProperty( String property )
> > > > {
> > > > - this.property = property;
> > > > + this.property = StringTool.trim(property);
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.6 +4 -2
> > > > maven/src/java/org/apache/maven/project/Version.java
> > > >
> > > > Index: Version.java
> > > >
===================================================================
> > > > RCS file:
> > > > /home/cvs/maven/src/java/org/apache/maven/project/Version.java,v
> > > > retrieving revision 1.5
> > > > retrieving revision 1.6
> > > > diff -u -r1.5 -r1.6
> > > > --- Version.java 12 Apr 2003 00:02:03 -0000 1.5
> > > > +++ Version.java 5 Sep 2003 15:28:42 -0000 1.6
> > > > @@ -56,6 +56,8 @@
> > > > *
> > > ====================================================================
> > > > */
> > > >
> > > > +import org.apache.maven.util.StringTool;
> > > > +
> > > > /**
> > > > * @author <a href="mailto:jvanzyl@apache.org">Jason van
Zyl</a>
> > > > * @version $Id$
> > > > @@ -83,7 +85,7 @@
> > > > */
> > > > public void setTag( String tag )
> > > > {
> > > > - this.tag = tag;
> > > > + this.tag = StringTool.trim(tag);
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.3 +17 -1
> > > > maven/src/java/org/apache/maven/util/StringTool.java
> > > >
> > > > Index: StringTool.java
> > > >
===================================================================
> > > > RCS file:
> > > > /home/cvs/maven/src/java/org/apache/maven/util/StringTool.java,v
> > > > retrieving revision 1.2
> > > > retrieving revision 1.3
> > > > diff -u -r1.2 -r1.3
> > > > --- StringTool.java 19 Aug 2003 04:31:38 -0000 1.2
> > > > +++ StringTool.java 5 Sep 2003 15:28:42 -0000 1.3
> > > > @@ -59,6 +59,8 @@
> > > > import java.util.Arrays;
> > > > import java.util.List;
> > > >
> > > > +import org.apache.commons.lang.StringUtils;
> > > > +
> > > > /**
> > > > * @author <a href="mailto:bwalding@jakarta.org">Ben
Walding</a>
> > > > * @version $Id$
> > > > @@ -95,5 +97,19 @@
> > > > String[] result = { s.substring(0, index),
> > > > s.substring(index + 1)};
> > > > return Arrays.asList(result);
> > > > }
> > > > + }
> > > > +
> > > > + /**
> > > > + * <p>Removes all whitespace characters from the start and
end
> > > of a
> > > > String.</p>
> > > > + *
> > > > + * <p>This is similar to {@link #trim(String)} but removes
> > > > whitespace.
> > > > + * Whitespace is defined by {@link
> > > > Character#isWhitespace(char)}.</p>
> > > > + *
> > > > + * @param str the String to remove characters from, may be
null
> > > > + * @return the trimmed String, <code>null</code> if null
String
> > > > input
> > > > + */
> > > > + public static String trim(String s)
> > > > + {
> > > > + return StringUtils.strip(s);
> > > > }
> > > > }
> > > >
> > > >
> > > >
> > > > 1.5 +2 -2
> > > > maven/src/test/java/org/apache/maven/project/BaseObjectTest.java
> > > >
> > > > Index: BaseObjectTest.java
> > > >
===================================================================
> > > > RCS file:
> > > >
> > >
/home/cvs/maven/src/test/java/org/apache/maven/project/BaseObjectTest.ja
> > > va
> > > > ,v
> > > > retrieving revision 1.4
> > > > retrieving revision 1.5
> > > > diff -u -r1.4 -r1.5
> > > > --- BaseObjectTest.java 26 Aug 2003 09:52:08 -0000 1.4
> > > > +++ BaseObjectTest.java 5 Sep 2003 15:28:42 -0000 1.5
> > > > @@ -55,7 +55,7 @@
> > > > public void testSetGetName() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setName getName
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -68,7 +68,7 @@
> > > > public void testSetGetId() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setId getId
> > > > - java.lang.String[] tests = {" ", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", "\n"};
> > > > + java.lang.String[] tests = {"a", "A", "ä", "ß",
> > > "0123456789",
> > > > "012345678901234567890"};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > >
> > > >
> > > >
> > > > 1.5 +1 -1
> > > > maven/src/test/java/org/apache/maven/project/BuildTest.java
> > > >
> > > > Index: BuildTest.java
> > > >
===================================================================
> > > > RCS file:
> > > >
> > >
/home/cvs/maven/src/test/java/org/apache/maven/project/BuildTest.java,v
> > > > retrieving revision 1.4
> > > > retrieving revision 1.5
> > > > diff -u -r1.4 -r1.5
> > > > --- BuildTest.java 21 Aug 2003 22:48:43 -0000 1.4
> > > > +++ BuildTest.java 5 Sep 2003 15:28:42 -0000 1.5
> > > > @@ -85,7 +85,7 @@
> > > > public void testSetGetNagEmailAddress() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setNagEmailAddress
> > > > getNagEmailAddress
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > >
> > > >
> > > >
> > > > 1.3 +1 -1
> > > > maven/src/test/java/org/apache/maven/project/ContributorTest.java
> > > >
> > > > Index: ContributorTest.java
> > > >
===================================================================
> > > > RCS file:
> > > >
> > >
/home/cvs/maven/src/test/java/org/apache/maven/project/ContributorTest.j
> > > av
> > > > a,v
> > > > retrieving revision 1.2
> > > > retrieving revision 1.3
> > > > diff -u -r1.2 -r1.3
> > > > --- ContributorTest.java 5 Dec 2002 15:55:35 -0000 1.2
> > > > +++ ContributorTest.java 5 Sep 2003 15:28:42 -0000 1.3
> > > > @@ -55,7 +55,7 @@
> > > > public void testSetGetEmail() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setEmail getEmail
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "?",
"?",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "?", "?",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > >
> > > >
> > > >
> > > > 1.7 +4 -4
> > > > maven/src/test/java/org/apache/maven/project/DependencyTest.java
> > > >
> > > > Index: DependencyTest.java
> > > >
===================================================================
> > > > RCS file:
> > > >
> > >
/home/cvs/maven/src/test/java/org/apache/maven/project/DependencyTest.ja
> > > va
> > > > ,v
> > > > retrieving revision 1.6
> > > > retrieving revision 1.7
> > > > diff -u -r1.6 -r1.7
> > > > --- DependencyTest.java 19 Aug 2003 04:45:37 -0000 1.6
> > > > +++ DependencyTest.java 5 Sep 2003 15:28:42 -0000 1.7
> > > > @@ -67,7 +67,7 @@
> > > > public void testSetGetGroupId() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setGroupId getGroupId
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -101,7 +101,7 @@
> > > > public void testSetGetVersion() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setVersion getVersion
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -114,7 +114,7 @@
> > > > public void testSetGetUrl() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setUrl getUrl
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -127,7 +127,7 @@
> > > > public void testSetGetType() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setType getType
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > >
> > > >
> > > >
> > > > 1.5 +16 -16
> > > > maven/src/test/java/org/apache/maven/project/ProjectTest.java
> > > >
> > > > Index: ProjectTest.java
> > > >
===================================================================
> > > > RCS file:
> > > >
> > >
/home/cvs/maven/src/test/java/org/apache/maven/project/ProjectTest.java,
> > > v
> > > > retrieving revision 1.4
> > > > retrieving revision 1.5
> > > > diff -u -r1.4 -r1.5
> > > > --- ProjectTest.java 18 Jan 2003 02:48:29 -0000 1.4
> > > > +++ ProjectTest.java 5 Sep 2003 15:28:42 -0000 1.5
> > > > @@ -68,7 +68,7 @@
> > > > public void testSetGetExtend() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setExtend getExtend
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -81,7 +81,7 @@
> > > > public void testSetGetGumpRepositoryId() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setGumpRepositoryId
> > > > getGumpRepositoryId
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -94,7 +94,7 @@
> > > > public void testSetGetShortDescription() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setShortDescription
> > > > getShortDescription
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -107,7 +107,7 @@
> > > > public void testSetGetGroupId() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setGroupId getGroupId
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n"};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890"};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -120,7 +120,7 @@
> > > > public void testSetGetSiteAddress() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setSiteAddress
getSiteAddress
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -133,7 +133,7 @@
> > > > public void testSetGetSiteDirectory() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setSiteDirectory
> > > getSiteDirectory
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -146,7 +146,7 @@
> > > > public void testSetGetDistributionSite() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setDistributionSite
> > > > getDistributionSite
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -159,7 +159,7 @@
> > > > public void testSetGetDistributionDirectory() throws
Exception
> > > > {
> > > > // JUnitDoclet begin method setDistributionDirectory
> > > > getDistributionDirectory
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -298,7 +298,7 @@
> > > > public void testSetGetUrl() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setUrl getUrl
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -311,7 +311,7 @@
> > > > public void testSetGetIssueTrackingUrl() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setIssueTrackingUrl
> > > > getIssueTrackingUrl
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -324,7 +324,7 @@
> > > > public void testSetGetDescription() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setDescription
getDescription
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -343,7 +343,7 @@
> > > > public void testSetGetCurrentVersion() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setCurrentVersion
> > > getCurrentVersion
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -369,7 +369,7 @@
> > > > public void testSetGetPackage() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setPackage getPackage
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -382,7 +382,7 @@
> > > > public void testSetGetInceptionYear() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setInceptionYear
> > > getInceptionYear
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -395,7 +395,7 @@
> > > > public void testSetGetPomVersion() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setPomVersion getPomVersion
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n"};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890"};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -451,7 +451,7 @@
> > > > public void testSetGetLogo() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setLogo getLogo
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > >
> > > >
> > > >
> > > > 1.2 +1 -1
> > > > maven/src/test/java/org/apache/maven/project/ResourceTest.java
> > > >
> > > > Index: ResourceTest.java
> > > >
===================================================================
> > > > RCS file:
> > > >
> > >
/home/cvs/maven/src/test/java/org/apache/maven/project/ResourceTest.java
> > > ,v
> > > > retrieving revision 1.1
> > > > retrieving revision 1.2
> > > > diff -u -r1.1 -r1.2
> > > > --- ResourceTest.java 26 Nov 2002 23:38:54 -0000 1.1
> > > > +++ ResourceTest.java 5 Sep 2003 15:28:42 -0000 1.2
> > > > @@ -79,7 +79,7 @@
> > > > public void testSetGetDirectory() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setDirectory getDirectory
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > >
> > > >
> > > >
> > > > 1.2 +2 -2
> > > >
> > >
maven/src/test/java/org/apache/maven/project/SourceModificationTest.java
> > > >
> > > > Index: SourceModificationTest.java
> > > >
===================================================================
> > > > RCS file:
> > > >
> > >
/home/cvs/maven/src/test/java/org/apache/maven/project/SourceModificatio
> > > nT
> > > > est.java,v
> > > > retrieving revision 1.1
> > > > retrieving revision 1.2
> > > > diff -u -r1.1 -r1.2
> > > > --- SourceModificationTest.java 26 Nov 2002 23:39:01 -0000
> > > 1.1
> > > > +++ SourceModificationTest.java 5 Sep 2003 15:28:42 -0000
> > > 1.2
> > > > @@ -55,7 +55,7 @@
> > > > public void testSetGetClassName() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setClassName getClassName
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -68,7 +68,7 @@
> > > > public void testSetGetProperty() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setProperty getProperty
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > >
> > > >
> > > >
> > > > 1.2 +1 -1
> > > > maven/src/test/java/org/apache/maven/project/VersionTest.java
> > > >
> > > > Index: VersionTest.java
> > > >
===================================================================
> > > > RCS file:
> > > >
> > >
/home/cvs/maven/src/test/java/org/apache/maven/project/VersionTest.java,
> > > v
> > > > retrieving revision 1.1
> > > > retrieving revision 1.2
> > > > diff -u -r1.1 -r1.2
> > > > --- VersionTest.java 26 Nov 2002 23:39:17 -0000 1.1
> > > > +++ VersionTest.java 5 Sep 2003 15:28:42 -0000 1.2
> > > > @@ -55,7 +55,7 @@
> > > > public void testSetGetTag() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setTag getTag
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > >
> > > >
> > > >
> > > >
> > > >
---------------------------------------------------------------------
> > > > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > > > For additional commands, e-mail: dev-help@maven.apache.org
> > >
> > >
> > >
> > >
---------------------------------------------------------------------
> > > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > > For additional commands, e-mail: dev-help@maven.apache.org
> > --
> > jvz.
> >
> > Jason van Zyl
> > jason@zenplex.com
> > http://tambora.zenplex.org
> >
> > In short, man creates for himself a new religion of a rational
> > and technical order to justify his work and to be justified in it.
> >
> > -- Jacques Ellul, The Technological Society
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > For additional commands, e-mail: dev-help@maven.apache.org
> >
> > _____________________________________________________________________
> > Envie de discuter en "live" avec vos amis ? Télécharger MSN Messenger
> > http://www.ifrance.com/_reloc/m la 1ère messagerie instantanée de
France
>
> _____________________________________________________________________
> Envie de discuter en "live" avec vos amis ? Télécharger MSN Messenger
> http://www.ifrance.com/_reloc/m la 1ère messagerie instantanée de France
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
_____________________________________________________________________
Envie de discuter en "live" avec vos amis ? Télécharger MSN Messenger
http://www.ifrance.com/_reloc/m la 1ère messagerie instantanée de France
_____________________________________________________________________
Envie de discuter en "live" avec vos amis ? Télécharger MSN Messenger
http://www.ifrance.com/_reloc/m la 1ère messagerie instantanée de France
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: cvs commit: maven/src/test/java/org/apache/maven/projectBaseObjectTest.java
BuildTest.java ContributorTest.java DependencyTest.javaProjectTest.java
ResourceTest.java SourceModificationTest.javaVersionTest.java
Posted by di...@multitask.com.au.
Yep, as a short term idea, it's one that works and is easily revertable.
It's lots better than leaving the bug unfixed :-)
--
dIon Gillard, Multitask Consulting
Blog: http://blogs.codehaus.org/people/dion/
"Emmanuel Venisse" <ev...@ifrance.com> wrote on 06/09/2003 05:37:51 PM:
>
> ----- Original Message -----
> From: "Jason van Zyl" <jv...@maven.org>
> To: "Maven Developers List" <de...@maven.apache.org>
> Sent: Friday, September 05, 2003 7:41 PM
> Subject: RE: cvs commit:
> maven/src/test/java/org/apache/maven/projectBaseObjectTest.java
> BuildTest.java ContributorTest.java DependencyTest.javaProjectTest.java
> ResourceTest.java SourceModificationTest.javaVersionTest.java
>
>
> > On Fri, 2003-09-05 at 12:41, Vincent Massol wrote:
> > > Emmanuel,
> > >
> > > At first, I thought you would have been better using
javax.xml.parsers.
> > > DocumentBuilderFactory.setIgnoringElementContentWhitespace(true).
> > > However, according to the javadoc, that works only if you validate
the
> > > XML when you parse it.
> > >
> > > Does anyone know if there's any other solution at the parsing level
> > > rather than doing it in our business logic? I'm a bit wary of doing
it
> > > in our business classes.
> >
> > It is a very bad idea. There is probably a way using either betwixt or
> > digester.
> >
> I'm ok with you but it's a temporary solution. If you know how to
resolve
> this I revert my modifications. I have no time this weekend for search
an
> other solution.
>
> > > Thanks
> > > -Vincent
> > >
> > > > -----Original Message-----
> > > > From: evenisse@apache.org [mailto:evenisse@apache.org]
> > > > Sent: 05 September 2003 17:29
> > > > To: maven-cvs@apache.org
> > > > Subject: cvs commit: maven/src/test/java/org/apache/maven/project
> > > > BaseObjectTest.java BuildTest.java ContributorTest.java
> > > > DependencyTest.java ProjectTest.java ResourceTest.java
> > > > SourceModificationTest.java VersionTest.java
> > > >
> > > > evenisse 2003/09/05 08:28:42
> > > >
> > > > Modified: src/java/org/apache/maven/project BaseObject.java
> > > > Branch.java Build.java Contributor.java
> > > > Dependency.java Project.java
Repository.java
> > > > Resource.java SourceModification.java
> > > Version.java
> > > > src/java/org/apache/maven/util StringTool.java
> > > > src/test/java/org/apache/maven/project
> > > BaseObjectTest.java
> > > > BuildTest.java ContributorTest.java
> > > > DependencyTest.java ProjectTest.java
> > > > ResourceTest.java
SourceModificationTest.java
> > > > VersionTest.java
> > > > Log:
> > > > Trims all necessary strings from pom.
> > > >
> > > > Now, we can write entries in pom like this :
> > > >
> > > > <report>maven-jdepend-plugin</report>
> > > >
> > > > or
> > > >
> > > > <report>
> > > > maven-jdepend-plugin
> > > > </report>
> > > >
> > > > Revision Changes Path
> > > > 1.28 +5 -3
> > > > maven/src/java/org/apache/maven/project/BaseObject.java
> > > >
> > > > Index: BaseObject.java
> > > >
===================================================================
> > > > RCS file:
> > > >
/home/cvs/maven/src/java/org/apache/maven/project/BaseObject.java,v
> > > > retrieving revision 1.27
> > > > retrieving revision 1.28
> > > > diff -u -r1.27 -r1.28
> > > > --- BaseObject.java 26 Aug 2003 09:52:08 -0000 1.27
> > > > +++ BaseObject.java 5 Sep 2003 15:28:41 -0000 1.28
> > > > @@ -58,6 +58,8 @@
> > > >
> > > > import org.apache.commons.lang.StringUtils;
> > > >
> > > > +import org.apache.maven.util.StringTool;
> > > > +
> > > > import java.util.ArrayList;
> > > > import java.util.HashMap;
> > > > import java.util.Iterator;
> > > > @@ -104,7 +106,7 @@
> > > > */
> > > > public void setName( String name )
> > > > {
> > > > - this.name = name;
> > > > + this.name = StringTool.trim(name);
> > > > }
> > > >
> > > > /**
> > > > @@ -124,7 +126,7 @@
> > > > */
> > > > public void setId( String id )
> > > > {
> > > > - this.id = id;
> > > > + this.id = StringTool.trim(id);
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.5 +4 -2
> > > maven/src/java/org/apache/maven/project/Branch.java
> > > >
> > > > Index: Branch.java
> > > >
===================================================================
> > > > RCS file:
> > > > /home/cvs/maven/src/java/org/apache/maven/project/Branch.java,v
> > > > retrieving revision 1.4
> > > > retrieving revision 1.5
> > > > diff -u -r1.4 -r1.5
> > > > --- Branch.java 19 Aug 2003 04:29:25 -0000 1.4
> > > > +++ Branch.java 5 Sep 2003 15:28:41 -0000 1.5
> > > > @@ -56,6 +56,8 @@
> > > > *
> > > ====================================================================
> > > > */
> > > >
> > > > +import org.apache.maven.util.StringTool;
> > > > +
> > > > /**
> > > > * @author <a href="mailto:evenisse@ifrance.com">Emmanuel
> > > Venisse</a>
> > > > * @version $Id$
> > > > @@ -83,7 +85,7 @@
> > > > */
> > > > public void setTag( String tag )
> > > > {
> > > > - this.tag = tag;
> > > > + this.tag = StringTool.trim(tag);
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.24 +7 -6
> > > maven/src/java/org/apache/maven/project/Build.java
> > > >
> > > > Index: Build.java
> > > >
===================================================================
> > > > RCS file:
> > > /home/cvs/maven/src/java/org/apache/maven/project/Build.java,v
> > > > retrieving revision 1.23
> > > > retrieving revision 1.24
> > > > diff -u -r1.23 -r1.24
> > > > --- Build.java 19 Aug 2003 04:29:25 -0000 1.23
> > > > +++ Build.java 5 Sep 2003 15:28:41 -0000 1.24
> > > > @@ -57,6 +57,7 @@
> > > > */
> > > >
> > > > import org.apache.maven.MavenUtils;
> > > > +import org.apache.maven.util.StringTool;
> > > >
> > > > import java.util.ArrayList;
> > > > import java.util.List;
> > > > @@ -135,7 +136,7 @@
> > > > */
> > > > public void setIntegrationUnitTestSourceDirectory( String
> > > > utDirectory )
> > > > {
> > > > - this.integrationUnitTestSourceDirectory = utDirectory;
> > > > + this.integrationUnitTestSourceDirectory =
> > > > StringTool.trim(utDirectory);
> > > > }
> > > >
> > > > /**
> > > > @@ -155,7 +156,7 @@
> > > > */
> > > > public void setUnitTestSourceDirectory( String utDirectory
)
> > > > {
> > > > - this.unitTestSourceDirectory = utDirectory;
> > > > + this.unitTestSourceDirectory =
> > > StringTool.trim(utDirectory);
> > > > }
> > > >
> > > > /**
> > > > @@ -195,7 +196,7 @@
> > > > */
> > > > public void setSourceDirectory( String sourceDirectory )
> > > > {
> > > > - this.sourceDirectory = sourceDirectory;
> > > > + this.sourceDirectory =
StringTool.trim(sourceDirectory);
> > > > }
> > > >
> > > > /**
> > > > @@ -215,7 +216,7 @@
> > > > */
> > > > public void setAspectSourceDirectory( String
> > > aspectSourceDirectory
> > > > )
> > > > {
> > > > - this.aspectSourceDirectory = aspectSourceDirectory;
> > > > + this.aspectSourceDirectory =
> > > > StringTool.trim(aspectSourceDirectory);
> > > > }
> > > >
> > > > /**
> > > > @@ -235,7 +236,7 @@
> > > > */
> > > > public void setNagEmailAddress( String nagEmailAddress )
> > > > {
> > > > - this.nagEmailAddress = nagEmailAddress;
> > > > + this.nagEmailAddress =
StringTool.trim(nagEmailAddress);
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.8 +4 -2
> > > > maven/src/java/org/apache/maven/project/Contributor.java
> > > >
> > > > Index: Contributor.java
> > > >
===================================================================
> > > > RCS file:
> > > >
/home/cvs/maven/src/java/org/apache/maven/project/Contributor.java,v
> > > > retrieving revision 1.7
> > > > retrieving revision 1.8
> > > > diff -u -r1.7 -r1.8
> > > > --- Contributor.java 12 Apr 2003 00:26:26 -0000 1.7
> > > > +++ Contributor.java 5 Sep 2003 15:28:41 -0000 1.8
> > > > @@ -56,6 +56,8 @@
> > > > *
> > > ====================================================================
> > > > */
> > > >
> > > > +import org.apache.maven.util.StringTool;
> > > > +
> > > > import java.util.SortedSet;
> > > > import java.util.TreeSet;
> > > >
> > > > @@ -112,7 +114,7 @@
> > > > */
> > > > public void setEmail( String email )
> > > > {
> > > > - this.email = email;
> > > > + this.email = StringTool.trim(email);
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.40 +10 -8
> > > > maven/src/java/org/apache/maven/project/Dependency.java
> > > >
> > > > Index: Dependency.java
> > > >
===================================================================
> > > > RCS file:
> > > >
/home/cvs/maven/src/java/org/apache/maven/project/Dependency.java,v
> > > > retrieving revision 1.39
> > > > retrieving revision 1.40
> > > > diff -u -r1.39 -r1.40
> > > > --- Dependency.java 27 Aug 2003 16:28:02 -0000 1.39
> > > > +++ Dependency.java 5 Sep 2003 15:28:41 -0000 1.40
> > > > @@ -56,6 +56,8 @@
> > > > *
> > > ====================================================================
> > > > */
> > > >
> > > > +import org.apache.maven.util.StringTool;
> > > > +
> > > > /**
> > > > * @author <a href="mailto:jvanzyl@apache.org">Jason van
Zyl</a>
> > > > * @author <a href="mailto:vmassol@apache.org">Vincent
Massol</a>
> > > > @@ -158,7 +160,7 @@
> > > > */
> > > > public void setGroupId( String groupId )
> > > > {
> > > > - this.groupId = groupId;
> > > > + this.groupId = StringTool.trim(groupId);
> > > > }
> > > >
> > > > /**
> > > > @@ -204,7 +206,7 @@
> > > > */
> > > > public void setArtifactId( String artifactId )
> > > > {
> > > > - this.artifactId = artifactId;
> > > > + this.artifactId = StringTool.trim(artifactId);
> > > > }
> > > >
> > > > /**
> > > > @@ -233,7 +235,7 @@
> > > > */
> > > > public void setVersion( String version )
> > > > {
> > > > - this.version = version;
> > > > + this.version = StringTool.trim(version);
> > > > }
> > > >
> > > > /**
> > > > @@ -257,12 +259,12 @@
> > > > // This is a check we need because of the jelly
> > > interpolation
> > > > // process. If we don't check an empty string will be
set
> > > and
> > > > // screw up getArtifact() above.
> > > > - if ( jar.trim().length() == 0 )
> > > > + if ( StringTool.trim(jar).length() == 0 )
> > > > {
> > > > return;
> > > > }
> > > >
> > > > - this.jar = jar;
> > > > + this.jar = StringTool.trim(jar);
> > > > }
> > > >
> > > > /**
> > > > @@ -283,7 +285,7 @@
> > > > */
> > > > public void setUrl( String url )
> > > > {
> > > > - this.url = url;
> > > > + this.url = StringTool.trim(url);
> > > > }
> > > >
> > > > /**
> > > > @@ -332,7 +334,7 @@
> > > > */
> > > > public void setType( String type )
> > > > {
> > > > - this.type = ArtifactType.findType(type);
> > > > + this.type =
ArtifactType.findType(StringTool.trim(type));
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.91 +21 -19
> > > > maven/src/java/org/apache/maven/project/Project.java
> > > >
> > > > Index: Project.java
> > > >
===================================================================
> > > > RCS file:
> > > > /home/cvs/maven/src/java/org/apache/maven/project/Project.java,v
> > > > retrieving revision 1.90
> > > > retrieving revision 1.91
> > > > diff -u -r1.90 -r1.91
> > > > --- Project.java 2 Sep 2003 10:46:28 -0000 1.90
> > > > +++ Project.java 5 Sep 2003 15:28:41 -0000 1.91
> > > > @@ -69,6 +69,7 @@
> > > > import org.apache.maven.verifier.ChecksumVerificationException;
> > > > import org.apache.maven.jelly.MavenJellyContext;
> > > > import org.apache.maven.jelly.JellyUtils;
> > > > +import org.apache.maven.util.StringTool;
> > > > import org.apache.tools.ant.types.Path;
> > > > import org.apache.commons.grant.GrantProject;
> > > > import org.apache.commons.logging.Log;
> > > > @@ -293,7 +294,7 @@
> > > > */
> > > > public void setArtifactId( String artifactId )
> > > > {
> > > > - this.artifactId = artifactId;
> > > > + this.artifactId = StringTool.trim(artifactId);
> > > > }
> > > >
> > > > /**
> > > > @@ -313,7 +314,7 @@
> > > > */
> > > > public void setGroupId( String groupId )
> > > > {
> > > > - this.groupId = groupId;
> > > > + this.groupId = StringTool.trim(groupId);
> > > > }
> > > >
> > > > /**
> > > > @@ -437,7 +438,7 @@
> > > > */
> > > > public void setExtend( String pomToExtend )
> > > > {
> > > > - this.pomToExtend = pomToExtend;
> > > > + this.pomToExtend = StringTool.trim(pomToExtend);
> > > > }
> > > >
> > > > /**
> > > > @@ -487,7 +488,7 @@
> > > > */
> > > > public void setGumpRepositoryId( String gumpRepositoryId )
> > > > {
> > > > - this.gumpRepositoryId = gumpRepositoryId;
> > > > + this.gumpRepositoryId =
StringTool.trim(gumpRepositoryId);
> > > > }
> > > >
> > > > /**
> > > > @@ -541,7 +542,7 @@
> > > > */
> > > > public void setSiteAddress( String siteAddress )
> > > > {
> > > > - this.siteAddress = siteAddress;
> > > > + this.siteAddress = StringTool.trim(siteAddress);
> > > > }
> > > >
> > > > /**
> > > > @@ -560,11 +561,11 @@
> > > > *
> > > > * @param siteDirectory the directory on the web server
where
> > > the
> > > > public
> > > > * web site for this project resides
> > > > - * (ex: "/www/jakarta.apache.org/turbine/maven/")
> > > > + * (ex: "/www/maven.apache.org/")
> > > > */
> > > > public void setSiteDirectory( String siteDirectory )
> > > > {
> > > > - this.siteDirectory = siteDirectory;
> > > > + this.siteDirectory = StringTool.trim(siteDirectory);
> > > > }
> > > >
> > > > /**
> > > > @@ -585,7 +586,7 @@
> > > > */
> > > > public void setDistributionSite( String distributionSite )
> > > > {
> > > > - this.distributionSite = distributionSite;
> > > > + this.distributionSite =
StringTool.trim(distributionSite);
> > > > }
> > > >
> > > > /**
> > > > @@ -607,7 +608,7 @@
> > > > */
> > > > public void setDistributionDirectory( String
> > > distributionDirectory
> > > > )
> > > > {
> > > > - this.distributionDirectory = distributionDirectory;
> > > > + this.distributionDirectory =
> > > > StringTool.trim(distributionDirectory);
> > > > }
> > > >
> > > > /**
> > > > @@ -720,9 +721,10 @@
> > > > */
> > > > public void addReport( String report )
> > > > {
> > > > - if ( reports.contains( report ) == false )
> > > > + String reportName = StringTool.trim(report);
> > > > + if ( reports.contains( reportName ) == false )
> > > > {
> > > > - reports.add( report );
> > > > + reports.add( reportName );
> > > > }
> > > > }
> > > >
> > > > @@ -914,7 +916,7 @@
> > > > */
> > > > public void setUrl( String url )
> > > > {
> > > > - this.url = url;
> > > > + this.url = StringTool.trim(url);
> > > > }
> > > >
> > > > /**
> > > > @@ -934,7 +936,7 @@
> > > > */
> > > > public void setIssueTrackingUrl( String issueTrackingUrl )
> > > > {
> > > > - this.issueTrackingUrl = issueTrackingUrl;
> > > > + this.issueTrackingUrl =
StringTool.trim(issueTrackingUrl);
> > > > }
> > > >
> > > > /**
> > > > @@ -986,7 +988,7 @@
> > > > */
> > > > public void setCurrentVersion( String currentVersion )
> > > > {
> > > > - this.currentVersion = currentVersion;
> > > > + this.currentVersion = StringTool.trim(currentVersion);
> > > > }
> > > >
> > > > /**
> > > > @@ -1028,7 +1030,7 @@
> > > > */
> > > > public void setPackage( String projectPackage )
> > > > {
> > > > - this.projectPackage = projectPackage;
> > > > + this.projectPackage = StringTool.trim(projectPackage);
> > > > }
> > > >
> > > > /**
> > > > @@ -1049,7 +1051,7 @@
> > > > */
> > > > public void setInceptionYear( String inceptionYear )
> > > > {
> > > > - this.inceptionYear = inceptionYear;
> > > > + this.inceptionYear = StringTool.trim(inceptionYear);
> > > > }
> > > >
> > > > /**
> > > > @@ -1069,7 +1071,7 @@
> > > > */
> > > > public void setPomVersion( String pomVersion )
> > > > {
> > > > - this.pomVersion = pomVersion;
> > > > + this.pomVersion = StringTool.trim(pomVersion);
> > > > }
> > > >
> > > > /**
> > > > @@ -1191,7 +1193,7 @@
> > > > */
> > > > public void setLogo( String logo )
> > > > {
> > > > - this.logo = logo;
> > > > + this.logo = StringTool.trim(logo);
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.16 +5 -4
> > > > maven/src/java/org/apache/maven/project/Repository.java
> > > >
> > > > Index: Repository.java
> > > >
===================================================================
> > > > RCS file:
> > > >
/home/cvs/maven/src/java/org/apache/maven/project/Repository.java,v
> > > > retrieving revision 1.15
> > > > retrieving revision 1.16
> > > > diff -u -r1.15 -r1.16
> > > > --- Repository.java 19 Aug 2003 04:29:25 -0000 1.15
> > > > +++ Repository.java 5 Sep 2003 15:28:42 -0000 1.16
> > > > @@ -60,6 +60,7 @@
> > > > import java.util.List;
> > > >
> > > > import org.apache.maven.util.EnhancedStringTokenizer;
> > > > +import org.apache.maven.util.StringTool;
> > > >
> > > > /**
> > > > * NOTE: This is very CVS specific, but I would like to try
> > > additional
> > > > SCM
> > > > @@ -91,7 +92,7 @@
> > > > */
> > > > public void setConnection( String connection )
> > > > {
> > > > - this.connection = connection;
> > > > + this.connection = StringTool.trim(connection);
> > > > }
> > > >
> > > > /**
> > > > @@ -101,7 +102,7 @@
> > > > */
> > > > public void setDeveloperConnection( String
developerConnection
> > > )
> > > > {
> > > > - this.developerConnection = developerConnection;
> > > > + this.developerConnection =
> > > > StringTool.trim(developerConnection);
> > > > }
> > > >
> > > > /**
> > > > @@ -131,7 +132,7 @@
> > > > */
> > > > public void setUrl( String url )
> > > > {
> > > > - this.url = url;
> > > > + this.url = StringTool.trim(url);
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.12 +5 -4
> > > > maven/src/java/org/apache/maven/project/Resource.java
> > > >
> > > > Index: Resource.java
> > > >
===================================================================
> > > > RCS file:
> > > > /home/cvs/maven/src/java/org/apache/maven/project/Resource.java,v
> > > > retrieving revision 1.11
> > > > retrieving revision 1.12
> > > > diff -u -r1.11 -r1.12
> > > > --- Resource.java 19 Aug 2003 04:29:25 -0000 1.11
> > > > +++ Resource.java 5 Sep 2003 15:28:42 -0000 1.12
> > > > @@ -57,6 +57,7 @@
> > > > */
> > > >
> > > > import org.apache.maven.MavenUtils;
> > > > +import org.apache.maven.util.StringTool;
> > > >
> > > > import java.util.ArrayList;
> > > > import java.util.List;
> > > > @@ -95,7 +96,7 @@
> > > > */
> > > > public void addInclude( String pattern )
> > > > {
> > > > - this.includes.add( pattern );
> > > > + this.includes.add( StringTool.trim(pattern) );
> > > > }
> > > >
> > > > /**
> > > > @@ -105,7 +106,7 @@
> > > > */
> > > > public void addExclude( String pattern )
> > > > {
> > > > - this.excludes.add( pattern );
> > > > + this.excludes.add( StringTool.trim(pattern) );
> > > > }
> > > >
> > > > /**
> > > > @@ -135,7 +136,7 @@
> > > > */
> > > > public void setDirectory( String dir )
> > > > {
> > > > - this.dir = dir;
> > > > + this.dir = StringTool.trim(dir);
> > > > }
> > > >
> > > > /**
> > > > @@ -155,7 +156,7 @@
> > > > */
> > > > public void setTargetPath( String targetPath )
> > > > {
> > > > - this.targetPath = targetPath;
> > > > + this.targetPath = StringTool.trim(targetPath);
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.9 +5 -3
> > > > maven/src/java/org/apache/maven/project/SourceModification.java
> > > >
> > > > Index: SourceModification.java
> > > >
===================================================================
> > > > RCS file:
> > > >
> > >
/home/cvs/maven/src/java/org/apache/maven/project/SourceModification.jav
> > > a,
> > > > v
> > > > retrieving revision 1.8
> > > > retrieving revision 1.9
> > > > diff -u -r1.8 -r1.9
> > > > --- SourceModification.java 12 Apr 2003 00:02:03 -0000 1.8
> > > > +++ SourceModification.java 5 Sep 2003 15:28:42 -0000 1.9
> > > > @@ -56,6 +56,8 @@
> > > > *
> > > ====================================================================
> > > > */
> > > >
> > > > +import org.apache.maven.util.StringTool;
> > > > +
> > > > /**
> > > > * A source modification is made when a given class or property
is
> > > > present
> > > > * during a build. Currently with the way Maven works an
exclusion
> > > is
> > > > the only thing
> > > > @@ -88,7 +90,7 @@
> > > > */
> > > > public void setClassName( String className )
> > > > {
> > > > - this.className = className;
> > > > + this.className = StringTool.trim(className);
> > > > }
> > > >
> > > > /**
> > > > @@ -108,7 +110,7 @@
> > > > */
> > > > public void setProperty( String property )
> > > > {
> > > > - this.property = property;
> > > > + this.property = StringTool.trim(property);
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.6 +4 -2
> > > > maven/src/java/org/apache/maven/project/Version.java
> > > >
> > > > Index: Version.java
> > > >
===================================================================
> > > > RCS file:
> > > > /home/cvs/maven/src/java/org/apache/maven/project/Version.java,v
> > > > retrieving revision 1.5
> > > > retrieving revision 1.6
> > > > diff -u -r1.5 -r1.6
> > > > --- Version.java 12 Apr 2003 00:02:03 -0000 1.5
> > > > +++ Version.java 5 Sep 2003 15:28:42 -0000 1.6
> > > > @@ -56,6 +56,8 @@
> > > > *
> > > ====================================================================
> > > > */
> > > >
> > > > +import org.apache.maven.util.StringTool;
> > > > +
> > > > /**
> > > > * @author <a href="mailto:jvanzyl@apache.org">Jason van
Zyl</a>
> > > > * @version $Id$
> > > > @@ -83,7 +85,7 @@
> > > > */
> > > > public void setTag( String tag )
> > > > {
> > > > - this.tag = tag;
> > > > + this.tag = StringTool.trim(tag);
> > > > }
> > > >
> > > > /**
> > > >
> > > >
> > > >
> > > > 1.3 +17 -1
> > > > maven/src/java/org/apache/maven/util/StringTool.java
> > > >
> > > > Index: StringTool.java
> > > >
===================================================================
> > > > RCS file:
> > > > /home/cvs/maven/src/java/org/apache/maven/util/StringTool.java,v
> > > > retrieving revision 1.2
> > > > retrieving revision 1.3
> > > > diff -u -r1.2 -r1.3
> > > > --- StringTool.java 19 Aug 2003 04:31:38 -0000 1.2
> > > > +++ StringTool.java 5 Sep 2003 15:28:42 -0000 1.3
> > > > @@ -59,6 +59,8 @@
> > > > import java.util.Arrays;
> > > > import java.util.List;
> > > >
> > > > +import org.apache.commons.lang.StringUtils;
> > > > +
> > > > /**
> > > > * @author <a href="mailto:bwalding@jakarta.org">Ben
Walding</a>
> > > > * @version $Id$
> > > > @@ -95,5 +97,19 @@
> > > > String[] result = { s.substring(0, index),
> > > > s.substring(index + 1)};
> > > > return Arrays.asList(result);
> > > > }
> > > > + }
> > > > +
> > > > + /**
> > > > + * <p>Removes all whitespace characters from the start and
end
> > > of a
> > > > String.</p>
> > > > + *
> > > > + * <p>This is similar to {@link #trim(String)} but removes
> > > > whitespace.
> > > > + * Whitespace is defined by {@link
> > > > Character#isWhitespace(char)}.</p>
> > > > + *
> > > > + * @param str the String to remove characters from, may be
null
> > > > + * @return the trimmed String, <code>null</code> if null
String
> > > > input
> > > > + */
> > > > + public static String trim(String s)
> > > > + {
> > > > + return StringUtils.strip(s);
> > > > }
> > > > }
> > > >
> > > >
> > > >
> > > > 1.5 +2 -2
> > > > maven/src/test/java/org/apache/maven/project/BaseObjectTest.java
> > > >
> > > > Index: BaseObjectTest.java
> > > >
===================================================================
> > > > RCS file:
> > > >
> > >
/home/cvs/maven/src/test/java/org/apache/maven/project/BaseObjectTest.ja
> > > va
> > > > ,v
> > > > retrieving revision 1.4
> > > > retrieving revision 1.5
> > > > diff -u -r1.4 -r1.5
> > > > --- BaseObjectTest.java 26 Aug 2003 09:52:08 -0000 1.4
> > > > +++ BaseObjectTest.java 5 Sep 2003 15:28:42 -0000 1.5
> > > > @@ -55,7 +55,7 @@
> > > > public void testSetGetName() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setName getName
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -68,7 +68,7 @@
> > > > public void testSetGetId() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setId getId
> > > > - java.lang.String[] tests = {" ", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", "\n"};
> > > > + java.lang.String[] tests = {"a", "A", "ä", "ß",
> > > "0123456789",
> > > > "012345678901234567890"};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > >
> > > >
> > > >
> > > > 1.5 +1 -1
> > > > maven/src/test/java/org/apache/maven/project/BuildTest.java
> > > >
> > > > Index: BuildTest.java
> > > >
===================================================================
> > > > RCS file:
> > > >
> > >
/home/cvs/maven/src/test/java/org/apache/maven/project/BuildTest.java,v
> > > > retrieving revision 1.4
> > > > retrieving revision 1.5
> > > > diff -u -r1.4 -r1.5
> > > > --- BuildTest.java 21 Aug 2003 22:48:43 -0000 1.4
> > > > +++ BuildTest.java 5 Sep 2003 15:28:42 -0000 1.5
> > > > @@ -85,7 +85,7 @@
> > > > public void testSetGetNagEmailAddress() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setNagEmailAddress
> > > > getNagEmailAddress
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > >
> > > >
> > > >
> > > > 1.3 +1 -1
> > > > maven/src/test/java/org/apache/maven/project/ContributorTest.java
> > > >
> > > > Index: ContributorTest.java
> > > >
===================================================================
> > > > RCS file:
> > > >
> > >
/home/cvs/maven/src/test/java/org/apache/maven/project/ContributorTest.j
> > > av
> > > > a,v
> > > > retrieving revision 1.2
> > > > retrieving revision 1.3
> > > > diff -u -r1.2 -r1.3
> > > > --- ContributorTest.java 5 Dec 2002 15:55:35 -0000 1.2
> > > > +++ ContributorTest.java 5 Sep 2003 15:28:42 -0000 1.3
> > > > @@ -55,7 +55,7 @@
> > > > public void testSetGetEmail() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setEmail getEmail
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "?",
"?",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "?", "?",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > >
> > > >
> > > >
> > > > 1.7 +4 -4
> > > > maven/src/test/java/org/apache/maven/project/DependencyTest.java
> > > >
> > > > Index: DependencyTest.java
> > > >
===================================================================
> > > > RCS file:
> > > >
> > >
/home/cvs/maven/src/test/java/org/apache/maven/project/DependencyTest.ja
> > > va
> > > > ,v
> > > > retrieving revision 1.6
> > > > retrieving revision 1.7
> > > > diff -u -r1.6 -r1.7
> > > > --- DependencyTest.java 19 Aug 2003 04:45:37 -0000 1.6
> > > > +++ DependencyTest.java 5 Sep 2003 15:28:42 -0000 1.7
> > > > @@ -67,7 +67,7 @@
> > > > public void testSetGetGroupId() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setGroupId getGroupId
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -101,7 +101,7 @@
> > > > public void testSetGetVersion() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setVersion getVersion
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -114,7 +114,7 @@
> > > > public void testSetGetUrl() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setUrl getUrl
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -127,7 +127,7 @@
> > > > public void testSetGetType() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setType getType
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > >
> > > >
> > > >
> > > > 1.5 +16 -16
> > > > maven/src/test/java/org/apache/maven/project/ProjectTest.java
> > > >
> > > > Index: ProjectTest.java
> > > >
===================================================================
> > > > RCS file:
> > > >
> > >
/home/cvs/maven/src/test/java/org/apache/maven/project/ProjectTest.java,
> > > v
> > > > retrieving revision 1.4
> > > > retrieving revision 1.5
> > > > diff -u -r1.4 -r1.5
> > > > --- ProjectTest.java 18 Jan 2003 02:48:29 -0000 1.4
> > > > +++ ProjectTest.java 5 Sep 2003 15:28:42 -0000 1.5
> > > > @@ -68,7 +68,7 @@
> > > > public void testSetGetExtend() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setExtend getExtend
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -81,7 +81,7 @@
> > > > public void testSetGetGumpRepositoryId() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setGumpRepositoryId
> > > > getGumpRepositoryId
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -94,7 +94,7 @@
> > > > public void testSetGetShortDescription() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setShortDescription
> > > > getShortDescription
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -107,7 +107,7 @@
> > > > public void testSetGetGroupId() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setGroupId getGroupId
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n"};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890"};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -120,7 +120,7 @@
> > > > public void testSetGetSiteAddress() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setSiteAddress
getSiteAddress
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -133,7 +133,7 @@
> > > > public void testSetGetSiteDirectory() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setSiteDirectory
> > > getSiteDirectory
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -146,7 +146,7 @@
> > > > public void testSetGetDistributionSite() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setDistributionSite
> > > > getDistributionSite
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -159,7 +159,7 @@
> > > > public void testSetGetDistributionDirectory() throws
Exception
> > > > {
> > > > // JUnitDoclet begin method setDistributionDirectory
> > > > getDistributionDirectory
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -298,7 +298,7 @@
> > > > public void testSetGetUrl() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setUrl getUrl
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -311,7 +311,7 @@
> > > > public void testSetGetIssueTrackingUrl() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setIssueTrackingUrl
> > > > getIssueTrackingUrl
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -324,7 +324,7 @@
> > > > public void testSetGetDescription() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setDescription
getDescription
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -343,7 +343,7 @@
> > > > public void testSetGetCurrentVersion() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setCurrentVersion
> > > getCurrentVersion
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -369,7 +369,7 @@
> > > > public void testSetGetPackage() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setPackage getPackage
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -382,7 +382,7 @@
> > > > public void testSetGetInceptionYear() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setInceptionYear
> > > getInceptionYear
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -395,7 +395,7 @@
> > > > public void testSetGetPomVersion() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setPomVersion getPomVersion
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n"};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890"};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -451,7 +451,7 @@
> > > > public void testSetGetLogo() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setLogo getLogo
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > >
> > > >
> > > >
> > > > 1.2 +1 -1
> > > > maven/src/test/java/org/apache/maven/project/ResourceTest.java
> > > >
> > > > Index: ResourceTest.java
> > > >
===================================================================
> > > > RCS file:
> > > >
> > >
/home/cvs/maven/src/test/java/org/apache/maven/project/ResourceTest.java
> > > ,v
> > > > retrieving revision 1.1
> > > > retrieving revision 1.2
> > > > diff -u -r1.1 -r1.2
> > > > --- ResourceTest.java 26 Nov 2002 23:38:54 -0000 1.1
> > > > +++ ResourceTest.java 5 Sep 2003 15:28:42 -0000 1.2
> > > > @@ -79,7 +79,7 @@
> > > > public void testSetGetDirectory() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setDirectory getDirectory
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > >
> > > >
> > > >
> > > > 1.2 +2 -2
> > > >
> > >
maven/src/test/java/org/apache/maven/project/SourceModificationTest.java
> > > >
> > > > Index: SourceModificationTest.java
> > > >
===================================================================
> > > > RCS file:
> > > >
> > >
/home/cvs/maven/src/test/java/org/apache/maven/project/SourceModificatio
> > > nT
> > > > est.java,v
> > > > retrieving revision 1.1
> > > > retrieving revision 1.2
> > > > diff -u -r1.1 -r1.2
> > > > --- SourceModificationTest.java 26 Nov 2002 23:39:01 -0000
> > > 1.1
> > > > +++ SourceModificationTest.java 5 Sep 2003 15:28:42 -0000
> > > 1.2
> > > > @@ -55,7 +55,7 @@
> > > > public void testSetGetClassName() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setClassName getClassName
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > > @@ -68,7 +68,7 @@
> > > > public void testSetGetProperty() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setProperty getProperty
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > >
> > > >
> > > >
> > > > 1.2 +1 -1
> > > > maven/src/test/java/org/apache/maven/project/VersionTest.java
> > > >
> > > > Index: VersionTest.java
> > > >
===================================================================
> > > > RCS file:
> > > >
> > >
/home/cvs/maven/src/test/java/org/apache/maven/project/VersionTest.java,
> > > v
> > > > retrieving revision 1.1
> > > > retrieving revision 1.2
> > > > diff -u -r1.1 -r1.2
> > > > --- VersionTest.java 26 Nov 2002 23:39:17 -0000 1.1
> > > > +++ VersionTest.java 5 Sep 2003 15:28:42 -0000 1.2
> > > > @@ -55,7 +55,7 @@
> > > > public void testSetGetTag() throws Exception
> > > > {
> > > > // JUnitDoclet begin method setTag getTag
> > > > - java.lang.String[] tests = {"", " ", "a", "A", "ä",
"ß",
> > > > "0123456789", "012345678901234567890", "\n", null};
> > > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > > "0123456789", "012345678901234567890", null};
> > > >
> > > > for ( int i = 0; i < tests.length; i++ )
> > > > {
> > > >
> > > >
> > > >
> > > >
> > > >
---------------------------------------------------------------------
> > > > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > > > For additional commands, e-mail: dev-help@maven.apache.org
> > >
> > >
> > >
> > >
---------------------------------------------------------------------
> > > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > > For additional commands, e-mail: dev-help@maven.apache.org
> > --
> > jvz.
> >
> > Jason van Zyl
> > jason@zenplex.com
> > http://tambora.zenplex.org
> >
> > In short, man creates for himself a new religion of a rational
> > and technical order to justify his work and to be justified in it.
> >
> > -- Jacques Ellul, The Technological Society
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > For additional commands, e-mail: dev-help@maven.apache.org
> >
> > _____________________________________________________________________
> > Envie de discuter en "live" avec vos amis ? Télécharger MSN Messenger
> > http://www.ifrance.com/_reloc/m la 1ère messagerie instantanée de
France
>
> _____________________________________________________________________
> Envie de discuter en "live" avec vos amis ? Télécharger MSN Messenger
> http://www.ifrance.com/_reloc/m la 1ère messagerie instantanée de France
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: cvs commit: maven/src/test/java/org/apache/maven/projectBaseObjectTest.java BuildTest.java ContributorTest.java DependencyTest.javaProjectTest.java ResourceTest.java SourceModificationTest.javaVersionTest.java
Posted by Emmanuel Venisse <ev...@ifrance.com>.
----- Original Message -----
From: "Jason van Zyl" <jv...@maven.org>
To: "Maven Developers List" <de...@maven.apache.org>
Sent: Friday, September 05, 2003 7:41 PM
Subject: RE: cvs commit:
maven/src/test/java/org/apache/maven/projectBaseObjectTest.java
BuildTest.java ContributorTest.java DependencyTest.javaProjectTest.java
ResourceTest.java SourceModificationTest.javaVersionTest.java
> On Fri, 2003-09-05 at 12:41, Vincent Massol wrote:
> > Emmanuel,
> >
> > At first, I thought you would have been better using javax.xml.parsers.
> > DocumentBuilderFactory.setIgnoringElementContentWhitespace(true).
> > However, according to the javadoc, that works only if you validate the
> > XML when you parse it.
> >
> > Does anyone know if there's any other solution at the parsing level
> > rather than doing it in our business logic? I'm a bit wary of doing it
> > in our business classes.
>
> It is a very bad idea. There is probably a way using either betwixt or
> digester.
>
I'm ok with you but it's a temporary solution. If you know how to resolve
this I revert my modifications. I have no time this weekend for search an
other solution.
> > Thanks
> > -Vincent
> >
> > > -----Original Message-----
> > > From: evenisse@apache.org [mailto:evenisse@apache.org]
> > > Sent: 05 September 2003 17:29
> > > To: maven-cvs@apache.org
> > > Subject: cvs commit: maven/src/test/java/org/apache/maven/project
> > > BaseObjectTest.java BuildTest.java ContributorTest.java
> > > DependencyTest.java ProjectTest.java ResourceTest.java
> > > SourceModificationTest.java VersionTest.java
> > >
> > > evenisse 2003/09/05 08:28:42
> > >
> > > Modified: src/java/org/apache/maven/project BaseObject.java
> > > Branch.java Build.java Contributor.java
> > > Dependency.java Project.java Repository.java
> > > Resource.java SourceModification.java
> > Version.java
> > > src/java/org/apache/maven/util StringTool.java
> > > src/test/java/org/apache/maven/project
> > BaseObjectTest.java
> > > BuildTest.java ContributorTest.java
> > > DependencyTest.java ProjectTest.java
> > > ResourceTest.java SourceModificationTest.java
> > > VersionTest.java
> > > Log:
> > > Trims all necessary strings from pom.
> > >
> > > Now, we can write entries in pom like this :
> > >
> > > <report>maven-jdepend-plugin</report>
> > >
> > > or
> > >
> > > <report>
> > > maven-jdepend-plugin
> > > </report>
> > >
> > > Revision Changes Path
> > > 1.28 +5 -3
> > > maven/src/java/org/apache/maven/project/BaseObject.java
> > >
> > > Index: BaseObject.java
> > > ===================================================================
> > > RCS file:
> > > /home/cvs/maven/src/java/org/apache/maven/project/BaseObject.java,v
> > > retrieving revision 1.27
> > > retrieving revision 1.28
> > > diff -u -r1.27 -r1.28
> > > --- BaseObject.java 26 Aug 2003 09:52:08 -0000 1.27
> > > +++ BaseObject.java 5 Sep 2003 15:28:41 -0000 1.28
> > > @@ -58,6 +58,8 @@
> > >
> > > import org.apache.commons.lang.StringUtils;
> > >
> > > +import org.apache.maven.util.StringTool;
> > > +
> > > import java.util.ArrayList;
> > > import java.util.HashMap;
> > > import java.util.Iterator;
> > > @@ -104,7 +106,7 @@
> > > */
> > > public void setName( String name )
> > > {
> > > - this.name = name;
> > > + this.name = StringTool.trim(name);
> > > }
> > >
> > > /**
> > > @@ -124,7 +126,7 @@
> > > */
> > > public void setId( String id )
> > > {
> > > - this.id = id;
> > > + this.id = StringTool.trim(id);
> > > }
> > >
> > > /**
> > >
> > >
> > >
> > > 1.5 +4 -2
> > maven/src/java/org/apache/maven/project/Branch.java
> > >
> > > Index: Branch.java
> > > ===================================================================
> > > RCS file:
> > > /home/cvs/maven/src/java/org/apache/maven/project/Branch.java,v
> > > retrieving revision 1.4
> > > retrieving revision 1.5
> > > diff -u -r1.4 -r1.5
> > > --- Branch.java 19 Aug 2003 04:29:25 -0000 1.4
> > > +++ Branch.java 5 Sep 2003 15:28:41 -0000 1.5
> > > @@ -56,6 +56,8 @@
> > > *
> > ====================================================================
> > > */
> > >
> > > +import org.apache.maven.util.StringTool;
> > > +
> > > /**
> > > * @author <a href="mailto:evenisse@ifrance.com">Emmanuel
> > Venisse</a>
> > > * @version $Id$
> > > @@ -83,7 +85,7 @@
> > > */
> > > public void setTag( String tag )
> > > {
> > > - this.tag = tag;
> > > + this.tag = StringTool.trim(tag);
> > > }
> > >
> > > /**
> > >
> > >
> > >
> > > 1.24 +7 -6
> > maven/src/java/org/apache/maven/project/Build.java
> > >
> > > Index: Build.java
> > > ===================================================================
> > > RCS file:
> > /home/cvs/maven/src/java/org/apache/maven/project/Build.java,v
> > > retrieving revision 1.23
> > > retrieving revision 1.24
> > > diff -u -r1.23 -r1.24
> > > --- Build.java 19 Aug 2003 04:29:25 -0000 1.23
> > > +++ Build.java 5 Sep 2003 15:28:41 -0000 1.24
> > > @@ -57,6 +57,7 @@
> > > */
> > >
> > > import org.apache.maven.MavenUtils;
> > > +import org.apache.maven.util.StringTool;
> > >
> > > import java.util.ArrayList;
> > > import java.util.List;
> > > @@ -135,7 +136,7 @@
> > > */
> > > public void setIntegrationUnitTestSourceDirectory( String
> > > utDirectory )
> > > {
> > > - this.integrationUnitTestSourceDirectory = utDirectory;
> > > + this.integrationUnitTestSourceDirectory =
> > > StringTool.trim(utDirectory);
> > > }
> > >
> > > /**
> > > @@ -155,7 +156,7 @@
> > > */
> > > public void setUnitTestSourceDirectory( String utDirectory )
> > > {
> > > - this.unitTestSourceDirectory = utDirectory;
> > > + this.unitTestSourceDirectory =
> > StringTool.trim(utDirectory);
> > > }
> > >
> > > /**
> > > @@ -195,7 +196,7 @@
> > > */
> > > public void setSourceDirectory( String sourceDirectory )
> > > {
> > > - this.sourceDirectory = sourceDirectory;
> > > + this.sourceDirectory = StringTool.trim(sourceDirectory);
> > > }
> > >
> > > /**
> > > @@ -215,7 +216,7 @@
> > > */
> > > public void setAspectSourceDirectory( String
> > aspectSourceDirectory
> > > )
> > > {
> > > - this.aspectSourceDirectory = aspectSourceDirectory;
> > > + this.aspectSourceDirectory =
> > > StringTool.trim(aspectSourceDirectory);
> > > }
> > >
> > > /**
> > > @@ -235,7 +236,7 @@
> > > */
> > > public void setNagEmailAddress( String nagEmailAddress )
> > > {
> > > - this.nagEmailAddress = nagEmailAddress;
> > > + this.nagEmailAddress = StringTool.trim(nagEmailAddress);
> > > }
> > >
> > > /**
> > >
> > >
> > >
> > > 1.8 +4 -2
> > > maven/src/java/org/apache/maven/project/Contributor.java
> > >
> > > Index: Contributor.java
> > > ===================================================================
> > > RCS file:
> > > /home/cvs/maven/src/java/org/apache/maven/project/Contributor.java,v
> > > retrieving revision 1.7
> > > retrieving revision 1.8
> > > diff -u -r1.7 -r1.8
> > > --- Contributor.java 12 Apr 2003 00:26:26 -0000 1.7
> > > +++ Contributor.java 5 Sep 2003 15:28:41 -0000 1.8
> > > @@ -56,6 +56,8 @@
> > > *
> > ====================================================================
> > > */
> > >
> > > +import org.apache.maven.util.StringTool;
> > > +
> > > import java.util.SortedSet;
> > > import java.util.TreeSet;
> > >
> > > @@ -112,7 +114,7 @@
> > > */
> > > public void setEmail( String email )
> > > {
> > > - this.email = email;
> > > + this.email = StringTool.trim(email);
> > > }
> > >
> > > /**
> > >
> > >
> > >
> > > 1.40 +10 -8
> > > maven/src/java/org/apache/maven/project/Dependency.java
> > >
> > > Index: Dependency.java
> > > ===================================================================
> > > RCS file:
> > > /home/cvs/maven/src/java/org/apache/maven/project/Dependency.java,v
> > > retrieving revision 1.39
> > > retrieving revision 1.40
> > > diff -u -r1.39 -r1.40
> > > --- Dependency.java 27 Aug 2003 16:28:02 -0000 1.39
> > > +++ Dependency.java 5 Sep 2003 15:28:41 -0000 1.40
> > > @@ -56,6 +56,8 @@
> > > *
> > ====================================================================
> > > */
> > >
> > > +import org.apache.maven.util.StringTool;
> > > +
> > > /**
> > > * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
> > > * @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
> > > @@ -158,7 +160,7 @@
> > > */
> > > public void setGroupId( String groupId )
> > > {
> > > - this.groupId = groupId;
> > > + this.groupId = StringTool.trim(groupId);
> > > }
> > >
> > > /**
> > > @@ -204,7 +206,7 @@
> > > */
> > > public void setArtifactId( String artifactId )
> > > {
> > > - this.artifactId = artifactId;
> > > + this.artifactId = StringTool.trim(artifactId);
> > > }
> > >
> > > /**
> > > @@ -233,7 +235,7 @@
> > > */
> > > public void setVersion( String version )
> > > {
> > > - this.version = version;
> > > + this.version = StringTool.trim(version);
> > > }
> > >
> > > /**
> > > @@ -257,12 +259,12 @@
> > > // This is a check we need because of the jelly
> > interpolation
> > > // process. If we don't check an empty string will be set
> > and
> > > // screw up getArtifact() above.
> > > - if ( jar.trim().length() == 0 )
> > > + if ( StringTool.trim(jar).length() == 0 )
> > > {
> > > return;
> > > }
> > >
> > > - this.jar = jar;
> > > + this.jar = StringTool.trim(jar);
> > > }
> > >
> > > /**
> > > @@ -283,7 +285,7 @@
> > > */
> > > public void setUrl( String url )
> > > {
> > > - this.url = url;
> > > + this.url = StringTool.trim(url);
> > > }
> > >
> > > /**
> > > @@ -332,7 +334,7 @@
> > > */
> > > public void setType( String type )
> > > {
> > > - this.type = ArtifactType.findType(type);
> > > + this.type = ArtifactType.findType(StringTool.trim(type));
> > > }
> > >
> > > /**
> > >
> > >
> > >
> > > 1.91 +21 -19
> > > maven/src/java/org/apache/maven/project/Project.java
> > >
> > > Index: Project.java
> > > ===================================================================
> > > RCS file:
> > > /home/cvs/maven/src/java/org/apache/maven/project/Project.java,v
> > > retrieving revision 1.90
> > > retrieving revision 1.91
> > > diff -u -r1.90 -r1.91
> > > --- Project.java 2 Sep 2003 10:46:28 -0000 1.90
> > > +++ Project.java 5 Sep 2003 15:28:41 -0000 1.91
> > > @@ -69,6 +69,7 @@
> > > import org.apache.maven.verifier.ChecksumVerificationException;
> > > import org.apache.maven.jelly.MavenJellyContext;
> > > import org.apache.maven.jelly.JellyUtils;
> > > +import org.apache.maven.util.StringTool;
> > > import org.apache.tools.ant.types.Path;
> > > import org.apache.commons.grant.GrantProject;
> > > import org.apache.commons.logging.Log;
> > > @@ -293,7 +294,7 @@
> > > */
> > > public void setArtifactId( String artifactId )
> > > {
> > > - this.artifactId = artifactId;
> > > + this.artifactId = StringTool.trim(artifactId);
> > > }
> > >
> > > /**
> > > @@ -313,7 +314,7 @@
> > > */
> > > public void setGroupId( String groupId )
> > > {
> > > - this.groupId = groupId;
> > > + this.groupId = StringTool.trim(groupId);
> > > }
> > >
> > > /**
> > > @@ -437,7 +438,7 @@
> > > */
> > > public void setExtend( String pomToExtend )
> > > {
> > > - this.pomToExtend = pomToExtend;
> > > + this.pomToExtend = StringTool.trim(pomToExtend);
> > > }
> > >
> > > /**
> > > @@ -487,7 +488,7 @@
> > > */
> > > public void setGumpRepositoryId( String gumpRepositoryId )
> > > {
> > > - this.gumpRepositoryId = gumpRepositoryId;
> > > + this.gumpRepositoryId = StringTool.trim(gumpRepositoryId);
> > > }
> > >
> > > /**
> > > @@ -541,7 +542,7 @@
> > > */
> > > public void setSiteAddress( String siteAddress )
> > > {
> > > - this.siteAddress = siteAddress;
> > > + this.siteAddress = StringTool.trim(siteAddress);
> > > }
> > >
> > > /**
> > > @@ -560,11 +561,11 @@
> > > *
> > > * @param siteDirectory the directory on the web server where
> > the
> > > public
> > > * web site for this project resides
> > > - * (ex: "/www/jakarta.apache.org/turbine/maven/")
> > > + * (ex: "/www/maven.apache.org/")
> > > */
> > > public void setSiteDirectory( String siteDirectory )
> > > {
> > > - this.siteDirectory = siteDirectory;
> > > + this.siteDirectory = StringTool.trim(siteDirectory);
> > > }
> > >
> > > /**
> > > @@ -585,7 +586,7 @@
> > > */
> > > public void setDistributionSite( String distributionSite )
> > > {
> > > - this.distributionSite = distributionSite;
> > > + this.distributionSite = StringTool.trim(distributionSite);
> > > }
> > >
> > > /**
> > > @@ -607,7 +608,7 @@
> > > */
> > > public void setDistributionDirectory( String
> > distributionDirectory
> > > )
> > > {
> > > - this.distributionDirectory = distributionDirectory;
> > > + this.distributionDirectory =
> > > StringTool.trim(distributionDirectory);
> > > }
> > >
> > > /**
> > > @@ -720,9 +721,10 @@
> > > */
> > > public void addReport( String report )
> > > {
> > > - if ( reports.contains( report ) == false )
> > > + String reportName = StringTool.trim(report);
> > > + if ( reports.contains( reportName ) == false )
> > > {
> > > - reports.add( report );
> > > + reports.add( reportName );
> > > }
> > > }
> > >
> > > @@ -914,7 +916,7 @@
> > > */
> > > public void setUrl( String url )
> > > {
> > > - this.url = url;
> > > + this.url = StringTool.trim(url);
> > > }
> > >
> > > /**
> > > @@ -934,7 +936,7 @@
> > > */
> > > public void setIssueTrackingUrl( String issueTrackingUrl )
> > > {
> > > - this.issueTrackingUrl = issueTrackingUrl;
> > > + this.issueTrackingUrl = StringTool.trim(issueTrackingUrl);
> > > }
> > >
> > > /**
> > > @@ -986,7 +988,7 @@
> > > */
> > > public void setCurrentVersion( String currentVersion )
> > > {
> > > - this.currentVersion = currentVersion;
> > > + this.currentVersion = StringTool.trim(currentVersion);
> > > }
> > >
> > > /**
> > > @@ -1028,7 +1030,7 @@
> > > */
> > > public void setPackage( String projectPackage )
> > > {
> > > - this.projectPackage = projectPackage;
> > > + this.projectPackage = StringTool.trim(projectPackage);
> > > }
> > >
> > > /**
> > > @@ -1049,7 +1051,7 @@
> > > */
> > > public void setInceptionYear( String inceptionYear )
> > > {
> > > - this.inceptionYear = inceptionYear;
> > > + this.inceptionYear = StringTool.trim(inceptionYear);
> > > }
> > >
> > > /**
> > > @@ -1069,7 +1071,7 @@
> > > */
> > > public void setPomVersion( String pomVersion )
> > > {
> > > - this.pomVersion = pomVersion;
> > > + this.pomVersion = StringTool.trim(pomVersion);
> > > }
> > >
> > > /**
> > > @@ -1191,7 +1193,7 @@
> > > */
> > > public void setLogo( String logo )
> > > {
> > > - this.logo = logo;
> > > + this.logo = StringTool.trim(logo);
> > > }
> > >
> > > /**
> > >
> > >
> > >
> > > 1.16 +5 -4
> > > maven/src/java/org/apache/maven/project/Repository.java
> > >
> > > Index: Repository.java
> > > ===================================================================
> > > RCS file:
> > > /home/cvs/maven/src/java/org/apache/maven/project/Repository.java,v
> > > retrieving revision 1.15
> > > retrieving revision 1.16
> > > diff -u -r1.15 -r1.16
> > > --- Repository.java 19 Aug 2003 04:29:25 -0000 1.15
> > > +++ Repository.java 5 Sep 2003 15:28:42 -0000 1.16
> > > @@ -60,6 +60,7 @@
> > > import java.util.List;
> > >
> > > import org.apache.maven.util.EnhancedStringTokenizer;
> > > +import org.apache.maven.util.StringTool;
> > >
> > > /**
> > > * NOTE: This is very CVS specific, but I would like to try
> > additional
> > > SCM
> > > @@ -91,7 +92,7 @@
> > > */
> > > public void setConnection( String connection )
> > > {
> > > - this.connection = connection;
> > > + this.connection = StringTool.trim(connection);
> > > }
> > >
> > > /**
> > > @@ -101,7 +102,7 @@
> > > */
> > > public void setDeveloperConnection( String developerConnection
> > )
> > > {
> > > - this.developerConnection = developerConnection;
> > > + this.developerConnection =
> > > StringTool.trim(developerConnection);
> > > }
> > >
> > > /**
> > > @@ -131,7 +132,7 @@
> > > */
> > > public void setUrl( String url )
> > > {
> > > - this.url = url;
> > > + this.url = StringTool.trim(url);
> > > }
> > >
> > > /**
> > >
> > >
> > >
> > > 1.12 +5 -4
> > > maven/src/java/org/apache/maven/project/Resource.java
> > >
> > > Index: Resource.java
> > > ===================================================================
> > > RCS file:
> > > /home/cvs/maven/src/java/org/apache/maven/project/Resource.java,v
> > > retrieving revision 1.11
> > > retrieving revision 1.12
> > > diff -u -r1.11 -r1.12
> > > --- Resource.java 19 Aug 2003 04:29:25 -0000 1.11
> > > +++ Resource.java 5 Sep 2003 15:28:42 -0000 1.12
> > > @@ -57,6 +57,7 @@
> > > */
> > >
> > > import org.apache.maven.MavenUtils;
> > > +import org.apache.maven.util.StringTool;
> > >
> > > import java.util.ArrayList;
> > > import java.util.List;
> > > @@ -95,7 +96,7 @@
> > > */
> > > public void addInclude( String pattern )
> > > {
> > > - this.includes.add( pattern );
> > > + this.includes.add( StringTool.trim(pattern) );
> > > }
> > >
> > > /**
> > > @@ -105,7 +106,7 @@
> > > */
> > > public void addExclude( String pattern )
> > > {
> > > - this.excludes.add( pattern );
> > > + this.excludes.add( StringTool.trim(pattern) );
> > > }
> > >
> > > /**
> > > @@ -135,7 +136,7 @@
> > > */
> > > public void setDirectory( String dir )
> > > {
> > > - this.dir = dir;
> > > + this.dir = StringTool.trim(dir);
> > > }
> > >
> > > /**
> > > @@ -155,7 +156,7 @@
> > > */
> > > public void setTargetPath( String targetPath )
> > > {
> > > - this.targetPath = targetPath;
> > > + this.targetPath = StringTool.trim(targetPath);
> > > }
> > >
> > > /**
> > >
> > >
> > >
> > > 1.9 +5 -3
> > > maven/src/java/org/apache/maven/project/SourceModification.java
> > >
> > > Index: SourceModification.java
> > > ===================================================================
> > > RCS file:
> > >
> > /home/cvs/maven/src/java/org/apache/maven/project/SourceModification.jav
> > a,
> > > v
> > > retrieving revision 1.8
> > > retrieving revision 1.9
> > > diff -u -r1.8 -r1.9
> > > --- SourceModification.java 12 Apr 2003 00:02:03 -0000 1.8
> > > +++ SourceModification.java 5 Sep 2003 15:28:42 -0000 1.9
> > > @@ -56,6 +56,8 @@
> > > *
> > ====================================================================
> > > */
> > >
> > > +import org.apache.maven.util.StringTool;
> > > +
> > > /**
> > > * A source modification is made when a given class or property is
> > > present
> > > * during a build. Currently with the way Maven works an exclusion
> > is
> > > the only thing
> > > @@ -88,7 +90,7 @@
> > > */
> > > public void setClassName( String className )
> > > {
> > > - this.className = className;
> > > + this.className = StringTool.trim(className);
> > > }
> > >
> > > /**
> > > @@ -108,7 +110,7 @@
> > > */
> > > public void setProperty( String property )
> > > {
> > > - this.property = property;
> > > + this.property = StringTool.trim(property);
> > > }
> > >
> > > /**
> > >
> > >
> > >
> > > 1.6 +4 -2
> > > maven/src/java/org/apache/maven/project/Version.java
> > >
> > > Index: Version.java
> > > ===================================================================
> > > RCS file:
> > > /home/cvs/maven/src/java/org/apache/maven/project/Version.java,v
> > > retrieving revision 1.5
> > > retrieving revision 1.6
> > > diff -u -r1.5 -r1.6
> > > --- Version.java 12 Apr 2003 00:02:03 -0000 1.5
> > > +++ Version.java 5 Sep 2003 15:28:42 -0000 1.6
> > > @@ -56,6 +56,8 @@
> > > *
> > ====================================================================
> > > */
> > >
> > > +import org.apache.maven.util.StringTool;
> > > +
> > > /**
> > > * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
> > > * @version $Id$
> > > @@ -83,7 +85,7 @@
> > > */
> > > public void setTag( String tag )
> > > {
> > > - this.tag = tag;
> > > + this.tag = StringTool.trim(tag);
> > > }
> > >
> > > /**
> > >
> > >
> > >
> > > 1.3 +17 -1
> > > maven/src/java/org/apache/maven/util/StringTool.java
> > >
> > > Index: StringTool.java
> > > ===================================================================
> > > RCS file:
> > > /home/cvs/maven/src/java/org/apache/maven/util/StringTool.java,v
> > > retrieving revision 1.2
> > > retrieving revision 1.3
> > > diff -u -r1.2 -r1.3
> > > --- StringTool.java 19 Aug 2003 04:31:38 -0000 1.2
> > > +++ StringTool.java 5 Sep 2003 15:28:42 -0000 1.3
> > > @@ -59,6 +59,8 @@
> > > import java.util.Arrays;
> > > import java.util.List;
> > >
> > > +import org.apache.commons.lang.StringUtils;
> > > +
> > > /**
> > > * @author <a href="mailto:bwalding@jakarta.org">Ben Walding</a>
> > > * @version $Id$
> > > @@ -95,5 +97,19 @@
> > > String[] result = { s.substring(0, index),
> > > s.substring(index + 1)};
> > > return Arrays.asList(result);
> > > }
> > > + }
> > > +
> > > + /**
> > > + * <p>Removes all whitespace characters from the start and end
> > of a
> > > String.</p>
> > > + *
> > > + * <p>This is similar to {@link #trim(String)} but removes
> > > whitespace.
> > > + * Whitespace is defined by {@link
> > > Character#isWhitespace(char)}.</p>
> > > + *
> > > + * @param str the String to remove characters from, may be null
> > > + * @return the trimmed String, <code>null</code> if null String
> > > input
> > > + */
> > > + public static String trim(String s)
> > > + {
> > > + return StringUtils.strip(s);
> > > }
> > > }
> > >
> > >
> > >
> > > 1.5 +2 -2
> > > maven/src/test/java/org/apache/maven/project/BaseObjectTest.java
> > >
> > > Index: BaseObjectTest.java
> > > ===================================================================
> > > RCS file:
> > >
> > /home/cvs/maven/src/test/java/org/apache/maven/project/BaseObjectTest.ja
> > va
> > > ,v
> > > retrieving revision 1.4
> > > retrieving revision 1.5
> > > diff -u -r1.4 -r1.5
> > > --- BaseObjectTest.java 26 Aug 2003 09:52:08 -0000 1.4
> > > +++ BaseObjectTest.java 5 Sep 2003 15:28:42 -0000 1.5
> > > @@ -55,7 +55,7 @@
> > > public void testSetGetName() throws Exception
> > > {
> > > // JUnitDoclet begin method setName getName
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -68,7 +68,7 @@
> > > public void testSetGetId() throws Exception
> > > {
> > > // JUnitDoclet begin method setId getId
> > > - java.lang.String[] tests = {" ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n"};
> > > + java.lang.String[] tests = {"a", "A", "ä", "ß",
> > "0123456789",
> > > "012345678901234567890"};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > >
> > >
> > >
> > > 1.5 +1 -1
> > > maven/src/test/java/org/apache/maven/project/BuildTest.java
> > >
> > > Index: BuildTest.java
> > > ===================================================================
> > > RCS file:
> > >
> > /home/cvs/maven/src/test/java/org/apache/maven/project/BuildTest.java,v
> > > retrieving revision 1.4
> > > retrieving revision 1.5
> > > diff -u -r1.4 -r1.5
> > > --- BuildTest.java 21 Aug 2003 22:48:43 -0000 1.4
> > > +++ BuildTest.java 5 Sep 2003 15:28:42 -0000 1.5
> > > @@ -85,7 +85,7 @@
> > > public void testSetGetNagEmailAddress() throws Exception
> > > {
> > > // JUnitDoclet begin method setNagEmailAddress
> > > getNagEmailAddress
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > >
> > >
> > >
> > > 1.3 +1 -1
> > > maven/src/test/java/org/apache/maven/project/ContributorTest.java
> > >
> > > Index: ContributorTest.java
> > > ===================================================================
> > > RCS file:
> > >
> > /home/cvs/maven/src/test/java/org/apache/maven/project/ContributorTest.j
> > av
> > > a,v
> > > retrieving revision 1.2
> > > retrieving revision 1.3
> > > diff -u -r1.2 -r1.3
> > > --- ContributorTest.java 5 Dec 2002 15:55:35 -0000 1.2
> > > +++ ContributorTest.java 5 Sep 2003 15:28:42 -0000 1.3
> > > @@ -55,7 +55,7 @@
> > > public void testSetGetEmail() throws Exception
> > > {
> > > // JUnitDoclet begin method setEmail getEmail
> > > - java.lang.String[] tests = {"", " ", "a", "A", "?", "?",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "?", "?",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > >
> > >
> > >
> > > 1.7 +4 -4
> > > maven/src/test/java/org/apache/maven/project/DependencyTest.java
> > >
> > > Index: DependencyTest.java
> > > ===================================================================
> > > RCS file:
> > >
> > /home/cvs/maven/src/test/java/org/apache/maven/project/DependencyTest.ja
> > va
> > > ,v
> > > retrieving revision 1.6
> > > retrieving revision 1.7
> > > diff -u -r1.6 -r1.7
> > > --- DependencyTest.java 19 Aug 2003 04:45:37 -0000 1.6
> > > +++ DependencyTest.java 5 Sep 2003 15:28:42 -0000 1.7
> > > @@ -67,7 +67,7 @@
> > > public void testSetGetGroupId() throws Exception
> > > {
> > > // JUnitDoclet begin method setGroupId getGroupId
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -101,7 +101,7 @@
> > > public void testSetGetVersion() throws Exception
> > > {
> > > // JUnitDoclet begin method setVersion getVersion
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -114,7 +114,7 @@
> > > public void testSetGetUrl() throws Exception
> > > {
> > > // JUnitDoclet begin method setUrl getUrl
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -127,7 +127,7 @@
> > > public void testSetGetType() throws Exception
> > > {
> > > // JUnitDoclet begin method setType getType
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > >
> > >
> > >
> > > 1.5 +16 -16
> > > maven/src/test/java/org/apache/maven/project/ProjectTest.java
> > >
> > > Index: ProjectTest.java
> > > ===================================================================
> > > RCS file:
> > >
> > /home/cvs/maven/src/test/java/org/apache/maven/project/ProjectTest.java,
> > v
> > > retrieving revision 1.4
> > > retrieving revision 1.5
> > > diff -u -r1.4 -r1.5
> > > --- ProjectTest.java 18 Jan 2003 02:48:29 -0000 1.4
> > > +++ ProjectTest.java 5 Sep 2003 15:28:42 -0000 1.5
> > > @@ -68,7 +68,7 @@
> > > public void testSetGetExtend() throws Exception
> > > {
> > > // JUnitDoclet begin method setExtend getExtend
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -81,7 +81,7 @@
> > > public void testSetGetGumpRepositoryId() throws Exception
> > > {
> > > // JUnitDoclet begin method setGumpRepositoryId
> > > getGumpRepositoryId
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -94,7 +94,7 @@
> > > public void testSetGetShortDescription() throws Exception
> > > {
> > > // JUnitDoclet begin method setShortDescription
> > > getShortDescription
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -107,7 +107,7 @@
> > > public void testSetGetGroupId() throws Exception
> > > {
> > > // JUnitDoclet begin method setGroupId getGroupId
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n"};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890"};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -120,7 +120,7 @@
> > > public void testSetGetSiteAddress() throws Exception
> > > {
> > > // JUnitDoclet begin method setSiteAddress getSiteAddress
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -133,7 +133,7 @@
> > > public void testSetGetSiteDirectory() throws Exception
> > > {
> > > // JUnitDoclet begin method setSiteDirectory
> > getSiteDirectory
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -146,7 +146,7 @@
> > > public void testSetGetDistributionSite() throws Exception
> > > {
> > > // JUnitDoclet begin method setDistributionSite
> > > getDistributionSite
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -159,7 +159,7 @@
> > > public void testSetGetDistributionDirectory() throws Exception
> > > {
> > > // JUnitDoclet begin method setDistributionDirectory
> > > getDistributionDirectory
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -298,7 +298,7 @@
> > > public void testSetGetUrl() throws Exception
> > > {
> > > // JUnitDoclet begin method setUrl getUrl
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -311,7 +311,7 @@
> > > public void testSetGetIssueTrackingUrl() throws Exception
> > > {
> > > // JUnitDoclet begin method setIssueTrackingUrl
> > > getIssueTrackingUrl
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -324,7 +324,7 @@
> > > public void testSetGetDescription() throws Exception
> > > {
> > > // JUnitDoclet begin method setDescription getDescription
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -343,7 +343,7 @@
> > > public void testSetGetCurrentVersion() throws Exception
> > > {
> > > // JUnitDoclet begin method setCurrentVersion
> > getCurrentVersion
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -369,7 +369,7 @@
> > > public void testSetGetPackage() throws Exception
> > > {
> > > // JUnitDoclet begin method setPackage getPackage
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -382,7 +382,7 @@
> > > public void testSetGetInceptionYear() throws Exception
> > > {
> > > // JUnitDoclet begin method setInceptionYear
> > getInceptionYear
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -395,7 +395,7 @@
> > > public void testSetGetPomVersion() throws Exception
> > > {
> > > // JUnitDoclet begin method setPomVersion getPomVersion
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n"};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890"};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -451,7 +451,7 @@
> > > public void testSetGetLogo() throws Exception
> > > {
> > > // JUnitDoclet begin method setLogo getLogo
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > >
> > >
> > >
> > > 1.2 +1 -1
> > > maven/src/test/java/org/apache/maven/project/ResourceTest.java
> > >
> > > Index: ResourceTest.java
> > > ===================================================================
> > > RCS file:
> > >
> > /home/cvs/maven/src/test/java/org/apache/maven/project/ResourceTest.java
> > ,v
> > > retrieving revision 1.1
> > > retrieving revision 1.2
> > > diff -u -r1.1 -r1.2
> > > --- ResourceTest.java 26 Nov 2002 23:38:54 -0000 1.1
> > > +++ ResourceTest.java 5 Sep 2003 15:28:42 -0000 1.2
> > > @@ -79,7 +79,7 @@
> > > public void testSetGetDirectory() throws Exception
> > > {
> > > // JUnitDoclet begin method setDirectory getDirectory
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > >
> > >
> > >
> > > 1.2 +2 -2
> > >
> > maven/src/test/java/org/apache/maven/project/SourceModificationTest.java
> > >
> > > Index: SourceModificationTest.java
> > > ===================================================================
> > > RCS file:
> > >
> > /home/cvs/maven/src/test/java/org/apache/maven/project/SourceModificatio
> > nT
> > > est.java,v
> > > retrieving revision 1.1
> > > retrieving revision 1.2
> > > diff -u -r1.1 -r1.2
> > > --- SourceModificationTest.java 26 Nov 2002 23:39:01 -0000
> > 1.1
> > > +++ SourceModificationTest.java 5 Sep 2003 15:28:42 -0000
> > 1.2
> > > @@ -55,7 +55,7 @@
> > > public void testSetGetClassName() throws Exception
> > > {
> > > // JUnitDoclet begin method setClassName getClassName
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > > @@ -68,7 +68,7 @@
> > > public void testSetGetProperty() throws Exception
> > > {
> > > // JUnitDoclet begin method setProperty getProperty
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > >
> > >
> > >
> > > 1.2 +1 -1
> > > maven/src/test/java/org/apache/maven/project/VersionTest.java
> > >
> > > Index: VersionTest.java
> > > ===================================================================
> > > RCS file:
> > >
> > /home/cvs/maven/src/test/java/org/apache/maven/project/VersionTest.java,
> > v
> > > retrieving revision 1.1
> > > retrieving revision 1.2
> > > diff -u -r1.1 -r1.2
> > > --- VersionTest.java 26 Nov 2002 23:39:17 -0000 1.1
> > > +++ VersionTest.java 5 Sep 2003 15:28:42 -0000 1.2
> > > @@ -55,7 +55,7 @@
> > > public void testSetGetTag() throws Exception
> > > {
> > > // JUnitDoclet begin method setTag getTag
> > > - java.lang.String[] tests = {"", " ", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", "\n", null};
> > > + java.lang.String[] tests = {"", "a", "A", "ä", "ß",
> > > "0123456789", "012345678901234567890", null};
> > >
> > > for ( int i = 0; i < tests.length; i++ )
> > > {
> > >
> > >
> > >
> > >
> > > ---------------------------------------------------------------------
> > > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > > For additional commands, e-mail: dev-help@maven.apache.org
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > For additional commands, e-mail: dev-help@maven.apache.org
> --
> jvz.
>
> Jason van Zyl
> jason@zenplex.com
> http://tambora.zenplex.org
>
> In short, man creates for himself a new religion of a rational
> and technical order to justify his work and to be justified in it.
>
> -- Jacques Ellul, The Technological Society
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
> _____________________________________________________________________
> Envie de discuter en "live" avec vos amis ? Télécharger MSN Messenger
> http://www.ifrance.com/_reloc/m la 1ère messagerie instantanée de France
_____________________________________________________________________
Envie de discuter en "live" avec vos amis ? Télécharger MSN Messenger
http://www.ifrance.com/_reloc/m la 1ère messagerie instantanée de France
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org