jvanzyl 2002/11/11 19:23:55
Modified: src/java/org/apache/maven CreateDependencyClasspath.java
Log:
o Using accessors and using MavenJellyContext constants.
Revision Changes Path
1.10 +18 -19
jakarta-turbine-maven/src/java/org/apache/maven/CreateDependencyClasspath.java
Index: CreateDependencyClasspath.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/CreateDependencyClasspath.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CreateDependencyClasspath.java 26 Oct 2002 05:18:40 -0000 1.9
+++ CreateDependencyClasspath.java 12 Nov 2002 03:23:55 -0000 1.10
@@ -79,20 +79,17 @@
*/
public class CreateDependencyClasspath
{
+ // ------------------------------------------------------------
+ // I N S T A N C E M E M B E R S
+ // ------------------------------------------------------------
- /**
- * Reference id
- */
+ /** Reference id for the generated classpath. */
private String refid;
- /**
- * Jelly context
- */
+ /** Jelly context */
private MavenJellyContext context;
- /**
- * Maven project (POM)
- */
+ /** Maven project (POM) */
private Project mavenProject;
// --------------------------------------------------------------
@@ -154,13 +151,14 @@
/**
* Create the dependency classpath
*/
- public void execute() throws Exception
+ public void execute()
+ throws Exception
{
// If a maven project hasn't been set explicity then use the one
// in the jelly context.
- if (mavenProject == null)
+ if (getMavenProject() == null)
{
- mavenProject = (Project) context.getVariable("pom");
+ setMavenProject((Project)
context.getVariable(MavenJellyContext.MAVEN_POM));
}
Object b = context.getVariable("maven.jar.override");
@@ -168,9 +166,10 @@
((Boolean) b).booleanValue());
String mavenRepoLocal =
(String) context.getVariable("maven.repo.local");
- org.apache.tools.ant.Project antProject =
- (org.apache.tools.ant.Project) context.getVariable(
- "maven.ant.project");
+
+ org.apache.tools.ant.Project antProject = (org.apache.tools.ant.Project)
+ context.getVariable(MavenJellyContext.MAVEN_ANT_PROJECT);
+
Path classpath = new Path(antProject);
for (Iterator i = mavenProject.getDependencies().iterator();
@@ -185,8 +184,8 @@
continue;
}
- String mavenJarProperty =
- (String) context.getVariable("maven.jar." + d.getId());
+ String mavenJarProperty = (String) context.getVariable("maven.jar." +
d.getId());
+
Path path = new Path(antProject);
if (mavenJarOverride
@@ -207,7 +206,7 @@
classpath.append(path);
- mavenProject.setDependencyPath(d.getId(), path.toString());
+ getMavenProject().setDependencyPath(d.getId(), path.toString());
}
if (refid != null)
--
To unsubscribe, e-mail: <mailto:turbine-maven-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:turbine-maven-dev-help@;jakarta.apache.org>
