You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/12/04 02:09:53 UTC
cvs commit: maven-components/maven-model/src/java/org/apache/maven/model Build.java Resource.java
jvanzyl 2003/12/03 17:09:53
Modified: maven-model maven-model.iws project.xml
maven-model/src/java/org/apache/maven/model Build.java
Resource.java
Log:
o just adding more tests
Revision Changes Path
1.3 +56 -24 maven-components/maven-model/maven-model.iws
Index: maven-model.iws
===================================================================
RCS file: /home/cvs/maven-components/maven-model/maven-model.iws,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven-model.iws 2 Dec 2003 04:08:25 -0000 1.2
+++ maven-model.iws 4 Dec 2003 01:09:53 -0000 1.3
@@ -2,33 +2,65 @@
<project version="3" relativePaths="false">
<component name="FileEditorManager">
<history>
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/ResourceTest.java" line="10" column="13" vertical-scroll-proportion="0.1558753" horizontal-scroll-proportion="0.09263658" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/SourceModificationTest.java" line="10" column="13" vertical-scroll-proportion="0.15970516" horizontal-scroll-proportion="0.09263658" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/UnitTestTest.java" line="10" column="13" vertical-scroll-proportion="0.1558753" horizontal-scroll-proportion="0.09263658" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/BranchTest.java" line="26" column="0" vertical-scroll-proportion="0.4052758" horizontal-scroll-proportion="0.0" />
- <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Build.java" line="111" column="8" vertical-scroll-proportion="0.5551559" horizontal-scroll-proportion="0.057416268" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/BuildTest.java" line="35" column="0" vertical-scroll-proportion="0.5455636" horizontal-scroll-proportion="0.0" />
- <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Developer.java" line="66" column="13" vertical-scroll-proportion="0.40767387" horizontal-scroll-proportion="0.09330144" />
- <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Contributor.java" line="88" column="7" vertical-scroll-proportion="0.22422062" horizontal-scroll-proportion="0.050239235" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/DeveloperTest.java" line="21" column="19" vertical-scroll-proportion="0.32733813" horizontal-scroll-proportion="0.13539192" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/LicenseTest.java" line="21" column="21" vertical-scroll-proportion="0.32733813" horizontal-scroll-proportion="0.1496437" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/RepositoryTest.java" line="34" column="0" vertical-scroll-proportion="0.529976" horizontal-scroll-proportion="0.0" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/PackageGroupTest.java" line="10" column="13" vertical-scroll-proportion="0.1558753" horizontal-scroll-proportion="0.09263658" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/PackageGroupTest.java" line="10" column="13" vertical-scroll-proportion="0.15970516" horizontal-scroll-proportion="0.09263658" />
<source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/OrganizationTest.java" line="29" column="28" vertical-scroll-proportion="0.45203838" horizontal-scroll-proportion="0.19952494" />
<source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/MailingListTest.java" line="35" column="30" vertical-scroll-proportion="0.5455636" horizontal-scroll-proportion="0.21377672" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/ContributorTest.java" line="34" column="0" vertical-scroll-proportion="0.529976" horizontal-scroll-proportion="0.0" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Resource.java" line="160" column="0" vertical-scroll-proportion="0.85971224" horizontal-scroll-proportion="0.0" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/ResourceTest.java" line="30" column="0" vertical-scroll-proportion="0.4676259" horizontal-scroll-proportion="0.0" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/UnitTestTest.java" line="40" column="58" vertical-scroll-proportion="0.6235012" horizontal-scroll-proportion="0.41330168">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </source-position-entry>
+ <source-position-entry url="file://$PROJECT_DIR$/project.xml" line="35" column="0" vertical-scroll-proportion="0.5455636" horizontal-scroll-proportion="0.0" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/SourceModificationTest.java" line="28" column="0" vertical-scroll-proportion="0.43645084" horizontal-scroll-proportion="0.0" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Dependency.java" line="259" column="56" vertical-scroll-proportion="0.5203837" horizontal-scroll-proportion="0.40191388" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Build.java" line="149" column="34" vertical-scroll-proportion="0.5671463" horizontal-scroll-proportion="0.24401914" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/BuildTest.java" line="66" column="54" vertical-scroll-proportion="0.9376499" horizontal-scroll-proportion="0.3847981">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </source-position-entry>
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/ContributorTest.java" line="41" column="57" vertical-scroll-proportion="0.63908875" horizontal-scroll-proportion="0.40617576" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/DependencyTest.java" line="32" column="38" vertical-scroll-proportion="0.25179857" horizontal-scroll-proportion="0.27078384">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </source-position-entry>
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/ModelTest.java" line="93" column="55" vertical-scroll-proportion="0.92206234" horizontal-scroll-proportion="0.39473686" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Model.java" line="496" column="0" vertical-scroll-proportion="0.25539568" horizontal-scroll-proportion="0.0">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </source-position-entry>
</history>
<open-files>
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/BuildTest.java" line="35" column="0" vertical-scroll-proportion="0.5455636" horizontal-scroll-proportion="0.0" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/ContributorTest.java" line="34" column="0" vertical-scroll-proportion="0.529976" horizontal-scroll-proportion="0.0" selected="true" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/DeveloperTest.java" line="21" column="19" vertical-scroll-proportion="0.32733813" horizontal-scroll-proportion="0.13539192" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/LicenseTest.java" line="21" column="21" vertical-scroll-proportion="0.32733813" horizontal-scroll-proportion="0.1496437" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/OrganizationTest.java" line="29" column="28" vertical-scroll-proportion="0.45203838" horizontal-scroll-proportion="0.19952494" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/PackageGroupTest.java" line="10" column="13" vertical-scroll-proportion="0.1558753" horizontal-scroll-proportion="0.09263658" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/RepositoryTest.java" line="34" column="0" vertical-scroll-proportion="0.529976" horizontal-scroll-proportion="0.0" />
- <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/MailingListTest.java" line="35" column="30" vertical-scroll-proportion="0.5455636" horizontal-scroll-proportion="0.21377672" />
- <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Contributor.java" line="88" column="7" vertical-scroll-proportion="0.22422062" horizontal-scroll-proportion="0.050239235" />
- <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Developer.java" line="66" column="13" vertical-scroll-proportion="0.40767387" horizontal-scroll-proportion="0.09330144" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/ContributorTest.java" line="41" column="57" vertical-scroll-proportion="0.63908875" horizontal-scroll-proportion="0.40617576" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/UnitTestTest.java" line="40" column="58" vertical-scroll-proportion="0.6235012" horizontal-scroll-proportion="0.41330168">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </source-position-entry>
+ <source-position-entry url="file://$PROJECT_DIR$/project.xml" line="35" column="0" vertical-scroll-proportion="0.5455636" horizontal-scroll-proportion="0.0" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/SourceModificationTest.java" line="28" column="0" vertical-scroll-proportion="0.43645084" horizontal-scroll-proportion="0.0" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/DependencyTest.java" line="32" column="38" vertical-scroll-proportion="0.25179857" horizontal-scroll-proportion="0.27078384">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </source-position-entry>
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/ModelTest.java" line="93" column="55" vertical-scroll-proportion="0.92206234" horizontal-scroll-proportion="0.39473686" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Model.java" line="496" column="0" vertical-scroll-proportion="0.25539568" horizontal-scroll-proportion="0.0" selected="true">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </source-position-entry>
+ <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Dependency.java" line="259" column="56" vertical-scroll-proportion="0.5203837" horizontal-scroll-proportion="0.40191388" />
+ <source-position-entry url="file://$PROJECT_DIR$/src/test/org/apache/maven/model/BuildTest.java" line="66" column="54" vertical-scroll-proportion="0.9376499" horizontal-scroll-proportion="0.3847981">
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
+ </source-position-entry>
+ <source-position-entry url="file://$PROJECT_DIR$/src/java/org/apache/maven/model/Build.java" line="149" column="34" vertical-scroll-proportion="0.5671463" horizontal-scroll-proportion="0.24401914" />
</open-files>
</component>
<component name="ToolWindowManager">
@@ -183,7 +215,7 @@
<Commit>
<option name="NON_RECURSIVE" value="false" />
<option name="REVISION_TAG" value="" />
- <option name="LOG_MESSAGE" value="o removing use of ${basedir} o fixing nag email o trimming reports" />
+ <option name="LOG_MESSAGE" value="o ids can be created in the project. we want to stick with the model here." />
<option name="ADDITIONAL_OPTIONS" value="" />
</Commit>
<Diff>
1.3 +0 -1 maven-components/maven-model/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-model/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 1 Dec 2003 22:22:04 -0000 1.2
+++ project.xml 4 Dec 2003 01:09:53 -0000 1.3
@@ -35,7 +35,6 @@
<nagEmailAddress>dev@maven.apache.org</nagEmailAddress>
<sourceDirectory>src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
- <aspectSourceDirectory>src/aspect</aspectSourceDirectory>
<unitTest>
<includes>
<include>**/*Test.java</include>
1.6 +2 -2 maven-components/maven-model/src/java/org/apache/maven/model/Build.java
Index: Build.java
===================================================================
RCS file: /home/cvs/maven-components/maven-model/src/java/org/apache/maven/model/Build.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Build.java 2 Dec 2003 04:08:25 -0000 1.5
+++ Build.java 4 Dec 2003 01:09:53 -0000 1.6
@@ -147,7 +147,7 @@
*
* @param sourceModifications Source modification.
*/
- public void setSourceModification( List sourceModifications )
+ public void setSourceModifications( List sourceModifications )
{
this.sourceModifications = sourceModifications;
}
1.6 +5 -10 maven-components/maven-model/src/java/org/apache/maven/model/Resource.java
Index: Resource.java
===================================================================
RCS file: /home/cvs/maven-components/maven-model/src/java/org/apache/maven/model/Resource.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Resource.java 2 Dec 2003 04:08:25 -0000 1.5
+++ Resource.java 4 Dec 2003 01:09:53 -0000 1.6
@@ -70,7 +70,7 @@
implements Serializable
{
/** Resource Directory */
- private String dir;
+ private String directory;
/** Target directory. */
private String targetPath = "";
@@ -124,11 +124,11 @@
/**
* Set the directory where resources are located.
*
- * @param dir The directory where resources are located.
+ * @param directory The directory where resources are located.
*/
- public void setDirectory( String dir )
+ public void setDirectory( String directory )
{
- this.dir = dir;
+ this.directory = directory;
}
/**
@@ -138,7 +138,7 @@
*/
public String getDirectory()
{
- return this.dir;
+ return this.directory;
}
/**
@@ -159,10 +159,5 @@
public String getTargetPath()
{
return targetPath;
- }
-
- public String toString()
- {
- return "[dir = " + dir + "]";
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org