jvanzyl 02/04/18 07:51:26
Modified: src/java/org/apache/maven ProjectProperties.java
src/java/org/apache/maven/reactor ReactorGenerator.java
Log:
Starting to use ant utils in ProjectProperties task.
Revision Changes Path
1.24 +6 -59
jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java
Index: ProjectProperties.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ProjectProperties.java 8 Apr 2002 01:30:44 -0000 1.23
+++ ProjectProperties.java 18 Apr 2002 14:51:26 -0000 1.24
@@ -62,6 +62,7 @@
import org.apache.commons.lang.Strings;
+import org.apache.maven.ant.AntUtils;
import org.apache.maven.executor.ProjectExecutor;
import org.apache.maven.project.Dependency;
@@ -75,7 +76,7 @@
* paths required to build the project.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ProjectProperties.java,v 1.23 2002/04/08 01:30:44 kaz Exp $
+ * @version $Id: ProjectProperties.java,v 1.24 2002/04/18 14:51:26 jvanzyl Exp $
*/
public class ProjectProperties
extends ProjectExecutor
@@ -187,7 +188,7 @@
getProject().setProperty("unitTestSourcesPresent", "true");
log("Creating unit test class entries reference ...");
- createPatternSetReference("unit.test.set",
+ AntUtils.createPatternSetReference(getProject(),"unit.test.set",
mavenProject.getBuild().getUnitTestPatterns());
}
}
@@ -202,7 +203,7 @@
getProject().setProperty("integrationUnitTestSourcesPresent",
"true");
log("Creating integration unit test class entries reference ...");
- createPatternSetReference("integration.unit.test.set",
+
AntUtils.createPatternSetReference(getProject(),"integration.unit.test.set",
mavenProject.getBuild().getIntegrationUnitTestPatterns());
}
}
@@ -239,7 +240,7 @@
Dependency dep = (Dependency)i.next();
depNames.add(dep.getJar());
} // end of for (Iterator = .iterator(); .hasNext();)
- createPatternSetReference("dependency.set", depNames);
+ AntUtils.createPatternSetReference(getProject(),"dependency.set", depNames);
}
// Create the source directories reference.
@@ -261,60 +262,6 @@
}
/**
- * Create the source directories reference.
- */
- private void createPatternSetReference(String reference, List patterns)
- {
- StringBuffer includesSb = new StringBuffer();
- StringBuffer excludesSb = new StringBuffer();
- PatternSet patternSet = new PatternSet();
-
- for (Iterator i = patterns.iterator(); i.hasNext();)
- {
- String line = (String) i.next();
- line = line.trim();
-
- if (line.startsWith("include"))
- {
- // We have something like the following pattern:
- // include = conf/foo.xml
- includesSb.append(Strings.split(line,"=",-1)[1]).append(',');
-
- }
- else if (line.startsWith("exclude"))
- {
- // We have something like the following pattern:
- // exclude = conf/foo.xml
- excludesSb.append(Strings.split(line,"=",-1)[1]).append(',');
- }
- else
- {
- // We have a jar descriptor file
- includesSb.append(line).append(',');
- }
- }
-
- String includes = includesSb.toString();
- String excludes = excludesSb.toString();
-
- if (includes.length() > 0)
- {
- // Remove trailing comma
- includes = includes.substring(0,includes.length()-1);
- patternSet.setIncludes(includes);
- }
-
- if (excludes.length() > 0)
- {
- // Remove trailing comma
- excludes = excludes.substring(0,excludes.length()-1);
- patternSet.setExcludes(excludes);
- }
-
- getProject().addReference(reference, patternSet);
- }
-
- /**
* Possibly sets <code>jar.resources.present</code> if there are
* resources, and sets the <code>jar.resources.set</code> list.
*/
@@ -325,7 +272,7 @@
getProject().setProperty("jar.resources.present", "true");
}
- createPatternSetReference("jar.resources.set",
+ AntUtils.createPatternSetReference(getProject(),"jar.resources.set",
mavenProject.getBuild().getJarResources());
}
1.4 +23 -13
jakarta-turbine-maven/src/java/org/apache/maven/reactor/ReactorGenerator.java
Index: ReactorGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/reactor/ReactorGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReactorGenerator.java 17 Apr 2002 18:07:10 -0000 1.3
+++ ReactorGenerator.java 18 Apr 2002 14:51:26 -0000 1.4
@@ -72,13 +72,15 @@
import org.apache.velocity.VelocityContext;
import org.apache.velocity.texen.ant.TexenTask;
+import org.apache.tools.ant.BuildException;
+
import org.apache.maven.executor.AbstractExecutor;
/**
* Task for controlling a multi-project build.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: ReactorGenerator.java,v 1.3 2002/04/17 18:07:10 jvanzyl Exp $
+ * @version $Id: ReactorGenerator.java,v 1.4 2002/04/18 14:51:26 jvanzyl Exp $
*/
public class ReactorGenerator
extends TexenTask
@@ -108,27 +110,35 @@
return workspaceDescriptor;
}
+ protected Context context;
+
/**
* Execute the the overall maven opertion.
*
* @throws BuildException
*/
- public Context initContext()
+ public Context initControlContext()
throws Exception
{
- Context context = new VelocityContext();
-
- Mapper workspaceMapper = new Mapper();
-
- workspaceMapper.setInclusionRule("profile", "../profile");
- workspaceMapper.setInclusionRule("project", "../project");
-
- Workspace workspace =
- (Workspace) workspaceMapper.map(workspaceDescriptor,
Workspace.class.getName());
+ context = new VelocityContext();
- context.put("workspace", workspace);
+ try
+ {
+ Mapper m = new Mapper();
+
+ m.setDebug(true);
+
+ m.setInclusionRule("profile", "../profile");
+ m.setInclusionRule("project", "../project");
+ Workspace w = (Workspace) m.map(workspaceDescriptor,
Workspace.class.getName());
+ context.put("workspace", w);
- return context;
+ return context;
+ }
+ catch (Exception e)
+ {
+ throw new BuildException(e);
+ }
}
/**
