kaz 02/05/30 06:46:49
Modified: src/dtd project.dtd project.xsd
src/templates/xdocs dependencies.xml
xdocs/ref project-descriptor.xml
xdocs/start integrate.xml
Log:
Redo-ing my changes regarding the <jar> element as we've now decided
that it is gone (permanently). Also updated docs to reflect the <type>
element is also gone from the <dependency> element.
Revision Changes Path
1.6 +1 -1 jakarta-turbine-maven/src/dtd/project.dtd
Index: project.dtd
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/dtd/project.dtd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.dtd 28 May 2002 16:15:18 -0000 1.5
+++ project.dtd 30 May 2002 13:46:48 -0000 1.6
@@ -67,7 +67,7 @@
<!ELEMENT dependencies (dependency*)>
-<!ELEMENT dependency (name,type,version,jar,url)>
+<!ELEMENT dependency (name,type,version,url)>
<!--
Indicates the type of dependency.
1.13 +0 -1 jakarta-turbine-maven/src/dtd/project.xsd
Index: project.xsd
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/dtd/project.xsd,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xsd 28 May 2002 18:53:11 -0000 1.12
+++ project.xsd 30 May 2002 13:46:48 -0000 1.13
@@ -151,7 +151,6 @@
<xs:sequence>
<xs:element ref="name"/>
<xs:element ref="version"/>
- <xs:element ref="jar" minOccurs="0"/>
<xs:element ref="url" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
1.2 +0 -2 jakarta-turbine-maven/src/templates/xdocs/dependencies.xml
Index: dependencies.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/xdocs/dependencies.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dependencies.xml 4 May 2002 01:50:11 -0000 1.1
+++ dependencies.xml 30 May 2002 13:46:49 -0000 1.2
@@ -20,7 +20,6 @@
<table>
<tr>
<th>Name</th>
- <th>Type</th>
<th>Version</th>
<th>JAR</th>
</tr>
@@ -33,7 +32,6 @@
$!dep.name
#end
</td>
- <td>$!dep.type</td>
<td>$!dep.version</td>
<td>$!dep.jar</td>
</tr>
1.7 +5 -9 jakarta-turbine-maven/xdocs/ref/project-descriptor.xml
Index: project-descriptor.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/ref/project-descriptor.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project-descriptor.xml 28 May 2002 16:15:19 -0000 1.6
+++ project-descriptor.xml 30 May 2002 13:46:49 -0000 1.7
@@ -351,7 +351,11 @@
additional elements (described below). These dependencies are
used to construct a classpath for your project during the build
process. In addition, Maven can automatically download these
- dependencies from a central repository.
+ dependencies from a central repository. The filename that Maven
+ downloads from the repository is <code>name-version.jar</code>
+ where <code>name</code> corresponds to the <code>name</code>
+ element and <code>version</code> corresponds to the
+ <code>version</code> element.
</p>
<subsection name="dependency">
<table>
@@ -361,16 +365,8 @@
<td>The name of the dependency.</td>
</tr>
<tr>
- <td>type</td>
- <td>Describes the type of the dependency.</td>
- </tr>
- <tr>
<td>version</td>
<td>The version of the dependency.</td>
- </tr>
- <tr>
- <td>jar</td>
- <td>The dependency's jar filename.</td>
</tr>
<tr>
<td>url</td>
1.13 +0 -6 jakarta-turbine-maven/xdocs/start/integrate.xml
Index: integrate.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/start/integrate.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- integrate.xml 30 May 2002 12:55:23 -0000 1.12
+++ integrate.xml 30 May 2002 13:46:49 -0000 1.13
@@ -143,17 +143,13 @@
<dependencies>
<dependency>
<name>jakarta-turbine-stratum</name>
- <type>required</type>
<version>0.1</version>
- <jar>stratum-0.1-dev.jar</jar>
<url>http://jakarta.apache.org/turbine/stratum/</url>
</dependency>
<dependency>
<name>jakarta-velocity-dvsl</name>
- <type>documentation</type>
<version>0.40</version>
- <jar>velocity-dvsl-0.40.jar</jar>
<url>http://jakarta.apache.org/velocity/</url>
</dependency>
@@ -163,9 +159,7 @@
<dependency>
<name>jdepend</name>
- <type>required</type>
<version>2.2</version>
- <jar>jdepend.jar</jar>
<url>http://jakarta.apache.org/turbine/maven/</url>
</dependency>
</dependencies>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
