Author: sisbell
Date: Tue Apr 14 14:25:47 2009
New Revision: 764788
URL: http://svn.apache.org/viewvc?rev=764788&view=rev
Log:
Moved interpolation package into builder.
Added:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DomainModel.java
(contents, props changed)
- copied, changed from r764626,
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/DomainModel.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/InterpolatorProperty.java
(contents, props changed)
- copied, changed from r764618,
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/InterpolatorProperty.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelInterpolator.java
(contents, props changed)
- copied, changed from r764618,
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelInterpolator.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelProperty.java
(contents, props changed)
- copied, changed from r764618,
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomInterpolatorTag.java
- copied, changed from r764618,
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/PomInterpolatorTag.java
Removed:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/DomainModel.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/InterpolatorProperty.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelInterpolator.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/PomInterpolatorTag.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomTransformer.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/DefaultMatcher.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/FileMatcher.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/JdkMatcher.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/ProfileMatcher.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/PropertyMatcher.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=764788&r1=764787&r2=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Tue Apr 14 14:25:47 2009
@@ -73,8 +73,8 @@
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
+import org.apache.maven.project.builder.PomInterpolatorTag;
import org.apache.maven.project.builder.ProjectUri;
-import org.apache.maven.project.builder.interpolator.PomInterpolatorTag;
import org.apache.maven.project.builder.legacy.PomTransformer;
import org.apache.maven.project.path.PathTranslator;
import org.apache.maven.realm.MavenRealmManager;
Modified:
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java?rev=764788&r1=764787&r2=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
(original)
+++
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/mercury/MavenDependencyProcessor.java
Tue Apr 14 14:25:47 2009
@@ -30,8 +30,8 @@
import org.apache.maven.mercury.builder.api.DependencyProcessorException;
import org.apache.maven.mercury.builder.api.MetadataReader;
import org.apache.maven.mercury.builder.api.MetadataReaderException;
+import org.apache.maven.project.builder.PomInterpolatorTag;
import org.apache.maven.project.builder.ProjectUri;
-import org.apache.maven.project.builder.interpolator.PomInterpolatorTag;
import org.apache.maven.project.builder.legacy.PomTransformer;
import org.apache.maven.shared.model.DomainModel;
import org.apache.maven.shared.model.InterpolatorProperty;
Modified:
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomTransformer.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomTransformer.java?rev=764788&r1=764787&r2=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomTransformer.java
(original)
+++
maven/components/trunk/maven-mercury/src/main/java/org/apache/maven/project/builder/legacy/PomTransformer.java
Tue Apr 14 14:25:47 2009
@@ -26,13 +26,13 @@
import org.apache.maven.shared.model.*;
import org.apache.maven.shared.model.impl.DefaultModelDataSource;
import org.apache.maven.project.builder.PomClassicDomainModel;
+import org.apache.maven.project.builder.PomInterpolatorTag;
import org.apache.maven.project.builder.ProjectUri;
import org.apache.maven.project.builder.rules.*;
import
org.apache.maven.project.builder.factories.PluginExecutionIdModelContainerFactory;
import
org.apache.maven.project.builder.factories.AlwaysJoinModelContainerFactory;
import
org.apache.maven.project.builder.factories.ArtifactModelContainerFactory;
import org.apache.maven.project.builder.factories.IdModelContainerFactory;
-import org.apache.maven.project.builder.interpolator.PomInterpolatorTag;
/**
* Provides methods for transforming model properties into a domain model for
the pom classic format and vice versa.
Copied:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DomainModel.java
(from r764626,
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/DomainModel.java)
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DomainModel.java?p2=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DomainModel.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/DomainModel.java&r1=764626&r2=764788&rev=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/DomainModel.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DomainModel.java
Tue Apr 14 14:25:47 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder.interpolator;
+package org.apache.maven.project.builder;
import java.io.IOException;
import java.util.List;
Propchange:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/DomainModel.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/InterpolatorProperty.java
(from r764618,
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/InterpolatorProperty.java)
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/InterpolatorProperty.java?p2=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/InterpolatorProperty.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/InterpolatorProperty.java&r1=764618&r2=764788&rev=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/InterpolatorProperty.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/InterpolatorProperty.java
Tue Apr 14 14:25:47 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder.interpolator;
+package org.apache.maven.project.builder;
import java.util.*;
Propchange:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/InterpolatorProperty.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Apr 14 14:25:47 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/InterpolatorProperty.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/InterpolatorProperty.java:680477
+/maven/components/branches/maven-2.0.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/InterpolatorProperty.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/InterpolatorProperty.java:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/InterpolatorProperty.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/InterpolatorProperty.java:738757-738972
+/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/InterpolatorProperty.java:688587-696625,696644-699681
Copied:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelInterpolator.java
(from r764618,
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelInterpolator.java)
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelInterpolator.java?p2=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelInterpolator.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelInterpolator.java&r1=764618&r2=764788&rev=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelInterpolator.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelInterpolator.java
Tue Apr 14 14:25:47 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder.interpolator;
+package org.apache.maven.project.builder;
import java.io.File;
import java.io.IOException;
@@ -11,8 +11,6 @@
import java.util.Map;
import org.apache.maven.model.Model;
-import org.apache.maven.project.builder.PomClassicDomainModel;
-import org.apache.maven.project.builder.ProjectUri;
public class ModelInterpolator {
Propchange:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelInterpolator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Apr 14 14:25:47 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelInterpolator.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelInterpolator.java:680477
+/maven/components/branches/maven-2.0.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelInterpolator.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelInterpolator.java:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelInterpolator.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelInterpolator.java:738757-738972
+/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelInterpolator.java:688587-696625,696644-699681
Copied:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelProperty.java
(from r764618,
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java)
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelProperty.java?p2=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelProperty.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java&r1=764618&r2=764788&rev=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelProperty.java
Tue Apr 14 14:25:47 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder.interpolator;
+package org.apache.maven.project.builder;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ModelProperty.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Apr 14 14:25:47 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:680477
+/maven/components/branches/maven-2.0.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:739385,741841,747468,747683,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:738757-738972
+/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/ModelProperty.java:688587-696625,696644-699681
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java?rev=764788&r1=764787&r2=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
Tue Apr 14 14:25:47 2009
@@ -11,7 +11,6 @@
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.project.builder.interpolator.DomainModel;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.WriterFactory;
@@ -200,27 +199,7 @@
*/
public String asString() throws IOException
{
- if(inputBytes == null)
- {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- Writer out = null;
- MavenXpp3Writer writer = new MavenXpp3Writer();
- try
- {
- out = WriterFactory.newXmlWriter( baos );
- writer.write( out, model );
- }
- finally
- {
- if ( out != null )
- {
- out.close();
- }
- }
- inputBytes = baos.toByteArray();
- }
-
- return IOUtil.toString( ReaderFactory.newXmlReader( new
ByteArrayInputStream( inputBytes ) ) );
+ return IOUtil.toString( ReaderFactory.newXmlReader(
getInputStream() ) );
}
/**
Copied:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomInterpolatorTag.java
(from r764618,
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/PomInterpolatorTag.java)
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomInterpolatorTag.java?p2=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomInterpolatorTag.java&p1=maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/PomInterpolatorTag.java&r1=764618&r2=764788&rev=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/interpolator/PomInterpolatorTag.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomInterpolatorTag.java
Tue Apr 14 14:25:47 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.project.builder.interpolator;
+package org.apache.maven.project.builder;
public enum PomInterpolatorTag
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java?rev=764788&r1=764787&r2=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java
(original)
+++
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/ProcessorContext.java
Tue Apr 14 14:25:47 2009
@@ -52,10 +52,6 @@
import org.apache.maven.model.Resource;
import org.apache.maven.project.builder.PomClassicDomainModel;
import org.apache.maven.project.builder.ProjectUri;
-import org.apache.maven.project.builder.interpolator.DomainModel;
-import org.apache.maven.project.builder.interpolator.InterpolatorProperty;
-import org.apache.maven.project.builder.interpolator.ModelProperty;
-import org.apache.maven.project.builder.interpolator.PomInterpolatorTag;
import org.codehaus.plexus.util.xml.Xpp3Dom;
public class ProcessorContext
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java?rev=764788&r1=764787&r2=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
Tue Apr 14 14:25:47 2009
@@ -31,8 +31,8 @@
import org.apache.maven.profiles.matchers.ProfileMatcher;
import org.apache.maven.profiles.matchers.PropertyMatcher;
import org.apache.maven.project.ProjectBuilderConfiguration;
-import org.apache.maven.project.builder.interpolator.InterpolatorProperty;
-import org.apache.maven.project.builder.interpolator.PomInterpolatorTag;
+import org.apache.maven.project.builder.InterpolatorProperty;
+import org.apache.maven.project.builder.PomInterpolatorTag;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.MutablePlexusContainer;
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java?rev=764788&r1=764787&r2=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/ProfileManagerInfo.java
Tue Apr 14 14:25:47 2009
@@ -4,7 +4,7 @@
import java.util.Collection;
import java.util.List;
-import org.apache.maven.project.builder.interpolator.InterpolatorProperty;
+import org.apache.maven.project.builder.InterpolatorProperty;
public class ProfileManagerInfo
{
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/DefaultMatcher.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/DefaultMatcher.java?rev=764788&r1=764787&r2=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/DefaultMatcher.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/DefaultMatcher.java
Tue Apr 14 14:25:47 2009
@@ -22,7 +22,7 @@
import java.util.List;
import org.apache.maven.model.Profile;
-import org.apache.maven.project.builder.interpolator.InterpolatorProperty;
+import org.apache.maven.project.builder.InterpolatorProperty;
public class DefaultMatcher implements ProfileMatcher
{
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/FileMatcher.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/FileMatcher.java?rev=764788&r1=764787&r2=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/FileMatcher.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/FileMatcher.java
Tue Apr 14 14:25:47 2009
@@ -5,7 +5,7 @@
import org.apache.maven.model.ActivationFile;
import org.apache.maven.model.Profile;
-import org.apache.maven.project.builder.interpolator.InterpolatorProperty;
+import org.apache.maven.project.builder.InterpolatorProperty;
public class FileMatcher implements ProfileMatcher {
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/JdkMatcher.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/JdkMatcher.java?rev=764788&r1=764787&r2=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/JdkMatcher.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/JdkMatcher.java
Tue Apr 14 14:25:47 2009
@@ -5,7 +5,7 @@
import java.util.List;
import org.apache.maven.model.Profile;
-import org.apache.maven.project.builder.interpolator.InterpolatorProperty;
+import org.apache.maven.project.builder.InterpolatorProperty;
public class JdkMatcher
implements ProfileMatcher
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/ProfileMatcher.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/ProfileMatcher.java?rev=764788&r1=764787&r2=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/ProfileMatcher.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/ProfileMatcher.java
Tue Apr 14 14:25:47 2009
@@ -21,7 +21,7 @@
import java.util.List;
-import org.apache.maven.project.builder.interpolator.InterpolatorProperty;
+import org.apache.maven.project.builder.InterpolatorProperty;
import org.apache.maven.model.Profile;
public interface ProfileMatcher
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/PropertyMatcher.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/PropertyMatcher.java?rev=764788&r1=764787&r2=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/PropertyMatcher.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/profiles/matchers/PropertyMatcher.java
Tue Apr 14 14:25:47 2009
@@ -22,7 +22,7 @@
import java.util.List;
import org.apache.maven.model.Profile;
-import org.apache.maven.project.builder.interpolator.InterpolatorProperty;
+import org.apache.maven.project.builder.InterpolatorProperty;
public class PropertyMatcher implements ProfileMatcher
{
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=764788&r1=764787&r2=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Tue Apr 14 14:25:47 2009
@@ -46,12 +46,12 @@
import org.apache.maven.profiles.ProfileManagerInfo;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
+import org.apache.maven.project.builder.DomainModel;
+import org.apache.maven.project.builder.InterpolatorProperty;
+import org.apache.maven.project.builder.ModelProperty;
import org.apache.maven.project.builder.PomClassicDomainModel;
+import org.apache.maven.project.builder.PomInterpolatorTag;
import org.apache.maven.project.builder.ProcessorContext;
-import org.apache.maven.project.builder.interpolator.DomainModel;
-import org.apache.maven.project.builder.interpolator.InterpolatorProperty;
-import org.apache.maven.project.builder.interpolator.ModelProperty;
-import org.apache.maven.project.builder.interpolator.PomInterpolatorTag;
import org.apache.maven.project.validation.ModelValidationResult;
import org.apache.maven.project.validation.ModelValidator;
import org.apache.maven.repository.RepositorySystem;
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java?rev=764788&r1=764787&r2=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/profiles/matchers/JdkMatcherTest.java
Tue Apr 14 14:25:47 2009
@@ -4,7 +4,7 @@
import org.apache.maven.model.Activation;
import org.apache.maven.model.Profile;
-import org.apache.maven.project.builder.interpolator.InterpolatorProperty;
+import org.apache.maven.project.builder.InterpolatorProperty;
import junit.framework.TestCase;
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java?rev=764788&r1=764787&r2=764788&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/harness/PomTestWrapper.java
Tue Apr 14 14:25:47 2009
@@ -31,8 +31,8 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.project.builder.ModelProperty;
import org.apache.maven.project.builder.PomClassicDomainModel;
-import org.apache.maven.project.builder.interpolator.ModelProperty;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
