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 2002/11/30 18:21:07 UTC
cvs commit: jakarta-turbine-maven/src/plugins-build/xdoc/src/java/org/apache/maven BaseProjectTask.java DVSLBean.java
jvanzyl 2002/11/30 09:21:07
Modified: src/plugins-build/xdoc project.xml
src/plugins-build/xdoc/src/java/org/apache/maven
BaseProjectTask.java DVSLBean.java
Log:
refactoring
Revision Changes Path
1.24 +12 -2 jakarta-turbine-maven/src/plugins-build/xdoc/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/xdoc/project.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- project.xml 30 Nov 2002 01:35:32 -0000 1.23
+++ project.xml 30 Nov 2002 17:21:07 -0000 1.24
@@ -82,9 +82,19 @@
<dependency>
<id>dom4j</id>
- <version>1.4-dev-7</version>
+ <version>1.4-dev-8</version>
</dependency>
-
+
+ <dependency>
+ <id>commons-grant</id>
+ <version>1.0-beta-4</version>
+ </dependency>
+
+ <dependency>
+ <id>commons-jelly</id>
+ <version>SNAPSHOT</version>
+ </dependency>
+
<dependency>
<id>maven</id>
<version>b5</version>
1.8 +2 -2 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BaseProjectTask.java 24 Nov 2002 17:50:56 -0000 1.7
+++ BaseProjectTask.java 30 Nov 2002 17:21:07 -0000 1.8
@@ -163,7 +163,7 @@
{
if (getProject() == null)
{
- setProject(Maven.getInstance().getBaseAntProject());
+ setProject(Maven.getInstance().getAntProject());
}
super.setTemplatePath(templatePath);
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DVSLBean.java 24 Nov 2002 17:50:56 -0000 1.8
+++ DVSLBean.java 30 Nov 2002 17:21:07 -0000 1.9
@@ -352,7 +352,7 @@
if (value.startsWith("${"))
{
String mavenKey = value.substring(2,value.length()-1);
- String mavenValue = (String) Maven.getInstance().getVariable(mavenKey);
+ String mavenValue = (String) Maven.getInstance().getContext().getVariable(mavenKey);
if (mavenValue != null)
{