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 2004/01/25 01:29:11 UTC
cvs commit: maven-components/maven-core/src/test/java/org/apache/maven/util MD5SumTest.java
jvanzyl 2004/01/24 16:29:11
Modified: maven-core bootstrap.sh project.xml
maven-core/src/java/org/apache/maven Compat.java Maven.java
plexus.xml
maven-core/src/java/org/apache/maven/jelly
MavenJellyContext.java
maven-core/src/java/org/apache/maven/jelly/tags/ant
AntTag.java AntTagLibrary.java FileScannerTag.java
SetPropertyTag.java
maven-core/src/java/org/apache/maven/jelly/tags/maven
AddPathTag.java CopyResources.java
MakeAbsolutePathTag.java MakeRelativePathTag.java
MavenTag.java MavenTagLibrary.java ParamCheck.java
PluginVarTag.java PomTag.java PropertyTag.java
ReactorTag.java RootRelativePathTag.java
SnapshotSignature.java UserCheck.java
maven-core/src/java/org/apache/maven/jelly/tags/werkz
GoalTag.java MavenAttainGoalListener.java
MavenProjectTag.java MavenWerkzTagLibrary.java
WerkzTagSupport.java
maven-core/src/java/org/apache/maven/plugin
DependencyClasspathBuilder.java
JellyPluginScriptHousing.java
MavenClasspathBuilder.java PluginManager.java
maven-core/src/java/org/apache/maven/util MavenTool.java
maven-core/src/java/org/apache/maven/verifier
DependencyVerifier.java LocalSettingsVerifier.java
maven-core/src/test/java/org/apache/maven/util
MD5SumTest.java
Log:
o following changes from maven-project
Revision Changes Path
1.4 +1 -1 maven-components/maven-core/bootstrap.sh
Index: bootstrap.sh
===================================================================
RCS file: /home/cvs/maven-components/maven-core/bootstrap.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bootstrap.sh 10 Jan 2004 08:37:09 -0000 1.3
+++ bootstrap.sh 25 Jan 2004 00:29:10 -0000 1.4
@@ -30,7 +30,7 @@
# We need to build and install the surefire-runner first.
(
- cd ../../maven-plugins/surefire/src/surefire-runner
+ cd ../surefire-runner
mboot --leave-boot-files
1.6 +10 -0 maven-components/maven-core/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 18 Jan 2004 22:14:39 -0000 1.5
+++ project.xml 25 Jan 2004 00:29:10 -0000 1.6
@@ -187,6 +187,16 @@
<includes>
<include>**/*Test.java</include>
</includes>
+ <resources>
+ <resource>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.jelly</include>
+ <include>**/*.xml</include>
+ <include>**/*.txt</include>
+ </includes>
+ </resource>
+ </resources>
</unitTest>
<resources>
<resource>
1.2 +9 -9 maven-components/maven-core/src/java/org/apache/maven/Compat.java
Index: Compat.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/Compat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Compat.java 8 Jan 2004 04:29:10 -0000 1.1
+++ Compat.java 25 Jan 2004 00:29:10 -0000 1.2
@@ -58,12 +58,12 @@
import com.werken.forehead.Forehead;
import com.werken.forehead.ForeheadClassLoader;
-import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.MavenArtifact;
import org.apache.maven.jelly.MavenJellyContext;
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.DependencyClasspathBuilder;
import org.apache.maven.plugin.PluginManager;
-import org.apache.maven.project.Project;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.verifier.ChecksumVerificationException;
import org.apache.maven.verifier.DependencyVerifier;
import org.apache.maven.verifier.RepoConfigException;
@@ -107,12 +107,12 @@
return false;
}
- public static boolean hasMavenXml( Project project )
+ public static boolean hasMavenXml( MavenProject project )
{
return new File( project.getFile().getParentFile(), "maven.xml" ).exists();
}
- public static File getMavenXml( Project project )
+ public static File getMavenXml( MavenProject project )
{
return new File( project.getFile().getParentFile(), "maven.xml" );
}
@@ -121,7 +121,7 @@
public static DependencyVerifier dependencyVerifier;
- public static void verifyDependencies( Project project )
+ public static void verifyDependencies( MavenProject project )
throws RepoConfigException,
UnsatisfiedDependencyException,
ChecksumVerificationException
@@ -140,7 +140,7 @@
*
* @throws java.net.MalformedURLException
*/
- public static void processDependencies( Project project, MavenJellyContext context )
+ public static void processDependencies( MavenProject project, MavenJellyContext context )
throws MalformedURLException, Exception
{
List artifacts = project.getArtifacts();
@@ -160,7 +160,7 @@
{
ForeheadClassLoader loader = (ForeheadClassLoader) projectClassLoader;
- Artifact artifact = (Artifact) i.next();
+ MavenArtifact artifact = (MavenArtifact) i.next();
Dependency dependency = artifact.getDependency();
@@ -202,7 +202,7 @@
context.setClassLoader( projectClassLoader );
}
- public static String getDependencyClasspath( Project project )
+ public static String getDependencyClasspath( MavenProject project )
throws Exception
{
return DependencyClasspathBuilder.build( project );
1.2 +15 -15 maven-components/maven-core/src/java/org/apache/maven/Maven.java
Index: Maven.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/Maven.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Maven.java 8 Jan 2004 04:29:12 -0000 1.1
+++ Maven.java 25 Jan 2004 00:29:10 -0000 1.2
@@ -57,7 +57,7 @@
*/
import org.apache.maven.plugin.PluginManager;
-import org.apache.maven.project.Project;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.util.CollectionUtils;
import org.codehaus.plexus.util.StringUtils;
@@ -115,7 +115,7 @@
private Map properties;
/** Maven Utils for building projects. */
- private MavenUtils mavenUtils;
+ private MavenStaticUtils mavenUtils;
// ------------------------------------------------------------
// C O N S T R U C T O R S
@@ -125,7 +125,7 @@
public Maven()
throws Exception
{
- mavenUtils = new MavenUtils();
+ mavenUtils = new MavenStaticUtils();
pluginManager = new PluginManager( this );
@@ -229,7 +229,7 @@
{
if ( project.length() == 0 )
{
- throw new Exception( MavenUtils.getMessage( "empty.descriptor.error",
+ throw new Exception( MavenStaticUtils.getMessage( "empty.descriptor.error",
project.getName() ) );
}
}
@@ -243,7 +243,7 @@
attainGoals( project, list( goalNamesList ) );
}
- public void attainGoals( Project project, String goalNamesList )
+ public void attainGoals( MavenProject project, String goalNamesList )
throws GoalException, Exception
{
getPluginManager().attainGoals( project, list( goalNamesList ) );
@@ -264,7 +264,7 @@
}
- public void attainGoals( Project project, List goalNames )
+ public void attainGoals( MavenProject project, List goalNames )
throws GoalException, Exception
{
getPluginManager().attainGoals( project, goalNames );
@@ -291,14 +291,14 @@
Properties systemProperties = System.getProperties();
File userBuildPropertiesFile = new File( System.getProperty( "user.home" ), "build.properties" );
- Properties userBuildProperties = MavenUtils.loadProperties( userBuildPropertiesFile );
+ Properties userBuildProperties = MavenStaticUtils.loadProperties( userBuildPropertiesFile );
- Properties driverProperties = MavenUtils.loadProperties(
- MavenUtils.class.getClassLoader().getResourceAsStream(
+ Properties driverProperties = MavenStaticUtils.loadProperties(
+ MavenStaticUtils.class.getClassLoader().getResourceAsStream(
MavenConstants.DRIVER_PROPERTIES ) );
- Properties defaultProperties = MavenUtils.loadProperties(
- MavenUtils.class.getClassLoader().getResourceAsStream(
+ Properties defaultProperties = MavenStaticUtils.loadProperties(
+ MavenStaticUtils.class.getClassLoader().getResourceAsStream(
MavenConstants.DEFAULTS_PROPERTIES ) );
Map result = CollectionUtils.mergeMaps( new Map[]
@@ -330,16 +330,16 @@
public List getProjects( File directory, String includes, String excludes )
throws Exception
{
- return MavenUtils.getProjects( directory, includes, excludes );
+ return MavenStaticUtils.getProjects( directory, includes, excludes );
}
- public Project getProject( File project )
+ public MavenProject getProject( File project )
throws Exception
{
return mavenUtils.getProject( project );
}
- public Project getProject( File project, boolean useParent )
+ public MavenProject getProject( File project, boolean useParent )
throws Exception
{
return mavenUtils.getProject( project, useParent );
1.3 +5 -5 maven-components/maven-core/src/java/org/apache/maven/plexus.xml
Index: plexus.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/plexus.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plexus.xml 24 Jan 2004 15:42:01 -0000 1.2
+++ plexus.xml 25 Jan 2004 00:29:10 -0000 1.3
@@ -1,8 +1,8 @@
<configuration>
<components>
<component>
- <role>org.apache.maven.project.ProjectBuilder</role>
- <implementation>org.apache.maven.project.DefaultProjectBuilder</implementation>
+ <role>org.apache.maven.project.MavenProjectBuilder</role>
+ <implementation>org.apache.maven.project.DefaultMavenProjectBuilder</implementation>
<requirements>
<requirement>
<role>org.apache.maven.model.ModelUnmarshaller</role>
@@ -11,7 +11,7 @@
<role>org.apache.maven.model.ModelMarshaller</role>
</requirement>
<requirement>
- <role>org.apache.maven.artifact.Artifactory</role>
+ <role>org.apache.maven.artifact.MavenArtifactory</role>
</requirement>
</requirements>
</component>
@@ -24,8 +24,8 @@
<implementation>org.apache.maven.model.DefaultModelMarshaller</implementation>
</component>
<component>
- <role>org.apache.maven.artifact.Artifactory</role>
- <implementation>org.apache.maven.artifact.DefaultArtifactory</implementation>
+ <role>org.apache.maven.artifact.MavenArtifactory</role>
+ <implementation>org.apache.maven.artifact.DefaultMavenArtifactory</implementation>
</component>
</components>
</configuration>
1.3 +5 -5 maven-components/maven-core/src/java/org/apache/maven/jelly/MavenJellyContext.java
Index: MavenJellyContext.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/MavenJellyContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MavenJellyContext.java 10 Jan 2004 08:37:09 -0000 1.2
+++ MavenJellyContext.java 25 Jan 2004 00:29:10 -0000 1.3
@@ -64,7 +64,7 @@
import org.apache.maven.jelly.tags.jeez.MavenJeezTagLibrary;
import org.apache.maven.jelly.tags.maven.MavenTagLibrary;
import org.apache.maven.jelly.tags.ant.AntTagLibrary;
-import org.apache.maven.project.Project;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.werkz.WerkzProject;
import java.net.URL;
@@ -242,7 +242,7 @@
*
* @param project The maven project.
*/
- public void setProject( Project project )
+ public void setProject( MavenProject project )
{
setVariable( MavenConstants.MAVEN_POM, project );
}
@@ -252,9 +252,9 @@
*
* @return The maven project.
*/
- public Project getProject()
+ public MavenProject getProject()
{
- return (Project) getVariable( MavenConstants.MAVEN_POM );
+ return (MavenProject) getVariable( MavenConstants.MAVEN_POM );
}
/**
1.3 +6 -2 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/ant/AntTag.java
Index: AntTag.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/ant/AntTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AntTag.java 10 Jan 2004 16:41:24 -0000 1.2
+++ AntTag.java 25 Jan 2004 00:29:10 -0000 1.3
@@ -74,6 +74,8 @@
import org.apache.tools.ant.TaskAdapter;
import org.apache.tools.ant.TaskContainer;
import org.apache.tools.ant.types.DataType;
+import org.apache.maven.jelly.tags.MavenTagSupport;
+import org.apache.maven.jelly.MavenJellyContext;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
@@ -81,7 +83,9 @@
import java.util.Iterator;
import java.util.Map;
-public class AntTag extends MapTagSupport implements TaskSource
+public class AntTag
+ extends MapTagSupport
+ implements TaskSource
{
private static final Log log = LogFactory.getLog( AntTag.class );
@@ -326,7 +330,7 @@
public Project getAntProject()
{
- Project project = AntTagLibrary.getProject( context );
+ Project project = ((MavenJellyContext)context).getAntProject();
if ( project == null )
{
1.4 +12 -54 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/ant/AntTagLibrary.java
Index: AntTagLibrary.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/ant/AntTagLibrary.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AntTagLibrary.java 10 Jan 2004 16:30:36 -0000 1.3
+++ AntTagLibrary.java 25 Jan 2004 00:29:10 -0000 1.4
@@ -57,17 +57,11 @@
import org.apache.commons.beanutils.ConvertUtils;
import org.apache.commons.beanutils.Converter;
-import org.apache.commons.jelly.JellyContext;
import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.TagLibrary;
import org.apache.commons.jelly.impl.TagFactory;
import org.apache.commons.jelly.impl.TagScript;
-import org.apache.maven.grant.GrantProject;
-import org.apache.maven.jelly.JellyPropsHandler;
-import org.apache.tools.ant.BuildLogger;
-import org.apache.tools.ant.NoBannerLogger;
-import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Reference;
import org.xml.sax.Attributes;
@@ -96,6 +90,7 @@
else if ( value != null )
{
String text = value.toString();
+
return new Reference( text );
}
return null;
@@ -108,12 +103,16 @@
/*
ConvertUtils.register(
- new Converter() {
- public Object convert(Class type, Object value) {
- if ( value instanceof EnumeratedAttribute ) {
+ new Converter()
+ {
+ public Object convert( Class type, Object value )
+ {
+ if ( value instanceof EnumeratedAttribute )
+ {
return (EnumeratedAttribute) value;
}
- else if ( value instanceof String ) {
+ else if ( value instanceof String )
+ {
FormatterElement.TypeAttribute attr = new FormatterElement.TypeAttribute();
attr.setValue( (String) value );
return attr;
@@ -123,49 +122,8 @@
},
FormatterElement.TypeAttribute.class
- );
- */
- }
-
- public static Project getProject( JellyContext context )
- {
- Project project = (Project) context.findVariable( PROJECT_CONTEXT_HANDLE );
-
- if ( project == null )
- {
- project = createProject( context );
-
- context.setVariable( PROJECT_CONTEXT_HANDLE, project );
- }
- return project;
- }
-
- public static void setProject( JellyContext context, Project project )
- {
- context.setVariable( PROJECT_CONTEXT_HANDLE, project );
- }
-
- public static Project createProject( JellyContext context )
- {
- GrantProject project = new GrantProject();
-
- project.setPropsHandler( new JellyPropsHandler( context ) );
-
- BuildLogger logger = new NoBannerLogger();
-
- logger.setMessageOutputLevel( org.apache.tools.ant.Project.MSG_INFO );
-
- logger.setOutputPrintStream( System.out );
-
- logger.setErrorPrintStream( System.err );
-
- project.addBuildListener( logger );
-
- project.init();
-
- project.getBaseDir();
-
- return project;
+ );
+ */
}
public TagScript createTagScript( String name, Attributes attributes ) throws JellyException
1.3 +6 -6 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/ant/FileScannerTag.java
Index: FileScannerTag.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/ant/FileScannerTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FileScannerTag.java 10 Jan 2004 16:41:24 -0000 1.2
+++ FileScannerTag.java 25 Jan 2004 00:29:10 -0000 1.3
@@ -58,8 +58,8 @@
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
+import org.apache.maven.jelly.tags.MavenTagSupport;
import java.lang.reflect.InvocationTargetException;
@@ -71,10 +71,9 @@
* @version $Revision$
*/
public class FileScannerTag
- extends TagSupport
+ extends MavenTagSupport
implements TaskSource
{
-
/** The file walker that gets created */
private FileScanner fileScanner;
@@ -88,9 +87,10 @@
// Tag interface
//-------------------------------------------------------------------------
- public void doTag( XMLOutput output ) throws MissingAttributeException, JellyTagException
+ public void doTag( XMLOutput output )
+ throws MissingAttributeException, JellyTagException
{
- fileScanner.setProject( AntTagLibrary.getProject( context ) );
+ fileScanner.setProject( getMavenContext().getAntProject() );
fileScanner.clear();
1.3 +2 -2 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/ant/SetPropertyTag.java
Index: SetPropertyTag.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/ant/SetPropertyTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SetPropertyTag.java 10 Jan 2004 16:41:24 -0000 1.2
+++ SetPropertyTag.java 25 Jan 2004 00:29:10 -0000 1.3
@@ -58,8 +58,8 @@
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
-import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
+import org.apache.maven.jelly.tags.MavenTagSupport;
/**
* Tag which sets an attribute on the parent Ant Task if the given value is not null.
@@ -69,7 +69,7 @@
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
*/
public class SetPropertyTag
- extends TagSupport
+ extends MavenTagSupport
{
private String name;
1.2 +3 -3 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/AddPathTag.java
Index: AddPathTag.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/AddPathTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AddPathTag.java 8 Jan 2004 22:20:48 -0000 1.1
+++ AddPathTag.java 25 Jan 2004 00:29:10 -0000 1.2
@@ -60,7 +60,7 @@
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
import org.apache.maven.grant.GrantProject;
-import org.apache.maven.jelly.tags.BaseTagSupport;
+import org.apache.maven.jelly.tags.MavenTagSupport;
import org.apache.tools.ant.types.Path;
/**
@@ -71,7 +71,7 @@
* @version $Id$
*/
public class AddPathTag
- extends BaseTagSupport
+ extends MavenTagSupport
{
/** the id of the path to be appended to. */
private String id;
1.2 +4 -4 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/CopyResources.java
Index: CopyResources.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/CopyResources.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CopyResources.java 8 Jan 2004 22:20:49 -0000 1.1
+++ CopyResources.java 25 Jan 2004 00:29:10 -0000 1.2
@@ -61,7 +61,7 @@
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.maven.jelly.tags.BaseTagSupport;
+import org.apache.maven.jelly.tags.MavenTagSupport;
import org.apache.maven.model.Resource;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.PatternSet;
@@ -76,10 +76,10 @@
* @author dion
* @version $Revision$
*/
-public class CopyResources extends BaseTagSupport
+public class CopyResources extends MavenTagSupport
{
/** log for debug output */
- private static final Log log = LogFactory.getLog( BaseTagSupport.class );
+ private static final Log log = LogFactory.getLog( MavenTagSupport.class );
/** the resources to copy */
private List resources;
1.2 +2 -2 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/MakeAbsolutePathTag.java
Index: MakeAbsolutePathTag.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/MakeAbsolutePathTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MakeAbsolutePathTag.java 8 Jan 2004 22:20:50 -0000 1.1
+++ MakeAbsolutePathTag.java 25 Jan 2004 00:29:10 -0000 1.2
@@ -59,7 +59,7 @@
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.maven.jelly.tags.BaseTagSupport;
+import org.apache.maven.jelly.tags.MavenTagSupport;
import java.io.File;
import java.io.IOException;
@@ -70,7 +70,7 @@
*
* @author Brett Porter <a href="mailto:brett@apache.org">brett@apache.org</a>
*/
-public class MakeAbsolutePathTag extends BaseTagSupport
+public class MakeAbsolutePathTag extends MavenTagSupport
{
/** The base dir. */
private File basedir;
1.2 +2 -2 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/MakeRelativePathTag.java
Index: MakeRelativePathTag.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/MakeRelativePathTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MakeRelativePathTag.java 8 Jan 2004 22:20:50 -0000 1.1
+++ MakeRelativePathTag.java 25 Jan 2004 00:29:10 -0000 1.2
@@ -59,7 +59,7 @@
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.maven.jelly.tags.BaseTagSupport;
+import org.apache.maven.jelly.tags.MavenTagSupport;
import java.io.File;
import java.io.IOException;
@@ -70,7 +70,7 @@
*
* @author Brett Porter <a href="mailto:brett@apache.org">brett@apache.org</a>
*/
-public class MakeRelativePathTag extends BaseTagSupport
+public class MakeRelativePathTag extends MavenTagSupport
{
/** The base dir. */
private File basedir;
1.2 +3 -3 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/MavenTag.java
Index: MavenTag.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/MavenTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenTag.java 8 Jan 2004 22:20:49 -0000 1.1
+++ MavenTag.java 25 Jan 2004 00:29:10 -0000 1.2
@@ -59,7 +59,7 @@
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.maven.jelly.tags.BaseTagSupport;
+import org.apache.maven.jelly.tags.MavenTagSupport;
import java.io.File;
@@ -74,7 +74,7 @@
* @todo get rid of 'throws Exception'
*/
public class MavenTag
- extends BaseTagSupport
+ extends MavenTagSupport
{
/** maven project descriptor */
private File descriptor;
1.2 +4 -3 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/MavenTagLibrary.java
Index: MavenTagLibrary.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/MavenTagLibrary.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenTagLibrary.java 8 Jan 2004 22:20:49 -0000 1.1
+++ MavenTagLibrary.java 25 Jan 2004 00:29:10 -0000 1.2
@@ -56,7 +56,7 @@
* ====================================================================
*/
-import org.apache.maven.jelly.tags.BaseTagLibrary;
+import org.apache.commons.jelly.tags.core.CoreTagLibrary;
/**
* MavenSession tag library for use in Jelly scripts.
@@ -66,7 +66,8 @@
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
* @version $Id$
*/
-public class MavenTagLibrary extends BaseTagLibrary
+public class MavenTagLibrary
+ extends CoreTagLibrary
{
/**
* Create an instance of the {@link MavenTagLibrary}, registering related
1.2 +2 -2 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/ParamCheck.java
Index: ParamCheck.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/ParamCheck.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParamCheck.java 8 Jan 2004 22:20:51 -0000 1.1
+++ ParamCheck.java 25 Jan 2004 00:29:10 -0000 1.2
@@ -58,12 +58,12 @@
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.maven.jelly.tags.BaseTagSupport;
+import org.apache.maven.jelly.tags.MavenTagSupport;
/**
* @author dion
*/
-public class ParamCheck extends BaseTagSupport
+public class ParamCheck extends MavenTagSupport
{
/** the value to check */
private String value;
1.2 +2 -2 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/PluginVarTag.java
Index: PluginVarTag.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/PluginVarTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PluginVarTag.java 8 Jan 2004 22:20:49 -0000 1.1
+++ PluginVarTag.java 25 Jan 2004 00:29:10 -0000 1.2
@@ -61,7 +61,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.maven.jelly.MavenJellyContext;
-import org.apache.maven.jelly.tags.BaseTagSupport;
+import org.apache.maven.jelly.tags.MavenTagSupport;
import java.util.Map;
@@ -69,7 +69,7 @@
* @author dion
*/
public class PluginVarTag
- extends BaseTagSupport
+ extends MavenTagSupport
{
/** log for debug output */
private static final Log log = LogFactory.getLog( PluginVarTag.class );
1.2 +5 -5 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/PomTag.java
Index: PomTag.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/PomTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PomTag.java 8 Jan 2004 22:20:49 -0000 1.1
+++ PomTag.java 25 Jan 2004 00:29:10 -0000 1.2
@@ -59,8 +59,8 @@
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.maven.MavenUtils;
-import org.apache.maven.jelly.tags.BaseTagSupport;
+import org.apache.maven.MavenStaticUtils;
+import org.apache.maven.jelly.tags.MavenTagSupport;
import java.io.File;
@@ -71,7 +71,7 @@
* @version $Id$
*/
public class PomTag
- extends BaseTagSupport
+ extends MavenTagSupport
{
/** MavenSession project descriptor. */
private File projectDescriptor;
@@ -122,7 +122,7 @@
try
{
- context.setVariable( var, MavenUtils.getProject( projectDescriptor, false ) );
+ context.setVariable( var, MavenStaticUtils.getProject( projectDescriptor, false ) );
}
catch ( Exception e )
{
1.2 +2 -2 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/PropertyTag.java
Index: PropertyTag.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/PropertyTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PropertyTag.java 8 Jan 2004 22:20:51 -0000 1.1
+++ PropertyTag.java 25 Jan 2004 00:29:10 -0000 1.2
@@ -59,7 +59,7 @@
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.maven.jelly.tags.BaseTagSupport;
+import org.apache.maven.jelly.tags.MavenTagSupport;
/**
* A Maven Jelly tag that attempts to retrieve a property from the MavenJellyContext
@@ -71,7 +71,7 @@
*
*/
public class PropertyTag
- extends BaseTagSupport
+ extends MavenTagSupport
{
private String name;
1.2 +13 -13 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java
Index: ReactorTag.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/ReactorTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReactorTag.java 8 Jan 2004 22:20:50 -0000 1.1
+++ ReactorTag.java 25 Jan 2004 00:29:10 -0000 1.2
@@ -59,8 +59,8 @@
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.maven.MavenUtils;
-import org.apache.maven.project.Project;
+import org.apache.maven.MavenStaticUtils;
+import org.apache.maven.project.MavenProject;
import java.io.File;
import java.util.ArrayList;
@@ -308,7 +308,7 @@
List projects = null;
try
{
- projects = MavenUtils.getProjects( getBasedir(), projectIncludes, getExcludes() );
+ projects = MavenStaticUtils.getProjects( getBasedir(), projectIncludes, getExcludes() );
}
catch ( Exception anException )
{
@@ -319,7 +319,7 @@
try
{
- sortedProjects = MavenUtils.getSortedProjects( projects );
+ sortedProjects = MavenStaticUtils.getSortedProjects( projects );
}
catch ( Exception anException )
{
@@ -331,7 +331,7 @@
for ( Iterator i = sortedProjects.iterator(); i.hasNext(); )
{
- Project p = (Project) i.next();
+ MavenProject p = (MavenProject) i.next();
System.out.println( p.getName() );
}
@@ -342,7 +342,7 @@
// The basedir needs to be set for the project
// We just need the descriptor.
- Project project = (Project) i.next();
+ MavenProject project = (MavenProject) i.next();
beforeProject( project );
try
{
@@ -402,7 +402,7 @@
* This method is running before launching a project.
* @param project the currentProject
*/
- public void beforeProject( Project project )
+ public void beforeProject( MavenProject project )
{
}
@@ -410,7 +410,7 @@
* This method is running before launching project goals.
* @param project the currentProject
*/
- public void beforeLaunchGoals( Project project )
+ public void beforeLaunchGoals( MavenProject project )
{
}
@@ -418,7 +418,7 @@
* This method is running after launching project goals.
* @param project the currentProject
*/
- public void afterLaunchGoals( Project project )
+ public void afterLaunchGoals( MavenProject project )
{
}
@@ -426,7 +426,7 @@
* This method is running after launching a project.
* @param project the currentProject
*/
- public void afterProject( Project project )
+ public void afterProject( MavenProject project )
{
}
@@ -436,7 +436,7 @@
* @param project the currentProject
* @param e the exception
*/
- public void onException( Project project, Exception e )
+ public void onException( MavenProject project, Exception e )
{
}
1.2 +3 -3 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/RootRelativePathTag.java
Index: RootRelativePathTag.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/RootRelativePathTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RootRelativePathTag.java 8 Jan 2004 22:20:51 -0000 1.1
+++ RootRelativePathTag.java 25 Jan 2004 00:29:10 -0000 1.2
@@ -59,7 +59,7 @@
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.maven.jelly.tags.BaseTagSupport;
+import org.apache.maven.jelly.tags.MavenTagSupport;
import java.io.File;
import java.io.IOException;
@@ -74,7 +74,7 @@
* @author <a href="mailto:vmassol@apache.org">Vincent Massol</a>
* @version $Id$
*/
-public class RootRelativePathTag extends BaseTagSupport
+public class RootRelativePathTag extends MavenTagSupport
{
/** The root dir. */
private File rootdir;
1.2 +6 -5 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/SnapshotSignature.java
Index: SnapshotSignature.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/SnapshotSignature.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SnapshotSignature.java 8 Jan 2004 22:20:50 -0000 1.1
+++ SnapshotSignature.java 25 Jan 2004 00:29:10 -0000 1.2
@@ -59,7 +59,8 @@
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.TagSupport;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.maven.project.Project;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProject;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -74,14 +75,14 @@
extends TagSupport
{
/** Maven project */
- private Project project;
+ private MavenProject project;
/**
* Set the maven project object.
*
* @param project MavenSession project.
*/
- public void setProject( Project project )
+ public void setProject( MavenProject project )
{
this.project = project;
}
@@ -91,7 +92,7 @@
*
* @return MavenSession project.
*/
- public Project getProject()
+ public MavenProject getProject()
{
return project;
}
1.2 +2 -2 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/UserCheck.java
Index: UserCheck.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/maven/UserCheck.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UserCheck.java 8 Jan 2004 22:20:51 -0000 1.1
+++ UserCheck.java 25 Jan 2004 00:29:10 -0000 1.2
@@ -59,12 +59,12 @@
import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
-import org.apache.maven.jelly.tags.BaseTagSupport;
+import org.apache.maven.jelly.tags.MavenTagSupport;
/**
* @author dion
*/
-public class UserCheck extends BaseTagSupport
+public class UserCheck extends MavenTagSupport
{
/** the value that means no value has been set */
private static String NO_VALUE = "USERNAME_NOT_SET";
1.2 +4 -6 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/werkz/GoalTag.java
Index: GoalTag.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/werkz/GoalTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GoalTag.java 8 Jan 2004 22:20:51 -0000 1.1
+++ GoalTag.java 25 Jan 2004 00:29:11 -0000 1.2
@@ -65,13 +65,11 @@
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @version $Revision$
*/
-public class GoalTag extends WerkzTagSupport
+public class GoalTag
+ extends WerkzTagSupport
{
-
- /** The Log to which logging calls will be made. */
private Log log = LogFactory.getLog( GoalTag.class );
- /** the name of the target */
private String name;
private String prereqs;
1.2 +3 -3 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/werkz/MavenAttainGoalListener.java
Index: MavenAttainGoalListener.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/werkz/MavenAttainGoalListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenAttainGoalListener.java 8 Jan 2004 22:20:51 -0000 1.1
+++ MavenAttainGoalListener.java 25 Jan 2004 00:29:11 -0000 1.2
@@ -3,7 +3,7 @@
import org.apache.maven.jelly.MavenJellyContext;
import org.apache.maven.plugin.JellyPluginScriptHousing;
import org.apache.maven.plugin.PluginManager;
-import org.apache.maven.project.Project;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.werkz.AttainGoalListener;
import org.apache.maven.werkz.Goal;
import org.apache.maven.werkz.Session;
@@ -169,7 +169,7 @@
executionContexts.push( pluginContext );
}
- private void displayClassLoaderContents( Project project, ClassLoader classLoader )
+ private void displayClassLoaderContents( MavenProject project, ClassLoader classLoader )
{
URL[] urls = ( (URLClassLoader) classLoader ).getURLs();
1.2 +2 -12 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/werkz/MavenProjectTag.java
Index: MavenProjectTag.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/werkz/MavenProjectTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenProjectTag.java 8 Jan 2004 22:20:51 -0000 1.1
+++ MavenProjectTag.java 25 Jan 2004 00:29:11 -0000 1.2
@@ -61,9 +61,6 @@
public class MavenProjectTag
extends WerkzTagSupport
{
- /** the project */
- private WerkzProject project;
-
private String defaultGoalName;
public MavenProjectTag()
@@ -92,14 +89,7 @@
*/
public void doTag( XMLOutput output ) throws JellyTagException
{
- // force project to be lazily constructed
-
getProject().setDefaultGoalName( this.defaultGoalName );
-
- org.apache.tools.ant.Project antProject = AntTagLibrary.getProject( context );
-
- // allow access to Ant methods via the project class
- context.setVariable( "project", antProject );
invokeBody( output );
}
1.2 +6 -2 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/werkz/MavenWerkzTagLibrary.java
Index: MavenWerkzTagLibrary.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/werkz/MavenWerkzTagLibrary.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenWerkzTagLibrary.java 8 Jan 2004 22:20:51 -0000 1.1
+++ MavenWerkzTagLibrary.java 25 Jan 2004 00:29:11 -0000 1.2
@@ -59,9 +59,13 @@
public MavenWerkzTagLibrary()
{
registerTag( "project", MavenProjectTag.class );
+
registerTag( "goal", MavenGoalTag.class );
+
registerTag( "preGoal", MavenPreGoalTag.class );
+
registerTag( "postGoal", MavenPostGoalTag.class );
+
registerTag( "attainGoal", MavenAttainGoalTag.class );
}
}
1.2 +8 -20 maven-components/maven-core/src/java/org/apache/maven/jelly/tags/werkz/WerkzTagSupport.java
Index: WerkzTagSupport.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/werkz/WerkzTagSupport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WerkzTagSupport.java 8 Jan 2004 22:20:52 -0000 1.1
+++ WerkzTagSupport.java 25 Jan 2004 00:29:11 -0000 1.2
@@ -47,7 +47,7 @@
*/
import org.apache.commons.jelly.JellyTagException;
-import org.apache.commons.jelly.TagSupport;
+import org.apache.maven.jelly.tags.MavenTagSupport;
import org.apache.maven.werkz.Goal;
import org.apache.maven.werkz.WerkzProject;
@@ -57,7 +57,8 @@
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
* @version $Revision$
*/
-public abstract class WerkzTagSupport extends TagSupport
+public abstract class WerkzTagSupport
+ extends MavenTagSupport
{
public WerkzTagSupport( boolean trim )
@@ -69,16 +70,6 @@
{
}
-
-
-
- // Implementation methods
- //-------------------------------------------------------------------------
-
- /**
- * @return the goal of the given name or
- * throws a JellyExceptoin if the goal could not be found
- */
protected Goal getGoal( String name ) throws JellyTagException
{
WerkzProject project = getProject();
@@ -96,13 +87,12 @@
return goal;
}
- /**
- * @return the goal manager instance
- */
protected WerkzProject getProject()
{
WerkzProject answer = null;
- ProjectTag tag = (ProjectTag) findAncestorWithClass( ProjectTag.class );
+
+ MavenProjectTag tag = (MavenProjectTag) findAncestorWithClass( MavenProjectTag.class );
+
if ( tag != null )
{
answer = tag.getProject();
@@ -113,6 +103,4 @@
}
return answer;
}
-
-
}
1.2 +4 -4 maven-components/maven-core/src/java/org/apache/maven/plugin/DependencyClasspathBuilder.java
Index: DependencyClasspathBuilder.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/plugin/DependencyClasspathBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DependencyClasspathBuilder.java 8 Jan 2004 04:29:14 -0000 1.1
+++ DependencyClasspathBuilder.java 25 Jan 2004 00:29:11 -0000 1.2
@@ -57,9 +57,9 @@
*/
import org.apache.maven.Compat;
-import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.MavenArtifact;
import org.apache.maven.model.Dependency;
-import org.apache.maven.project.Project;
+import org.apache.maven.project.MavenProject;
import java.util.Iterator;
@@ -67,14 +67,14 @@
{
private static final String cps = System.getProperty( "path.separator" );
- public static String build( Project project )
+ public static String build( MavenProject project )
throws Exception
{
StringBuffer classpath = new StringBuffer();
for ( Iterator i = project.getArtifacts().iterator(); i.hasNext(); )
{
- Artifact artifact = (Artifact) i.next();
+ MavenArtifact artifact = (MavenArtifact) i.next();
Dependency d = artifact.getDependency();
1.2 +5 -29 maven-components/maven-core/src/java/org/apache/maven/plugin/JellyPluginScriptHousing.java
Index: JellyPluginScriptHousing.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/plugin/JellyPluginScriptHousing.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JellyPluginScriptHousing.java 8 Jan 2004 04:29:14 -0000 1.1
+++ JellyPluginScriptHousing.java 25 Jan 2004 00:29:11 -0000 1.2
@@ -1,7 +1,7 @@
package org.apache.maven.plugin;
import org.apache.commons.jelly.Script;
-import org.apache.maven.project.Project;
+import org.apache.maven.project.MavenProject;
/**
*
@@ -16,7 +16,7 @@
private ClassLoader classLoader;
/** Plugin Project. */
- private Project project;
+ private MavenProject project;
/** Jelly Script. */
private Script script;
@@ -44,55 +44,31 @@
this.source = source;
}
- /**
- *
- * @return
- */
public ClassLoader getClassLoader()
{
return classLoader;
}
- /**
- *
- * @param classLoader
- */
public void setClassLoader( ClassLoader classLoader )
{
this.classLoader = classLoader;
}
- /**
- *
- * @return
- */
- public Project getProject()
+ public MavenProject getProject()
{
return project;
}
- /**
- *
- * @param project
- */
- public void setProject( Project project )
+ public void setProject( MavenProject project )
{
this.project = project;
}
- /**
- *
- * @return
- */
public Script getScript()
{
return script;
}
- /**
- *
- * @param script
- */
public void setScript( Script script )
{
this.script = script;
1.2 +4 -4 maven-components/maven-core/src/java/org/apache/maven/plugin/MavenClasspathBuilder.java
Index: MavenClasspathBuilder.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/plugin/MavenClasspathBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenClasspathBuilder.java 8 Jan 2004 04:29:15 -0000 1.1
+++ MavenClasspathBuilder.java 25 Jan 2004 00:29:11 -0000 1.2
@@ -56,8 +56,8 @@
* ====================================================================
*/
-import org.apache.maven.MavenUtils;
-import org.apache.maven.project.Project;
+import org.apache.maven.MavenStaticUtils;
+import org.apache.maven.project.MavenProject;
import java.io.File;
import java.util.Iterator;
@@ -74,12 +74,12 @@
{
private static final String cps = System.getProperty( "path.separator" );
- public static String build( Project project )
+ public static String build( MavenProject project )
throws Exception
{
StringBuffer classpath = new StringBuffer();
- List mavenLibs = MavenUtils.getFiles( new File( project.getProperty( "maven.home" ), "lib" ), "**/*.jar", "" );
+ List mavenLibs = MavenStaticUtils.getFiles( new File( project.getProperty( "maven.home" ), "lib" ), "**/*.jar", "" );
for ( Iterator i = mavenLibs.iterator(); i.hasNext(); )
{
1.3 +17 -20 maven-components/maven-core/src/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PluginManager.java 10 Jan 2004 09:06:15 -0000 1.2
+++ PluginManager.java 25 Jan 2004 00:29:11 -0000 1.3
@@ -67,19 +67,18 @@
import org.apache.maven.Maven;
import org.apache.maven.MavenConstants;
import org.apache.maven.MavenException;
-import org.apache.maven.MavenUtils;
+import org.apache.maven.MavenStaticUtils;
import org.apache.maven.NoGoalException;
-import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.MavenArtifact;
import org.apache.maven.grant.GrantProject;
import org.apache.maven.jelly.JellyBuildListener;
import org.apache.maven.jelly.JellyPropsHandler;
import org.apache.maven.jelly.JellyUtils;
import org.apache.maven.jelly.MavenJellyContext;
-import org.apache.maven.jelly.tags.ant.AntTagLibrary;
import org.apache.maven.jelly.tags.werkz.JellySession;
import org.apache.maven.jelly.tags.werkz.MavenAttainGoalListener;
import org.apache.maven.model.Dependency;
-import org.apache.maven.project.Project;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.util.CollectionUtils;
import org.apache.maven.util.Expand;
import org.apache.maven.werkz.Goal;
@@ -328,7 +327,7 @@
File unpackedPluginDir = getUnpackedPluginDir( name );
- Project pluginProject = getMaven().getProject( new File( unpackedPluginDir, "project.xml" ), false );
+ MavenProject pluginProject = getMaven().getProject( new File( unpackedPluginDir, "project.xml" ), false );
if ( !isPluginProcessed( name ) )
{
@@ -356,7 +355,7 @@
* goals refers to an non-existent goal.
* @throws Exception If an exception occurs while running a goal.
*/
- public void attainGoals( Project project, List goals )
+ public void attainGoals( MavenProject project, List goals )
throws GoalException, Exception
{
File sourceDirectory = new File( project.getBuild().getSourceDirectory() );
@@ -592,7 +591,7 @@
if ( pluginPropertiesFile.exists() )
{
- Map pluginProperties = MavenUtils.loadProperties( pluginPropertiesFile );
+ Map pluginProperties = MavenStaticUtils.loadProperties( pluginPropertiesFile );
//!!!
// Add plugin.dir and plugin.resources into the properties so they get interpolated
@@ -622,7 +621,7 @@
// This is the jelly context that we create for the user project that is trying
// to attain goals for their purposes.
- private MavenJellyContext createProjectContext( Project project )
+ private MavenJellyContext createProjectContext( MavenProject project )
{
// We are making the compileScriptContext the parent so that the werkz
// project is present
@@ -658,7 +657,7 @@
return output;
}
- public GrantProject buildAntProject( Project project, MavenJellyContext context )
+ public GrantProject buildAntProject( MavenProject project, MavenJellyContext context )
throws Exception
{
// Create the build listener.
@@ -687,13 +686,11 @@
context.setAntProject( antProject );
- AntTagLibrary.setProject( context, antProject );
-
return antProject;
}
- private JellyPluginScriptHousing createJellyPluginScriptHousing( Project project, File classesDirectory, File jelly )
+ private JellyPluginScriptHousing createJellyPluginScriptHousing( MavenProject project, File classesDirectory, File jelly )
throws Exception
{
InputStream is = null;
@@ -808,7 +805,7 @@
}
}
- private JellyPluginScriptHousing createJellyPluginScriptHousing( Project project,
+ private JellyPluginScriptHousing createJellyPluginScriptHousing( MavenProject project,
File unpackedPluginDirectory,
InputStream jelly )
throws Exception
@@ -864,7 +861,7 @@
return jellyScriptHousing;
}
- private void displayClassLoaderContents( Project project, ClassLoader classLoader )
+ private void displayClassLoaderContents( MavenProject project, ClassLoader classLoader )
{
URL[] urls = ( (URLClassLoader) classLoader ).getURLs();
@@ -877,7 +874,7 @@
}
// We need to deal with populating a plugin classloader with its requirements.
- private void processDependencies( Project project, ForeheadClassLoader classLoader )
+ private void processDependencies( MavenProject project, ForeheadClassLoader classLoader )
throws MalformedURLException
{
if ( project.getArtifacts() == null )
@@ -887,7 +884,7 @@
for ( Iterator i = project.getArtifacts().iterator(); i.hasNext(); )
{
- Artifact artifact = (Artifact) i.next();
+ MavenArtifact artifact = (MavenArtifact) i.next();
Dependency dependency = artifact.getDependency();
@@ -924,7 +921,7 @@
// so that the plugin execute with only its stated dependencies and just
// use the system classloader as the parent, but I suppose we could use
// maven's classloader as the parent to make maven's deps available.
- private void processDependencies( Project project, PluginClassLoader classLoader )
+ private void processDependencies( MavenProject project, PluginClassLoader classLoader )
throws MalformedURLException
{
if ( project.getArtifacts() == null )
@@ -934,7 +931,7 @@
for ( Iterator i = project.getArtifacts().iterator(); i.hasNext(); )
{
- Artifact artifact = (Artifact) i.next();
+ MavenArtifact artifact = (MavenArtifact) i.next();
Dependency dependency = artifact.getDependency();
@@ -956,7 +953,7 @@
* @throws Exception If an error occurs while attempting to load
* the plugins.
*/
- void loadPlugins( String names, Project project )
+ void loadPlugins( String names, MavenProject project )
throws Exception
{
StringTokenizer tokens = new StringTokenizer( names, "," );
1.2 +3 -3 maven-components/maven-core/src/java/org/apache/maven/util/MavenTool.java
Index: MavenTool.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/util/MavenTool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenTool.java 8 Jan 2004 04:29:16 -0000 1.1
+++ MavenTool.java 25 Jan 2004 00:29:11 -0000 1.2
@@ -56,7 +56,7 @@
* ====================================================================
*/
-import org.apache.maven.project.Project;
+import org.apache.maven.project.MavenProject;
import org.apache.tools.ant.types.Path;
import java.io.File;
@@ -81,7 +81,7 @@
public class MavenTool
{
/** The maven project the tool is processing */
- private Project project;
+ private MavenProject project;
/** list of items to be counted. Key is the object, value is a list
of objects that have been added that are equal */
private Map counted = new HashMap();
@@ -103,7 +103,7 @@
* Accessor for the project property.
* @return the maven project being processed
*/
- public Project getProject()
+ public MavenProject getProject()
{
return project;
}
1.2 +17 -17 maven-components/maven-core/src/java/org/apache/maven/verifier/DependencyVerifier.java
Index: DependencyVerifier.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/verifier/DependencyVerifier.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DependencyVerifier.java 8 Jan 2004 04:29:16 -0000 1.1
+++ DependencyVerifier.java 25 Jan 2004 00:29:11 -0000 1.2
@@ -59,9 +59,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.maven.MavenConstants;
-import org.apache.maven.MavenUtils;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.project.Project;
+import org.apache.maven.MavenStaticUtils;
+import org.apache.maven.artifact.MavenArtifact;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.util.HttpUtils;
import org.codehaus.plexus.util.StringUtils;
@@ -117,7 +117,7 @@
* @throws UnsatisfiedDependencyException If there are unsatisfied dependencies.
* @throws ChecksumVerificationException if the download checksum doesn't match the calculated
*/
- public void verify( Project project )
+ public void verify( MavenProject project )
throws RepoConfigException,
UnsatisfiedDependencyException,
ChecksumVerificationException
@@ -148,7 +148,7 @@
*
* @throws UnsatisfiedDependencyException If there are unsatisfied dependencies.
*/
- private void satisfyDependencies( Project project )
+ private void satisfyDependencies( MavenProject project )
throws UnsatisfiedDependencyException
{
// Is the remote repository enabled?
@@ -159,14 +159,14 @@
if ( !remoteRepoEnabled )
{
- log.warn( MavenUtils.getMessage( "remote.repository.disabled.warning" ) );
+ log.warn( MavenStaticUtils.getMessage( "remote.repository.disabled.warning" ) );
}
clearFailedDependencies();
for ( Iterator i = project.getArtifacts().iterator(); i.hasNext();)
{
- Artifact artifact = (Artifact) i.next();
+ MavenArtifact artifact = (MavenArtifact) i.next();
// The artifact plain doesn't exist so chalk it up as a failed dependency.
if ( !artifact.exists() )
@@ -189,7 +189,7 @@
}
else if ( !online && artifact.isSnapshot() )
{
- log.warn( MavenUtils.getMessage( "offline.snapshot.warning", artifact.getName() ) );
+ log.warn( MavenStaticUtils.getMessage( "offline.snapshot.warning", artifact.getName() ) );
}
}
}
@@ -225,18 +225,18 @@
if ( failedDependencies.size() == 1 )
{
- message.append( MavenUtils.getMessage( "single.unsatisfied.dependency.error" ) );
+ message.append( MavenStaticUtils.getMessage( "single.unsatisfied.dependency.error" ) );
}
else
{
- message.append( MavenUtils.getMessage( "multiple.unsatisfied.dependency.error" ) );
+ message.append( MavenStaticUtils.getMessage( "multiple.unsatisfied.dependency.error" ) );
}
message.append( "\n\n" );
for ( Iterator i = failedDependencies.iterator(); i.hasNext();)
{
- Artifact artifact = (Artifact) i.next();
+ MavenArtifact artifact = (MavenArtifact) i.next();
message.append( artifact.getName() );
String url = artifact.getDependency().getUrl();
if (StringUtils.isNotEmpty(url))
@@ -270,11 +270,11 @@
* Try and retrieve the dependencies from the remote repository in
* order to satisfy the dependencies of the project.
*/
- private void getDependencies( Project project )
+ private void getDependencies( MavenProject project )
{
for ( Iterator i = failedDependencies.iterator(); i.hasNext();)
{
- Artifact artifact = (Artifact) i.next();
+ MavenArtifact artifact = (MavenArtifact) i.next();
// The directory structure for the project this dependency belongs to
// may not exists so attempt to create the project directory structure
@@ -286,7 +286,7 @@
directory.mkdirs();
}
- log.info( MavenUtils.getMessage( "download.message", artifact.getName() ) );
+ log.info( MavenStaticUtils.getMessage( "download.message", artifact.getName() ) );
if ( getRemoteArtifact( project, artifact ) )
{
@@ -306,7 +306,7 @@
}
else
{
- String warning = MavenUtils.getMessage( "failed.download.warning", artifact.getName() );
+ String warning = MavenStaticUtils.getMessage( "failed.download.warning", artifact.getName() );
log.warn( warning );
}
}
@@ -319,7 +319,7 @@
* @param artifact the artifact to retrieve from the repositories.
* @return true if the retrieval succeeds, false otherwise.
*/
- private boolean getRemoteArtifact( Project project, Artifact artifact )
+ private boolean getRemoteArtifact( MavenProject project, MavenArtifact artifact )
{
boolean artifactFound = false;
1.2 +9 -9 maven-components/maven-core/src/java/org/apache/maven/verifier/LocalSettingsVerifier.java
Index: LocalSettingsVerifier.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/java/org/apache/maven/verifier/LocalSettingsVerifier.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LocalSettingsVerifier.java 8 Jan 2004 04:29:16 -0000 1.1
+++ LocalSettingsVerifier.java 25 Jan 2004 00:29:11 -0000 1.2
@@ -57,8 +57,8 @@
*/
import org.apache.maven.MavenConstants;
-import org.apache.maven.MavenUtils;
-import org.apache.maven.project.Project;
+import org.apache.maven.MavenStaticUtils;
+import org.apache.maven.project.MavenProject;
import java.io.File;
@@ -81,7 +81,7 @@
* @throws RepoConfigException If an error occurs while trying to verify some basic
* maven settings.
*/
- public void verifyLocalRepository( Project project )
+ public void verifyLocalRepository( MavenProject project )
throws RepoConfigException
{
// Get local repo property.
@@ -91,29 +91,29 @@
{
// This is not likely to happen any more as it defaults
// to ${maven.home}/repository which is set in the driver.properties
- throw new RepoConfigException( MavenUtils.getMessage( "maven.repo.local.unset" ) );
+ throw new RepoConfigException( MavenStaticUtils.getMessage( "maven.repo.local.unset" ) );
}
File localRepo = new File( localRepoProp );
if ( localRepo.exists() == false )
{
- System.err.println( MavenUtils.getMessage( "directory.nonexistant.warning", localRepo ) );
+ System.err.println( MavenStaticUtils.getMessage( "directory.nonexistant.warning", localRepo ) );
if ( localRepo.mkdirs() == false )
{
- throw new RepoConfigException( MavenUtils.getMessage( "cannot.create.directory.warning", localRepo ) );
+ throw new RepoConfigException( MavenStaticUtils.getMessage( "cannot.create.directory.warning", localRepo ) );
}
}
if ( localRepo.isDirectory() == false )
{
- throw new RepoConfigException( MavenUtils.getMessage( "not.directory.warning", localRepo ) );
+ throw new RepoConfigException( MavenStaticUtils.getMessage( "not.directory.warning", localRepo ) );
}
if ( localRepo.canWrite() == false )
{
- throw new RepoConfigException( MavenUtils.getMessage( "not.writable.warning", localRepo ) );
+ throw new RepoConfigException( MavenStaticUtils.getMessage( "not.writable.warning", localRepo ) );
}
}
}
1.2 +21 -21 maven-components/maven-core/src/test/java/org/apache/maven/util/MD5SumTest.java
Index: MD5SumTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/util/MD5SumTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MD5SumTest.java 8 Jan 2004 04:29:20 -0000 1.1
+++ MD5SumTest.java 25 Jan 2004 00:29:11 -0000 1.2
@@ -68,26 +68,26 @@
public class MD5SumTest
extends TestCase
{
- /**
- * Create the test with the given name
- *
- * @param testName the name of the test
- */
- public MD5SumTest( String testName )
- {
- super( testName );
- }
+ /**
+ * Create the test with the given name
+ *
+ * @param testName the name of the test
+ */
+ public MD5SumTest( String testName )
+ {
+ super( testName );
+ }
- /**
- */
- public void testSum()
- throws Exception
- {
- MD5Sum md5 = new MD5Sum();
- md5.setFile( new File( "src/test/checksum/input.jar" ) );
- md5.execute();
- String checksum = md5.getChecksum();
+ /**
+ */
+ public void testSum()
+ throws Exception
+ {
+ MD5Sum md5 = new MD5Sum();
+ md5.setFile( new File( "src/test/checksum/input.jar" ) );
+ md5.execute();
+ String checksum = md5.getChecksum();
- assertEquals( "627ce116c350da6fee656177b2af86eb", checksum );
- }
+ assertEquals( "627ce116c350da6fee656177b2af86eb", checksum );
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org