jvanzyl 2002/11/24 09:50:56
Modified: src/plugins-build/j2ee project.xml
src/plugins-build/xdoc/src/java/org/apache/maven
BaseProjectTask.java DVSLBean.java
Log:
o Updating to match changes made during refactoring.
Revision Changes Path
1.14 +1 -1 jakarta-turbine-maven/src/plugins-build/j2ee/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/j2ee/project.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.xml 12 Oct 2002 15:42:25 -0000 1.13
+++ project.xml 24 Nov 2002 17:50:56 -0000 1.14
@@ -103,7 +103,7 @@
<dependency>
<id>xml-apis</id>
- <version>2.0.2</version>
+ <version>1.0.b2</version>
</dependency>
</dependencies>
1.7 +2 -1
jakarta-turbine-maven/src/plugins-build/xdoc/src/java/org/apache/maven/BaseProjectTask.java
Index: BaseProjectTask.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/plugins-build/xdoc/src/java/org/apache/maven/BaseProjectTask.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseProjectTask.java 17 Oct 2002 13:17:40 -0000 1.6
+++ BaseProjectTask.java 24 Nov 2002 17:50:56 -0000 1.7
@@ -165,6 +165,7 @@
{
setProject(Maven.getInstance().getBaseAntProject());
}
+
super.setTemplatePath(templatePath);
}
1.8 +1 -1
jakarta-turbine-maven/src/plugins-build/xdoc/src/java/org/apache/maven/DVSLBean.java
Index: DVSLBean.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/plugins-build/xdoc/src/java/org/apache/maven/DVSLBean.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DVSLBean.java 26 Oct 2002 08:09:16 -0000 1.7
+++ DVSLBean.java 24 Nov 2002 17:50:56 -0000 1.8
@@ -352,7 +352,7 @@
if (value.startsWith("${"))
{
String mavenKey = value.substring(2,value.length()-1);
- String mavenValue =
Maven.getInstance().getProperty(mavenKey);
+ String mavenValue = (String)
Maven.getInstance().getVariable(mavenKey);
if (mavenValue != null)
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
