You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/04/21 18:16:27 UTC

svn commit: r164078 - in /maven/components/trunk/maven-core/src: main/java/org/apache/maven/plugin/ main/java/org/apache/maven/project/ main/java/org/apache/maven/project/inheritance/ main/java/org/apache/maven/project/injection/ main/java/org/apache/maven/project/interpolation/ main/java/org/apache/maven/util/ main/java/org/apache/maven/util/introspection/ test/java/org/apache/maven/util/introspection/

Author: brett
Date: Thu Apr 21 09:16:25 2005
New Revision: 164078

URL: http://svn.apache.org/viewcvs?rev=164078&view=rev
Log:
move utils to plexus-utils

Removed:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/util/Xpp3DomUtils.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/util/introspection/
    maven/components/trunk/maven-core/src/test/java/org/apache/maven/util/introspection/ReflectionValueExtractorTest.java
Modified:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/injection/DefaultModelDefaultsInjector.java
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java?rev=164078&r1=164077&r2=164078&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java Thu Apr 21 09:16:25 2005
@@ -18,10 +18,10 @@
 
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.project.path.PathTranslator;
-import org.apache.maven.util.introspection.ReflectionValueExtractor;
 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
 import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
 
 import java.io.File;
 

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=164078&r1=164077&r2=164078&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java Thu Apr 21 09:16:25 2005
@@ -37,7 +37,6 @@
 import org.apache.maven.model.PluginManagement;
 import org.apache.maven.model.Reports;
 import org.apache.maven.model.Scm;
-import org.apache.maven.util.Xpp3DomUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 import java.io.File;
@@ -739,8 +738,8 @@
                                 Xpp3Dom goalConfiguration = (Xpp3Dom) goal.getConfiguration();
                                 if ( goalConfiguration != null )
                                 {
-                                    Xpp3Dom newDom = Xpp3DomUtils.copyXpp3Dom( goalConfiguration );
-                                    dom = Xpp3DomUtils.mergeXpp3Dom( newDom, dom );
+                                    Xpp3Dom newDom = new Xpp3Dom( goalConfiguration );
+                                    dom = Xpp3Dom.mergeXpp3Dom( newDom, dom );
                                 }
                                 break;
                             }

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java?rev=164078&r1=164077&r2=164078&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java Thu Apr 21 09:16:25 2005
@@ -26,7 +26,6 @@
 import org.apache.maven.model.PluginManagement;
 import org.apache.maven.model.Repository;
 import org.apache.maven.model.Scm;
-import org.apache.maven.util.Xpp3DomUtils;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
@@ -273,7 +272,7 @@
                                 {
                                     Xpp3Dom childDom = (Xpp3Dom) childGoal.getConfiguration();
                                     Xpp3Dom parentDom = (Xpp3Dom) parentGoal.getConfiguration();
-                                    childGoal.setConfiguration( Xpp3DomUtils.mergeXpp3Dom( childDom, parentDom ) );
+                                    childGoal.setConfiguration( Xpp3Dom.mergeXpp3Dom( childDom, parentDom ) );
                                 }
                             }
                         }

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/injection/DefaultModelDefaultsInjector.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/injection/DefaultModelDefaultsInjector.java?rev=164078&r1=164077&r2=164078&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/injection/DefaultModelDefaultsInjector.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/injection/DefaultModelDefaultsInjector.java Thu Apr 21 09:16:25 2005
@@ -22,7 +22,6 @@
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.model.PluginManagement;
-import org.apache.maven.util.Xpp3DomUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 import java.util.ArrayList;
@@ -123,7 +122,7 @@
                     Xpp3Dom goalConfiguration = (Xpp3Dom) localGoal.getConfiguration();
                     Xpp3Dom defaultGoalConfiguration = (Xpp3Dom) defaultGoal.getConfiguration();
                     localGoal.setConfiguration(
-                        Xpp3DomUtils.mergeXpp3Dom( goalConfiguration, defaultGoalConfiguration ) );
+                        Xpp3Dom.mergeXpp3Dom( goalConfiguration, defaultGoalConfiguration ) );
                 }
             }
         }
@@ -132,7 +131,7 @@
 
         Xpp3Dom pluginConfiguration = (Xpp3Dom) plugin.getConfiguration();
         Xpp3Dom defaultPluginConfiguration = (Xpp3Dom) def.getConfiguration();
-        plugin.setConfiguration( Xpp3DomUtils.mergeXpp3Dom( pluginConfiguration, defaultPluginConfiguration ) );
+        plugin.setConfiguration( Xpp3Dom.mergeXpp3Dom( pluginConfiguration, defaultPluginConfiguration ) );
     }
 
     private void injectDependencyDefaults( List dependencies, DependencyManagement dependencyManagement )

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java?rev=164078&r1=164077&r2=164078&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java Thu Apr 21 09:16:25 2005
@@ -19,10 +19,10 @@
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
-import org.apache.maven.util.introspection.ReflectionValueExtractor;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
 import java.io.IOException;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org