cvs commit: maven-components/maven-model maven.mdo
trygvis 2005/03/21 06:38:59 Modified:maven-model maven.mdo Log: o Changing the default notifier type from 'email' to 'mail'. Revision ChangesPath 1.90 +1 -1 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- maven.mdo 17 Mar 2005 22:53:12 - 1.89 +++ maven.mdo 21 Mar 2005 14:38:59 - 1.90 @@ -911,7 +911,7 @@ type 4.0.0 - email + mail String The mechanism used to deliver notifications.
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/06/05 22:50:24 Modified:maven-model maven.mdo Log: o tweak the model for v3 and v4 generation Revision ChangesPath 1.34 +4 -4 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- maven.mdo 6 Jun 2004 05:26:37 - 1.33 +++ maven.mdo 6 Jun 2004 05:50:24 - 1.34 @@ -25,7 +25,7 @@ Model - 4.0.0 + 3.0.0+ extend @@ -574,7 +574,7 @@ groupId - 4.0.0 + 3.0.0+ true The project group that produced the dependency, e.g. @@ -584,7 +584,7 @@ artifactId - 4.0.0 + 3.0.0+ true The unique id for an artifact produced by the project group, e.g. @@ -652,7 +652,7 @@ - 3.0.0+ + 4.0.0 public String getId() { - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/06/05 22:26:37 Modified:maven-model maven.mdo Log: o give 3.0.0 Branch.tag a version. Revision ChangesPath 1.33 +2 -0 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- maven.mdo 29 Apr 2004 22:39:05 - 1.32 +++ maven.mdo 6 Jun 2004 05:26:37 - 1.33 @@ -310,6 +310,7 @@ Organization + @@ -384,6 +385,7 @@ tag + 3.0.0 The branch tag in the version control system (e.g. cvs) used by the project for the source - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/04/17 10:15:58 Modified:maven-model maven.mdo Log: Revision ChangesPath 1.31 +2 -2 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- maven.mdo 17 Apr 2004 15:13:31 - 1.30 +++ maven.mdo 17 Apr 2004 17:15:58 - 1.31 @@ -55,7 +55,7 @@ pomVersion 3.0.0 true - modelVersion + String groupId @@ -89,7 +89,7 @@ currentVersion 3.0.0 true - version + String version - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/04/16 21:22:53 Modified:maven-model maven.mdo Log: o cleaning up all the versions o can now generate distinct versions of the model Revision ChangesPath 1.29 +156 -83 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- maven.mdo 16 Apr 2004 21:48:24 - 1.28 +++ maven.mdo 17 Apr 2004 04:22:52 - 1.29 @@ -19,16 +19,17 @@ maven Maven - 4.0.0 Maven's model for Java project. org.apache.maven.model Model Model + 4.0.0 extend + 3.0.0+ The location of the parent project, if one exists. Values from the parent project will be the default for this project if they are left unspecified. @@ -110,7 +111,8 @@ A detailed description of the project. This element is usually specified as CDATA to enable the use of HTML tags within the description. This description is used to -generate the front page +generate the +front page of the project's web site. String @@ -258,7 +260,8 @@ This element includes the specification of reports to be included in a Maven-generated site. These reports will be run -when a user executes maven site. All of the +when a user executes +maven site. All of the reports will be included in the navigation bar for browsing in the order they are specified. @@ -297,59 +300,67 @@ - -private String packageName; - -public void setPackage(String packageName) -{ -this.packageName = packageName; -} - -public String getPackage() -{ -return packageName; -} + + + +private String packageName; -public String getId() -{ -StringBuffer id = new StringBuffer(); -id.append( getGroupId() ); -id.append( ":" ); -id.append( getArtifactId() ); -id.append( ":" ); -id.append( getType() ); -return id.toString(); -} - -public void setId( String id ) -{ -int i = id.indexOf( "+" ); -int j = id.indexOf( ":" ); +public void setPackage(String packageName) +{ +this.packageName = packageName; +} -if ( i > 0 ) +public String getPackage() { -setGroupId( id.substring( 0, i ) ); -setArtifactId( id.replace( '+', '-' ) ); +return packageName; } -else if ( j > 0 ) + +public String getId() { -setGroupId( id.substring( 0, j ) ); -setArtifactId( id.substring( j + 1 ) ); +StringBuffer id = new StringBuffer(); +id.append( getGroupId() ); +id.append( ":" ); +id.append( getArtifactId() ); +id.append( ":" ); +id.append( getType() ); +return id.toString(); } -else + + + + +public void setId( String id ) { -setGroupId( id ); -setArtifactId( id ); +int i = id.indexOf( "+" ); +int j = id.indexOf( ":" ); + +if ( i > 0 ) +{ +setGroupId( id.substring( 0, i ) ); +setArtifactId( id.replace( '+', '-' ) ); +} +else if ( j > 0 ) +{ +setGroupId( id.substring( 0, j ) ); +setArtifactId( id.substring( j + 1 ) ); +} +else +{ +setGroupId( id ); +setArtifactId( id ); +} } -} - + + + Branch 3.0.0 This element describes each of the branches of the -project. Each branch is described by a tag +project. Each branch is described by a +tag element @@ -371,6 +382,7 @@
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/04/16 14:48:25 Modified:maven-model maven.mdo Log: o adding versions to all fields and elements so that I can output distinct versions of the model. o adding required elements where appropriate so the generated XSD is correct. Revision ChangesPath 1.28 +119 -1maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- maven.mdo 15 Apr 2004 14:31:27 - 1.27 +++ maven.mdo 16 Apr 2004 21:48:24 - 1.28 @@ -46,23 +46,27 @@ modelVersion 4.0.0 + true The version of this model you are using. String pomVersion 3.0.0 + true modelVersion groupId 3.0.0 + true The primary grouping for your project. String artifactId 3.0.0 + true The identifier used when generating the artifact for your project. String @@ -76,17 +80,20 @@ name 3.0.0 + true Human readable name of the project. String currentVersion 3.0.0 + true version version 4.0.0 + true The current version of the project. String @@ -129,44 +136,52 @@ inceptionYear 3.0.0 + true The year the project started. String gumpRepositoryId + 3.0.0 Hint for the gump continuous integration build system. String siteAddress + 3.0.0 The FQDN of the host where the project's site is uploaded. String siteDirectory + 3.0.0 The directory on the site host where site documentation is placed when the site is uploaded. String distributionSite + 3.0.0 The FQDN of the host where the project's artifacts are uploaded. String This naming is inconsistent and distriubtion should occur from a repository structure. distributionDirectory + 3.0.0 The directory on the distribution host where artifacts are placed when uploaded. String This naming is inconsistent and distriubtion should occur from a repository structure. mailingLists + 3.0.0+ The mailing lists for the project. java.util.List new ArrayList() developers + 3.0.0+ This element describes all of the developers associated with a project. Each developer is described by a @@ -179,6 +194,7 @@ contributors + 3.0.0+ This element describes all of the contributors associated with a project who are not developers. Each contributor is described by a @@ -191,6 +207,7 @@ dependencies + 3.0.0+ This element describes all of the dependencies associated with a project. Each dependency is described by a @@ -203,6 +220,7 @@ licenses + 3.0.0+ This element describes all of the licenses for this project. Each license is described by a license element, which is then describe by additional @@ -215,24 +233,28 @@ versions + 3.0.0 The released versions of the project. java.util.List new ArrayList() branches + 3.0.0 The SCM branches create for the project. java.util.List new ArrayList() packageGroups + 3.0.0+ Package groups required for complete javadocs. java.util.List new ArrayList() reports + 3.0.0+ This element includes the specification of reports to be included in a Maven-generated site. These reports will be run @@ -2
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/04/15 07:31:27 Modified:maven-model maven.mdo Log: o url will do Revision ChangesPath 1.27 +18 -0 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- maven.mdo 15 Apr 2004 02:03:54 - 1.26 +++ maven.mdo 15 Apr 2004 14:31:27 - 1.27 @@ -535,6 +535,24 @@ + IssueManagement + 4.0.0 + + + system + 4.0.0 + The name of the issue management system i.e. Bugzilla + String + + + url + 4.0.0 + Url for the issue management system use by the project. + String + + + + License - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/04/14 19:03:54 Modified:maven-model maven.mdo Log: o adding some versions to elements to experiment with output for a specific version. Working on the v3 -> v4 converter. Revision ChangesPath 1.26 +14 -9 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- maven.mdo 15 Apr 2004 01:59:20 - 1.25 +++ maven.mdo 15 Apr 2004 02:03:54 - 1.26 @@ -38,28 +38,31 @@ parent + 4.0.0 Specified which project to extend. Parent modelVersion + 4.0.0 The version of this model you are using. String pomVersion + 3.0.0 modelVersion groupId - ??? used post 3.0.0 + 3.0.0 The primary grouping for your project. String artifactId - ??? used post 3.0.0 + 3.0.0 The identifier used when generating the artifact for your project. String @@ -72,25 +75,30 @@ name + 3.0.0 Human readable name of the project. String currentVersion + 3.0.0 version version + 4.0.0 The current version of the project. String shortDescription + 3.0.0 An abbreviated description of the project. String description + 3.0.0 A detailed description of the project. This element is usually specified as CDATA to enable the use of HTML tags @@ -101,29 +109,26 @@ String - type - ??? use post 3.0.0 - The type of artifact produced by the project. - String - jar - - url + 3.0.0 The URL where the project can be found. String logo + 3.0.0 The logo for the project. String issueTrackingUrl + 3.0.0 The URL where the issue tracking system used by the project can be found. String inceptionYear + 3.0.0 The year the project started. String - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/04/14 18:59:20 Modified:maven-model maven.mdo Log: o adding type element to the project. so now the groupId, artifactId and type of a project match that of a dependency. Revision ChangesPath 1.25 +7 -0 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- maven.mdo 13 Apr 2004 03:19:09 - 1.24 +++ maven.mdo 15 Apr 2004 01:59:20 - 1.25 @@ -64,6 +64,13 @@ String + type + 4.0.0 + The type of artifact this project produces. + String + jar + + name Human readable name of the project. String - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/04/12 20:19:09 Modified:maven-model maven.mdo Log: o change the to the . Revision ChangesPath 1.24 +3 -3 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- maven.mdo 12 Apr 2004 14:41:05 - 1.23 +++ maven.mdo 13 Apr 2004 03:19:09 - 1.24 @@ -232,9 +232,9 @@ new ArrayList() - repository + scm Specification for the SCM use by the project. - Repository + Scm This element needs to be renamed as it conflicts with the existing notion of repositories in Maven. @@ -681,7 +681,7 @@ - Repository + Scm connection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo project.xml
jvanzyl 2004/04/12 07:41:05 Modified:maven-model maven.mdo project.xml Log: o Committing changes submitted by Trygve Laugstøl to accomodate the new form of specifying a parent model to use which is of the form: This allows us to work consistently from the local repository or the unified source root where missing models are downloaded now that we have the required information within the element. Revision ChangesPath 1.23 +28 -2 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- maven.mdo 15 Mar 2004 19:05:39 - 1.22 +++ maven.mdo 12 Apr 2004 14:41:05 - 1.23 @@ -19,7 +19,7 @@ maven Maven - 3.0.0 + 4.0.0 Maven's model for Java project. org.apache.maven.model Model @@ -31,12 +31,18 @@ extend The location of the parent project, if one exists. Values from the parent project will be -the default for this project if they are left unspecified. +the default for this project if they are left unspecified. The path may be absolute, or relative to the current project.xml file. String + parent + Specified which project to extend. + Parent + + + modelVersion The version of this model you are using. String @@ -651,6 +657,26 @@ the description java.util.List new ArrayList() + + + + + Parent + + + artifactId + The artifact id of the project to extend. + String + + + groupId + The group id of the project to extend. + String + + + version + The version of the project to extend. + String 1.6 +5 -1 maven-components/maven-model/project.xml Index: project.xml === RCS file: /home/cvs/maven-components/maven-model/project.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- project.xml 8 Apr 2004 02:02:06 - 1.5 +++ project.xml 12 Apr 2004 14:41:05 - 1.6 @@ -1,7 +1,11 @@ - ../project.xml + +maven +maven-component +2.0-SNAPSHOT + Maven Model maven maven-model - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/15 11:05:39 Modified:maven-model maven.mdo Log: o adding some comments Revision ChangesPath 1.22 +7 -0 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- maven.mdo 10 Mar 2004 23:23:02 - 1.21 +++ maven.mdo 15 Mar 2004 19:05:39 - 1.22 @@ -328,6 +328,7 @@ target. String + This should be moved out of the build section. Vestigal for use with Gump. sourceDirectory @@ -588,6 +589,12 @@ String + +We could probably have a specific element for a dev mailing list for +things like CI, and maybe even a specific element for the user and scm +mailing lists. Then leave the more lose structure for any other type +of mailing list. + Organization - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/10 15:23:02 Modified:maven-model maven.mdo Log: o accept pomVersion and delegate to modelVersion Revision ChangesPath 1.21 +4 -0 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- maven.mdo 10 Mar 2004 22:25:49 - 1.20 +++ maven.mdo 10 Mar 2004 23:23:02 - 1.21 @@ -42,6 +42,10 @@ String + pomVersion + modelVersion + + groupId ??? used post 3.0.0 The primary grouping for your project. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/10 14:25:49 Modified:maven-model maven.mdo Log: o don't need the type of description when delegating Revision ChangesPath 1.20 +0 -2 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- maven.mdo 10 Mar 2004 22:24:29 - 1.19 +++ maven.mdo 10 Mar 2004 22:25:49 - 1.20 @@ -60,8 +60,6 @@ currentVersion - The current version of the project. - String version - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/10 14:24:29 Modified:maven-model maven.mdo Log: o I want to be able to read/write the element but I want everything delegated to the version field, so for lack of a better term I made the element for modello to shunt control of one field to another. Revision ChangesPath 1.19 +6 -0 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- maven.mdo 10 Mar 2004 22:12:19 - 1.18 +++ maven.mdo 10 Mar 2004 22:24:29 - 1.19 @@ -59,6 +59,12 @@ String + currentVersion + The current version of the project. + String + version + + version The current version of the project. String - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/10 14:12:19 Modified:maven-model maven.mdo Log: fix typo Revision ChangesPath 1.18 +1 -1 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- maven.mdo 10 Mar 2004 20:46:31 - 1.17 +++ maven.mdo 10 Mar 2004 22:12:19 - 1.18 @@ -60,7 +60,7 @@ version - The currently version of the project. + The current version of the project. String - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/10 12:46:31 Modified:maven-model maven.mdo Log: o using strings and lists for now while I test and expand modello. Revision ChangesPath 1.17 +5 -3 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- maven.mdo 8 Mar 2004 22:10:49 - 1.16 +++ maven.mdo 10 Mar 2004 20:46:31 - 1.17 @@ -22,6 +22,7 @@ 3.0.0 Maven's model for Java project. org.apache.maven.model + Model Model @@ -415,8 +416,8 @@ describe by a role element, the body of which is a role name. - java.util.SortedSet - new TreeSet() + java.util.List + new ArrayList() timezone @@ -691,7 +692,8 @@ filtering Describe if resources are filtered or not. - boolean + String + false - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/08 14:10:49 Modified:maven-model maven.mdo Log: Revision ChangesPath 1.16 +31 -7 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- maven.mdo 8 Mar 2004 22:06:29 - 1.15 +++ maven.mdo 8 Mar 2004 22:10:49 - 1.16 @@ -164,7 +164,12 @@ dependencies - The project's dependencies. + +This element describes all of the dependencies associated with a +project. Each dependency is described by a +dependency element, which is then described by +additional elements (described below). + java.util.List new ArrayList() These should ultimately only be compile time dependencies when transitive dependencies come into play. @@ -427,22 +432,32 @@ groupId - the description + +The project group that produced the dependency, e.g. geronimo. + String artifactId - the description + +The unique id for an artifact produced by the project group, e.g. +germonimo-jms + String version - the description + +The version of the dependency., e.g. 3.2.1 + String url - the description + +This url will be provided to the user if the jar file cannot be downloaded +from the central repository. + String The URL should really be gleaned from a shared database of dependency information. @@ -453,13 +468,22 @@ type - The type of dependency. + +Other known and recognised dependency types are: +ejb and plugin. + String jar properties - Properties for this dependency. + +Properties about the dependency. Various plugins allow you to +mark dependencies with properties. For example the +war plugin looks for a +war.bundle property, and if found will include the dependency +in WEB-INF/lib. For example syntax, check the war plugin docs. + java.util.Properties new Properties() - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/08 14:06:29 Modified:maven-model maven.mdo Log: Revision ChangesPath 1.15 +12 -4 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- maven.mdo 8 Mar 2004 21:53:16 - 1.14 +++ maven.mdo 8 Mar 2004 22:06:29 - 1.15 @@ -32,7 +32,6 @@ The location of the parent project, if one exists. Values from the parent project will be the default for this project if they are left unspecified. The path may be absolute, or relative to the current project.xml file. - String @@ -620,17 +619,26 @@ connection - the description + +The source configuration management system URL +that describes the repository and how to connect to the +repository. This is used by Maven when building versions +from specific ID. + String developerConnection - the description + +Just like connection, but for developers, i.e. this scm connection +will not be read only. + String url - the description + The URL to the project's browsable CVS repository. String - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/08 13:53:17 Modified:maven-model maven.mdo Log: Revision ChangesPath 1.14 +129 -26 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- maven.mdo 8 Mar 2004 21:33:06 - 1.13 +++ maven.mdo 8 Mar 2004 21:53:16 - 1.14 @@ -28,7 +28,12 @@ extend - The model you wish your model to extend. + +The location of the parent project, if one exists. Values from the parent project will be +the default for this project if they are left unspecified. +The path may be absolute, or relative to the current project.xml file. + + String @@ -65,7 +70,13 @@ description - A full description of the project. + +A detailed description of the project. This element is +usually specified as CDATA to enable the use of HTML tags +within the description. This description is used to +generate the front page +of the project's web site. + String @@ -130,13 +141,25 @@ developers - The developers working on the project. + +This element describes all of the developers associated with a +project. Each developer is described by a +developer element, which is then described by +additional elements (described below). The auto-generated site +documentation references this information. + java.util.List new ArrayList() contributors - People who have contributed to the project. + +This element describes all of the contributors associated with a +project who are not developers. Each contributor is described by a +contributor element, which is then describe by additional +elements (described below). The auto-generated site documentation +references this information. + java.util.List new ArrayList() @@ -149,7 +172,13 @@ licenses - The project's licenses. + +This element describes all of the licenses for this project. Each license is described by a +license element, which is then describe by additional +elements (described below). The auto-generated site documentation +references this information. Projects should only list the license(s) that +applies to the project and not the licenses that apply to dependencies. + java.util.List new ArrayList() @@ -173,7 +202,13 @@ reports - Reports to be generated for the project. + +This element includes the specification of reports to be +included in a Maven-generated site. These reports will be run +when a user executes maven site. All of the +reports will be included in the navigation bar for browsing in +the order they are specified. + java.util.List new ArrayList() @@ -271,39 +306,76 @@ nagEmailAddress - the description + +An address to which notifications regarding the status of builds +for this project can be sent. This is intended for use by tools +which do unattended builds, for example those providing for +continuous integration. Currently this is used by the +maven:gump-descriptor +target. + String sourceDirectory - the description + +This element specifies a directory containing the source +of the project. The generated build system will compile +the source in this directory when the project is built. +The path given is relative to the project descriptor. + String unitTestSourceDirectory - the description + +This element specifies a directory containing the unit test +source of the project. The generated build system will +compile these directories when the pro
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/08 13:33:06 Modified:maven-model maven.mdo Log: Revision ChangesPath 1.13 +28 -2 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- maven.mdo 8 Mar 2004 21:28:26 - 1.12 +++ maven.mdo 8 Mar 2004 21:33:06 - 1.13 @@ -190,7 +190,11 @@ organization - Umbrella organization for the project. + +This element describes various attributes of the organziation to +which the project belongs. These attributes are utilized when +documentation is created (for copyright notices and links). + Organization @@ -244,10 +248,20 @@ Branch + +This element describes each of the branches of the +project. Each branch is described by a tag +element + tag - the description + +The branch tag in the version control system +(e.g. cvs) used by the project for the source +code associated with this branch of the +project. + String @@ -413,6 +427,13 @@ MailingList + +This element describes all of the mailing lists associated with +a project. Each mailing list is described by a +mailingList element, which is then described by +additional elements (described below). The auto-generated site +documentation references this information. + name @@ -574,6 +595,11 @@ Version + +This element describes each of the previous versions of the +project. Each version is described by a version +element + name - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/08 13:28:26 Modified:maven-model maven.mdo Log: Revision ChangesPath 1.12 +22 -7 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- maven.mdo 8 Mar 2004 21:22:40 - 1.11 +++ maven.mdo 8 Mar 2004 21:28:26 - 1.12 @@ -416,22 +416,31 @@ name - the description + The name of the mailing list. String subscribe - the description + +The email address or link that can be used to subscribe to the mailing list. +If this is an email address, a mailto: link will automatically be created when +the documentation is created. + String unsubscribe - the description + +The email address or link that can be used to unsubscribe to +the mailing list. If this is an email address, a +mailto: link will automatically be created +when the documentation is created. + String archive - the description + The link to a URL where you can browse the archive. String @@ -441,17 +450,23 @@ name - the description + The full name of the organization. String url - the description + The URL to the organization's home page. String logo - the description + +The URL to the organization's logo image. This can be an URL relative +to the base directory of the generated web site, +(e.g., /images/org-logo.png) or an absolute URL +(e.g., http://my.corp/logo.png). This value is used +when generating the project documentation. + String - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/08 13:22:40 Modified:maven-model maven.mdo Log: o the description elements are now implicitly so that anything can be put in there and pass through to the doco. Just moving Pete's good documentation into the model. Revision ChangesPath 1.11 +14 -3 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- maven.mdo 8 Mar 2004 19:09:45 - 1.10 +++ maven.mdo 8 Mar 2004 21:22:40 - 1.11 @@ -17,9 +17,10 @@ | --> + maven Maven 3.0.0 - the description + Maven's model for Java project. org.apache.maven.model @@ -561,16 +562,26 @@ name - the description + +The external version number under which this release was distributed. Examples include: +1.0, 1.1-alpha1, 1.2-beta, 1.3.2 etc. + String tag + +The name given in the version control system (e.g. cvs) used by the project for the source +code associated with this version of the project. + String id - the description + +A unique identifier for a version. This ID is +used to specify the version that maven:dist builds. + String - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/08 11:09:45 Modified:maven-model maven.mdo Log: o more doco Revision ChangesPath 1.10 +7 -5 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- maven.mdo 8 Mar 2004 19:02:56 - 1.9 +++ maven.mdo 8 Mar 2004 19:09:45 - 1.10 @@ -144,6 +144,7 @@ The project's dependencies. java.util.List new ArrayList() + These should ultimately only be compile time dependencies when transitive dependencies come into play. licenses @@ -165,30 +166,30 @@ packageGroups - the description + Package groups required for complete javadocs. java.util.List new ArrayList() reports - the description + Reports to be generated for the project. java.util.List new ArrayList() repository - the description + Specification for the SCM use by the project. Repository This element needs to be renamed as it conflicts with the existing notion of repositories in Maven. build - the description + Information required to build the project. Build organization - the description + Umbrella organization for the project. Organization @@ -346,6 +347,7 @@ url the description String + The URL should really be gleaned from a shared database of dependency information. artifact - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/08 11:02:56 Modified:maven-model maven.mdo Log: o fix typo Revision ChangesPath 1.9 +1 -1 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- maven.mdo 8 Mar 2004 18:16:36 - 1.8 +++ maven.mdo 8 Mar 2004 19:02:56 - 1.9 @@ -179,7 +179,7 @@ repository the description Repository - This element needs to be renamed as it conflicts with the existing notion of repositorys in Maven. + This element needs to be renamed as it conflicts with the existing notion of repositories in Maven. build - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/08 10:16:36 Modified:maven-model maven.mdo Log: Revision ChangesPath 1.8 +1 -0 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- maven.mdo 8 Mar 2004 18:15:37 - 1.7 +++ maven.mdo 8 Mar 2004 18:16:36 - 1.8 @@ -179,6 +179,7 @@ repository the description Repository + This element needs to be renamed as it conflicts with the existing notion of repositorys in Maven. build - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/08 10:15:37 Modified:maven-model maven.mdo Log: o incorporating a element from which we can produced developer documentation during changes to model. Revision ChangesPath 1.7 +2 -1 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- maven.mdo 8 Mar 2004 18:12:15 - 1.6 +++ maven.mdo 8 Mar 2004 18:15:37 - 1.7 @@ -109,16 +109,17 @@ The directory on the site host where site documentation is placed when the site is uploaded. String - distributionSite The FQDN of the host where the project's artifacts are uploaded. String + This naming is inconsistent and distriubtion should occur from a repository structure. distributionDirectory The directory on the distribution host where artifacts are placed when uploaded. String + This naming is inconsistent and distriubtion should occur from a repository structure. mailingLists - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/08 10:12:15 Modified:maven-model maven.mdo Log: o more doco o remove the versionMap, taken care of in the project. Revision ChangesPath 1.6 +19 -25maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- maven.mdo 8 Mar 2004 18:06:26 - 1.5 +++ maven.mdo 8 Mar 2004 18:12:15 - 1.6 @@ -54,44 +54,44 @@ version - The currently version of your project. + The currently version of the project. String shortDescription - An abbreviated description of your project. + An abbreviated description of the project. String description - A full description of your project. + A full description of the project. String type ??? use post 3.0.0 - The type of artifact produced by your project. + The type of artifact produced by the project. String jar url - The URL where your project can be found. + The URL where the project can be found. String logo - The logo for your project. + The logo for the project. String issueTrackingUrl - The URL where the issue tracking system used by your project can be found. + The URL where the issue tracking system used by the project can be found. String inceptionYear - The year your project started. + The year the project started. String @@ -101,64 +101,64 @@ siteAddress - The FQDN of the host where your project's site is uploaded. + The FQDN of the host where the project's site is uploaded. String siteDirectory - The directory on your site host where site documentation is placed when the site is uploaded. + The directory on the site host where site documentation is placed when the site is uploaded. String distributionSite - The FQDN of the host where your project's artifacts are uploaded. + The FQDN of the host where the project's artifacts are uploaded. String distributionDirectory - The directory on your distribution host where artifacts are placed when uploaded. + The directory on the distribution host where artifacts are placed when uploaded. String mailingLists - the description + The mailing lists for the project. java.util.List new ArrayList() developers - the description + The developers working on the project. java.util.List new ArrayList() contributors - the description + People who have contributed to the project. java.util.List new ArrayList() dependencies - the description + The project's dependencies. java.util.List new ArrayList() licenses - the description + The project's licenses. java.util.List new ArrayList() versions - the description + The released versions of the project. java.util.List new ArrayList() branches - the description + The SCM branches create for the project. java.util.List new ArrayList() @@ -173,12 +173,6 @@ the description java.util.List new ArrayList() - - - versionMap - the description - java.util.Map - new HashMap() repository - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/08 10:06:26 Modified:maven-model maven.mdo Log: o more doco Revision ChangesPath 1.5 +10 -10maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- maven.mdo 8 Mar 2004 17:57:56 - 1.4 +++ maven.mdo 8 Mar 2004 18:06:26 - 1.5 @@ -76,48 +76,48 @@ url - the description + The URL where your project can be found. String logo - the description + The logo for your project. String issueTrackingUrl - the description + The URL where the issue tracking system used by your project can be found. String inceptionYear - the description + The year your project started. String gumpRepositoryId - the description + Hint for the gump continuous integration build system. String siteAddress - the description + The FQDN of the host where your project's site is uploaded. String siteDirectory - the description + The directory on your site host where site documentation is placed when the site is uploaded. String - + distributionSite - the description + The FQDN of the host where your project's artifacts are uploaded. String distributionDirectory - the description + The directory on your distribution host where artifacts are placed when uploaded. String - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/08 09:57:56 Modified:maven-model maven.mdo Log: o starting to add descriptions, tracing lineage of some elements. Revision ChangesPath 1.4 +12 -8 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- maven.mdo 8 Mar 2004 17:29:47 - 1.3 +++ maven.mdo 8 Mar 2004 17:57:56 - 1.4 @@ -27,22 +27,24 @@ extend - The model you wish this model to extend. + The model you wish your model to extend. String modelVersion - The version of this model. + The version of this model you are using. String groupId - the description + ??? used post 3.0.0 + The primary grouping for your project. String artifactId - the description + ??? used post 3.0.0 + The identifier used when generating the artifact for your project. String @@ -52,23 +54,25 @@ version - the description + The currently version of your project. String shortDescription - the description + An abbreviated description of your project. String description - the description + A full description of your project. String type - the description + ??? use post 3.0.0 + The type of artifact produced by your project. String + jar url - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/08 09:29:47 Modified:maven-model maven.mdo Log: o we'll start at the baseline 3.0.0 for versioning. Revision ChangesPath 1.3 +2 -0 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- maven.mdo 8 Mar 2004 16:42:02 - 1.2 +++ maven.mdo 8 Mar 2004 17:29:47 - 1.3 @@ -14,9 +14,11 @@ | different versions of the model can be output. | | o annotation mechanism so that changes to the model can be accurately tracked. + | --> Maven + 3.0.0 the description org.apache.maven.model - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: maven-components/maven-model maven.mdo
jvanzyl 2004/03/08 08:42:02 Modified:maven-model maven.mdo Log: o just adding some notes Revision ChangesPath 1.2 +17 -0 maven-components/maven-model/maven.mdo Index: maven.mdo === RCS file: /home/cvs/maven-components/maven-model/maven.mdo,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- maven.mdo 8 Mar 2004 01:31:18 - 1.1 +++ maven.mdo 8 Mar 2004 16:42:02 - 1.2 @@ -1,3 +1,20 @@ + Maven the description - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]