cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/app PluginManager.java

[jvanzyl]

jvanzyl     2002/11/24 09:58:13

  Modified:    src/java/org/apache/maven/app PluginManager.java
  Log:
  refactoring
  
  Revision  Changes    Path
  1.53      +5 -6      
jakarta-turbine-maven/src/java/org/apache/maven/app/PluginManager.java
  
  Index: PluginManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/PluginManager.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- PluginManager.java        15 Nov 2002 19:47:26 -0000      1.52
  +++ PluginManager.java        24 Nov 2002 17:58:13 -0000      1.53
  @@ -91,11 +91,11 @@
   import org.apache.maven.MavenConstants;
   import org.apache.maven.MavenUtils;
   import org.apache.maven.CreateDependencyClasspath;
  +import org.apache.maven.jelly.JellyUtils;
   import org.apache.maven.jelly.MavenJellyContext;
   import org.apache.maven.project.Dependency;
   import org.apache.maven.project.Project;
   import org.apache.maven.util.Expand;
  -import org.apache.maven.util.JellyUtils;
   
   // Tmp
   import org.apache.maven.repository.DefaultArtifactFactory;
  @@ -196,8 +196,8 @@
       public void initializePlugins()
           throws Exception
       {
  -        setPluginsDir(new File((String)jellyContext.getVariable(PLUGIN_DIR)));
  -
  +        setPluginsDir(new 
File((String)jellyContext.getVariable(MavenConstants.HOME), "plugins"));
  +        
           loadCache();
   
           File pluginsDir = getPluginsDir();
  @@ -1105,8 +1105,7 @@
   
                   try
                   {
  -                    Expression expr = CompositeExpression.parse(propText,
  -                                                                factory);
  +                    Expression expr = CompositeExpression.parse(propText, factory);
   
                       if (expr != null)
                       {
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>