evenisse 2004/01/29 03:06:21
Modified: maven-core/src/java/org/apache/maven Maven.java
MavenUtils.java
maven-core/src/java/org/apache/maven/jelly/tags
BaseTagSupport.java
maven-core/src/java/org/apache/maven/jelly/tags/maven
PomTag.java ReactorTag.java
maven-core/src/java/org/apache/maven/plugin
MavenClasspathBuilder.java PluginManager.java
maven-core/src/java/org/apache/maven/verifier
DependencyVerifier.java LocalSettingsVerifier.java
Log:
Revert my changes for Jason.
Revision Changes Path
1.4 +9 -9 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Maven.java 26 Jan 2004 11:49:56 -0000 1.3
+++ Maven.java 29 Jan 2004 11:06:20 -0000 1.4
@@ -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() ) );
}
}
@@ -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,7 +330,7 @@
public List getProjects( File directory, String includes, String excludes )
throws Exception
{
- return MavenUtils.getProjects( directory, includes, excludes );
+ return MavenStaticUtils.getProjects( directory, includes, excludes );
}
public MavenProject getProject( File project )
1.3 +7 -7
maven-components/maven-core/src/java/org/apache/maven/MavenUtils.java
Index: MavenUtils.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/java/org/apache/maven/MavenUtils.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MavenUtils.java 26 Jan 2004 11:49:56 -0000 1.2
+++ MavenUtils.java 29 Jan 2004 11:06:20 -0000 1.3
@@ -57,8 +57,8 @@
*/
import com.werken.forehead.Forehead;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.Project;
+import org.apache.maven.project.ProjectBuilder;
import org.codehaus.plexus.embed.Embedder;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.StringUtils;
@@ -87,9 +87,9 @@
*/
public class MavenUtils
{
- private static MavenProjectBuilder projectBuilder;
+ private static ProjectBuilder projectBuilder;
- private static MavenProjectBuilder getProjectBuilder()
+ private static ProjectBuilder getProjectBuilder()
{
if ( projectBuilder == null )
{
@@ -107,7 +107,7 @@
{
embedder.start();
- projectBuilder = (MavenProjectBuilder) embedder.lookup(
MavenProjectBuilder.ROLE );
+ projectBuilder = (ProjectBuilder) embedder.lookup(
ProjectBuilder.ROLE );
}
catch ( Exception e )
{
@@ -118,13 +118,13 @@
return projectBuilder;
}
- public static MavenProject getProject( File project )
+ public static Project getProject( File project )
throws Exception
{
return getProjectBuilder().build( project );
}
- public static MavenProject getProject( File project, boolean useParent )
+ public static Project getProject( File project, boolean useParent )
throws Exception
{
return getProjectBuilder().build( project, useParent );
1.3 +0 -5
maven-components/maven-core/src/java/org/apache/maven/jelly/tags/BaseTagSupport.java
Index: BaseTagSupport.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/java/org/apache/maven/jelly/tags/BaseTagSupport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseTagSupport.java 26 Jan 2004 11:49:56 -0000 1.2
+++ BaseTagSupport.java 29 Jan 2004 11:06:20 -0000 1.3
@@ -70,11 +70,6 @@
super();
}
- public BaseTagSupport(boolean trim)
- {
- super(trim);
- }
-
public MavenJellyContext getMavenContext()
{
JellyContext context = getContext();
1.4 +2 -2
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PomTag.java 26 Jan 2004 11:49:56 -0000 1.3
+++ PomTag.java 29 Jan 2004 11:06:20 -0000 1.4
@@ -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.MavenUtils;
+import org.apache.maven.MavenStaticUtils;
import org.apache.maven.jelly.tags.MavenTagSupport;
import java.io.File;
@@ -122,7 +122,7 @@
try
{
- context.setVariable( var, MavenUtils.getProject( projectDescriptor,
false ) );
+ context.setVariable( var, MavenStaticUtils.getProject(
projectDescriptor, false ) );
}
catch ( Exception e )
{
1.4 +3 -3
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ReactorTag.java 26 Jan 2004 11:49:56 -0000 1.3
+++ ReactorTag.java 29 Jan 2004 11:06:20 -0000 1.4
@@ -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.MavenUtils;
+import org.apache.maven.MavenStaticUtils;
import org.apache.maven.project.MavenProject;
import java.io.File;
@@ -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 )
{
1.4 +2 -2
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MavenClasspathBuilder.java 26 Jan 2004 11:49:56 -0000 1.3
+++ MavenClasspathBuilder.java 29 Jan 2004 11:06:20 -0000 1.4
@@ -56,7 +56,7 @@
* ====================================================================
*/
-import org.apache.maven.MavenUtils;
+import org.apache.maven.MavenStaticUtils;
import org.apache.maven.project.MavenProject;
import java.io.File;
@@ -79,7 +79,7 @@
{
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.5 +2 -2
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PluginManager.java 26 Jan 2004 11:49:56 -0000 1.4
+++ PluginManager.java 29 Jan 2004 11:06:20 -0000 1.5
@@ -67,7 +67,7 @@
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.MavenArtifact;
import org.apache.maven.grant.GrantProject;
@@ -591,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
1.4 +7 -7
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DependencyVerifier.java 26 Jan 2004 11:49:56 -0000 1.3
+++ DependencyVerifier.java 29 Jan 2004 11:06:20 -0000 1.4
@@ -59,7 +59,7 @@
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.MavenStaticUtils;
import org.apache.maven.artifact.MavenArtifact;
import org.apache.maven.project.MavenProject;
import org.apache.maven.util.HttpUtils;
@@ -159,7 +159,7 @@
if ( !remoteRepoEnabled )
{
- log.warn( MavenUtils.getMessage( "remote.repository.disabled.warning" )
);
+ log.warn( MavenStaticUtils.getMessage(
"remote.repository.disabled.warning" ) );
}
clearFailedDependencies();
@@ -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,11 +225,11 @@
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" );
@@ -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 );
}
}
1.4 +6 -6
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LocalSettingsVerifier.java 26 Jan 2004 11:49:56 -0000 1.3
+++ LocalSettingsVerifier.java 29 Jan 2004 11:06:20 -0000 1.4
@@ -57,7 +57,7 @@
*/
import org.apache.maven.MavenConstants;
-import org.apache.maven.MavenUtils;
+import org.apache.maven.MavenStaticUtils;
import org.apache.maven.project.MavenProject;
import java.io.File;
@@ -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 ) );
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
