dion 02/05/22 18:17:01
Modified: src/java/org/apache/maven ProjectProperties.java
src/java/org/apache/maven/executor AbstractExecutor.java
Log:
no message
Revision Changes Path
1.33 +58 -42
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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ProjectProperties.java 7 May 2002 16:09:40 -0000 1.32
+++ ProjectProperties.java 23 May 2002 01:17:01 -0000 1.33
@@ -70,9 +70,8 @@
import org.apache.maven.project.Dependency;
import org.apache.maven.project.Distribution;
-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.PatternSet;
+import org.apache.tools.ant.Project;
/**
* {@link org.apache.maven.executor.Executor} which takes values from
@@ -80,7 +79,8 @@
* paths required to build the project.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ProjectProperties.java,v 1.32 2002/05/07 16:09:40 glennm Exp $
+ * @author <a href="[EMAIL PROTECTED]">Vincent Massol</a>
+ * @version $Id: ProjectProperties.java,v 1.33 2002/05/23 01:17:01 dion Exp $
*/
public class ProjectProperties
extends ProjectExecutor
@@ -91,9 +91,7 @@
private String libRepo;
/**
- * Execute the task.
- *
- * @throws BuildException
+ * @see ProjectExecutor#doExecute()
*/
public void doExecute()
throws Exception
@@ -138,10 +136,10 @@
return;
}
- log("Creating classpath reference ...");
+ log("Creating classpath reference ...", Project.MSG_DEBUG);
createClasspathReference();
- log("Creating dependency.set ...");
+ log("Creating dependency.set ...", Project.MSG_DEBUG);
createDependencySet();
// If a project does not have any sources then there isn't
@@ -151,12 +149,12 @@
getProject().setProperty("maven.sourcesPresent", "true");
}
- log("Creating source set reference ...");
+ log("Creating source set reference ...", Project.MSG_DEBUG);
createPathReference("maven.src.set",
getMavenProject().getBuild().getSourceDirectories());
- log("Creating aspect source set reference ...");
+ log("Creating aspect source set reference ...", Project.MSG_DEBUG);
createPathReference("maven.src.aspect.set",
getMavenProject().getBuild().getAspectSourceDirectories());
@@ -164,13 +162,13 @@
String mavenPrepareSourceDirectory =
getProject().getProperty("maven.prepareSourceDirectory");
- System.out.println("mpsd => " + mavenPrepareSourceDirectory);
+ log("mpsd => " + mavenPrepareSourceDirectory, Project.MSG_DEBUG);
if (mavenPrepareSourceDirectory != null)
{
AntUtils.createPatternSetReferenceFromPaths(
- getProject(),"maven.src.set.patternset",
- getMavenProject().getBuild().getSourceDirectories());
+ getProject(),"maven.src.set.patternset",
+ getMavenProject().getBuild().getSourceDirectories());
Path srcSet = new Path(getProject());
Path p = new Path(getProject());
@@ -184,39 +182,47 @@
getMavenProject().getBuild().getSourceDirectories());
}
- if
(!Strings.isEmpty(getMavenProject().getBuild().getUnitTestSourceDirectory()))
+ if (!Strings.isEmpty(
+ getMavenProject().getBuild().getUnitTestSourceDirectory()))
{
File utdir = new File(getProject().getProperty("basedir"),
-
getMavenProject().getBuild().getUnitTestSourceDirectory());
+ getMavenProject().getBuild().getUnitTestSourceDirectory());
if ( utdir.exists() )
{
- getProject().setProperty("maven.unitTestSourceDirectory",
utdir.getCanonicalPath());
- getProject().setProperty("maven.unitTestSourcesPresent", "true");
-
- log("Creating unit test class entries reference ...");
-
AntUtils.createPatternSetReference(getProject(),"maven.unit.test.set",
+ getProject().setProperty("maven.unitTestSourceDirectory",
+ utdir.getCanonicalPath());
+ getProject().setProperty("maven.unitTestSourcesPresent",
+ "true");
+
+ log("Creating unit test class entries reference ...",
+ Project.MSG_DEBUG);
+ AntUtils.createPatternSetReference(getProject(),
+ "maven.unit.test.set",
getMavenProject().getBuild().getUnitTestPatterns());
}
}
- if
(!Strings.isEmpty(getMavenProject().getBuild().getIntegrationUnitTestSourceDirectory()))
+ if (!Strings.isEmpty(getMavenProject().getBuild().
+ getIntegrationUnitTestSourceDirectory()))
{
File utdir = new File(getProject().getProperty("basedir"),
-
getMavenProject().getBuild().getIntegrationUnitTestSourceDirectory());
- if ( utdir.exists() )
+ getMavenProject().getBuild().
+ getIntegrationUnitTestSourceDirectory());
+ if (utdir.exists())
{
getProject().setProperty(
- "maven.integrationUnitTestSourceDirectory",
- utdir.getCanonicalPath());
+ "maven.integrationUnitTestSourceDirectory",
+ utdir.getCanonicalPath());
getProject().setProperty(
- "maven.integrationUnitTestSourcesPresent",
- "true");
+ "maven.integrationUnitTestSourcesPresent",
+ "true");
- log("Creating integration unit test class entries reference ...");
+ log("Creating integration unit test class entries reference ..."
+ , Project.MSG_DEBUG);
AntUtils.createPatternSetReference(
- getProject(),"maven.integration.unit.test.set",
-
getMavenProject().getBuild().getIntegrationUnitTestPatterns());
+ getProject(),"maven.integration.unit.test.set",
+ getMavenProject().getBuild().getIntegrationUnitTestPatterns());
}
}
@@ -236,7 +242,8 @@
if (value.length() > 0 && getProject().getProperty(key) == null)
{
- getProject().setProperty("maven." + key, (String)values.get(key));
+ getProject().setProperty("maven." + key,
+ (String)values.get(key));
}
}
}
@@ -248,7 +255,8 @@
{
Path classpath = new Path(getProject());
- for (Iterator i = getMavenProject().getDependencies().iterator();
i.hasNext();)
+ for (Iterator i = getMavenProject().getDependencies().iterator();
+ i.hasNext();)
{
Dependency dependency = (Dependency) i.next();
@@ -266,15 +274,22 @@
private void createDependencySet()
{
List depNames = new Vector(getMavenProject().getDependencies().size());
- for (Iterator i = getMavenProject().getDependencies().iterator();
i.hasNext();)
+ for (Iterator i = getMavenProject().getDependencies().iterator();
+ i.hasNext();)
{
Dependency dep = (Dependency)i.next();
depNames.add(dep.getJar());
} // end of for (Iterator = .iterator(); .hasNext();)
- AntUtils.createPatternSetReference(getProject(),"maven.dependency.set",
depNames);
+ AntUtils.createPatternSetReference(getProject(),"maven.dependency.set",
+ depNames);
}
- // Create the source directories reference.
+ /**
+ * Create the source directories reference.
+ *
+ * @param reference
+ * @param directories
+ */
private void createPathReference(String reference, List directories)
{
Path srcSet = new Path(getProject());
@@ -287,7 +302,8 @@
srcSet.append(p);
}
- log("Adding Reference " + reference + " with a value of " + srcSet);
+ log("Adding Reference " + reference + " with a value of " + srcSet,
+ Project.MSG_DEBUG);
getProject().addReference(reference, srcSet);
}
@@ -303,20 +319,20 @@
getProject().setProperty("maven.jar.resources.present", "true");
}
- AntUtils.createPatternSetReference(getProject(),"maven.jar.resources.set",
+ AntUtils.createPatternSetReference(getProject(),
+ "maven.jar.resources.set",
getMavenProject().getBuild().getJarResources());
-
}
private void createOrganizationProperties()
{
if (getMavenProject().getOrganization() != null)
{
- getProject().setProperty( "maven.organization",
- getMavenProject().getOrganization().getName() );
+ getProject().setProperty("maven.organization",
+ getMavenProject().getOrganization().getName());
- getProject().setProperty( "maven.organization.url",
- getMavenProject().getOrganization().getUrl() );
+ getProject().setProperty("maven.organization.url",
+ getMavenProject().getOrganization().getUrl());
}
}
1.4 +10 -1
jakarta-turbine-maven/src/java/org/apache/maven/executor/AbstractExecutor.java
Index: AbstractExecutor.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/executor/AbstractExecutor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractExecutor.java 23 May 2002 01:04:37 -0000 1.3
+++ AbstractExecutor.java 23 May 2002 01:17:01 -0000 1.4
@@ -65,7 +65,7 @@
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="[EMAIL PROTECTED]">Vincent Massol</a>
- * @version $Id: AbstractExecutor.java,v 1.3 2002/05/23 01:04:37 dion Exp $
+ * @version $Id: AbstractExecutor.java,v 1.4 2002/05/23 01:17:01 dion Exp $
*/
public abstract class AbstractExecutor
implements Executor
@@ -102,4 +102,13 @@
project.log(message);
}
+ /** Log using the Ant Project Logger at a given level
+ * @param message the message to be logged
+ * @param level the message level as an int.
+ * @see Project#MSG_DEBUG
+ */
+ public void log(String message, int level)
+ {
+ project.log(message, level);
+ }
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
