Author: bentmann
Date: Tue Sep 8 18:35:16 2009
New Revision: 812614
URL: http://svn.apache.org/viewvc?rev=812614&view=rev
Log:
o Restored legacy code for backward-compat
Added:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/
(with props)
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
- copied, changed from r812594,
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
- copied, changed from r812594,
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java
- copied, changed from r812594,
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
- copied, changed from r812594,
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java
- copied, changed from r812594,
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
- copied, changed from r812594,
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
- copied, changed from r812594,
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=812614&r1=812613&r2=812614&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Tue Sep 8 18:35:16 2009
@@ -36,6 +36,7 @@
* @version $Id$
*/
@Component(role = MavenProjectBuilder.class)
+...@deprecated
public class DefaultMavenProjectBuilder
implements MavenProjectBuilder
{
@@ -165,4 +166,27 @@
return projectBuilder.buildStandaloneSuperProject( config
).getProject();
}
-}
\ No newline at end of file
+ public MavenProject buildStandaloneSuperProject( ArtifactRepository
localRepository )
+ throws ProjectBuildingException
+ {
+ return buildStandaloneSuperProject( localRepository, null );
+ }
+
+ public MavenProject buildStandaloneSuperProject( ArtifactRepository
localRepository, ProfileManager profileManager )
+ throws ProjectBuildingException
+ {
+ ProjectBuilderConfiguration configuration = new
DefaultProjectBuilderConfiguration();
+ configuration.setLocalRepository( localRepository );
+ configuration.setProcessPlugins( false );
+ configuration.setValidationLevel(
ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
+
+ if ( profileManager != null )
+ {
+ configuration.setActiveProfileIds(
profileManager.getExplicitlyActivatedIds() );
+ configuration.setInactiveProfileIds(
profileManager.getExplicitlyDeactivatedIds() );
+ }
+
+ return buildStandaloneSuperProject( configuration );
+ }
+
+}
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=812614&r1=812613&r2=812614&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
Tue Sep 8 18:35:16 2009
@@ -1679,6 +1679,10 @@
return sb.toString();
}
+ /**
+ * @deprecated Use {...@link org.apache.maven.model.io.ModelWriter}.
+ */
+ @Deprecated
public void writeModel( Writer writer )
throws IOException
{
@@ -1687,6 +1691,17 @@
}
/**
+ * @deprecated Use {...@link org.apache.maven.model.io.ModelWriter}.
+ */
+ @Deprecated
+ public void writeOriginalModel( Writer writer )
+ throws IOException
+ {
+ MavenXpp3Writer pomWriter = new MavenXpp3Writer();
+ pomWriter.write( writer, getOriginalModel() );
+ }
+
+ /**
* @throws CloneNotSupportedException
* @since 2.0.9
*/
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java?rev=812614&r1=812613&r2=812614&view=diff
==============================================================================
---
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
Tue Sep 8 18:35:16 2009
@@ -47,4 +47,10 @@
MavenProject buildStandaloneSuperProject( ProjectBuilderConfiguration
configuration )
throws ProjectBuildingException;
+ MavenProject buildStandaloneSuperProject( ArtifactRepository
localRepository )
+ throws ProjectBuildingException;
+
+ MavenProject buildStandaloneSuperProject( ArtifactRepository
localRepository, ProfileManager profileManager )
+ throws ProjectBuildingException;
+
}
Propchange:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Copied:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
(from r812594,
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java)
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java?p2=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java&p1=maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java&r1=812594&r2=812614&rev=812614&view=diff
==============================================================================
---
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
Tue Sep 8 18:35:16 2009
@@ -60,6 +60,7 @@
* @version $Id$
* @todo Consolidate this logic with the PluginParameterExpressionEvaluator,
minus deprecations/bans.
*/
+...@deprecated
public abstract class AbstractStringBasedModelInterpolator
extends AbstractLogEnabled
implements ModelInterpolator, Initializable
@@ -259,12 +260,12 @@
valueSources.add( modelValueSource1 );
valueSources.add( new MapBasedValueSource( config.getUserProperties()
) );
valueSources.add( new MapBasedValueSource( modelProperties ) );
- valueSources.add( new MapBasedValueSource(
config.getExecutionProperties() ) );
+ valueSources.add( new MapBasedValueSource(
config.getSystemProperties() ) );
valueSources.add( new AbstractValueSource( false )
{
public Object getValue( String expression )
{
- return config.getExecutionProperties().getProperty( "env." +
expression );
+ return config.getSystemProperties().getProperty( "env." +
expression );
}
} );
valueSources.add( modelValueSource2 );
@@ -321,7 +322,7 @@
if ( debug )
{
- List<Object> feedback = (List<Object>)
interpolator.getFeedback();
+ List<Object> feedback = interpolator.getFeedback();
if ( feedback != null && !feedback.isEmpty() )
{
logger.debug( "Maven encountered the following
problems during initial POM interpolation:" );
Copied:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
(from r812594,
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java)
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java?p2=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java&p1=maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java&r1=812594&r2=812614&rev=812614&view=diff
==============================================================================
---
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/BuildTimestampValueSource.java
Tue Sep 8 18:35:16 2009
@@ -28,6 +28,7 @@
*
* @version $Id$
*/
+...@deprecated
public class BuildTimestampValueSource
extends AbstractValueSource
{
Copied:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java
(from r812594,
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java)
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java?p2=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java&p1=maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java&r1=812594&r2=812614&rev=812614&view=diff
==============================================================================
---
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java
Tue Sep 8 18:35:16 2009
@@ -25,6 +25,7 @@
* Created on Feb 2, 2005
*/
@SuppressWarnings("serial")
+...@deprecated
public class ModelInterpolationException
extends Exception
{
Copied:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
(from r812594,
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java)
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java?p2=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java&p1=maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java&r1=812594&r2=812614&rev=812614&view=diff
==============================================================================
---
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
Tue Sep 8 18:35:16 2009
@@ -30,6 +30,7 @@
* <p/>
* Created on Feb 2, 2005
*/
+...@deprecated
public interface ModelInterpolator
{
String DEFAULT_BUILD_TIMESTAMP_FORMAT = "yyyyMMdd-HHmm";
@@ -62,4 +63,4 @@
ProjectBuilderConfiguration config,
boolean debugEnabled )
throws ModelInterpolationException;
-}
\ No newline at end of file
+}
Copied:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java
(from r812594,
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java)
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java?p2=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java&p1=maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java&r1=812594&r2=812614&rev=812614&view=diff
==============================================================================
---
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java
Tue Sep 8 18:35:16 2009
@@ -30,6 +30,7 @@
*
* @version $Id$
*/
+...@deprecated
public class PathTranslatingPostProcessor
implements InterpolationPostProcessor
{
Copied:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
(from r812594,
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java)
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java?p2=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java&p1=maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java&r1=812594&r2=812614&rev=812614&view=diff
==============================================================================
---
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
Tue Sep 8 18:35:16 2009
@@ -33,6 +33,7 @@
* @version $Id$
* @todo Consolidate this logic with the PluginParameterExpressionEvaluator,
minus deprecations/bans.
*/
+...@deprecated
public class RegexBasedModelInterpolator
extends AbstractStringBasedModelInterpolator
{
Copied:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
(from r812594,
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java)
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java?p2=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java&p1=maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java&r1=812594&r2=812614&rev=812614&view=diff
==============================================================================
---
maven/maven-2/branches/maven-2.2.x/maven-project/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
(original)
+++
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/interpolation/StringSearchModelInterpolator.java
Tue Sep 8 18:35:16 2009
@@ -22,6 +22,7 @@
import org.apache.maven.model.Model;
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.project.path.PathTranslator;
+import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.interpolation.InterpolationPostProcessor;
import org.codehaus.plexus.interpolation.Interpolator;
import org.codehaus.plexus.interpolation.StringSearchInterpolator;
@@ -40,6 +41,8 @@
import java.util.Map;
import java.util.WeakHashMap;
+...@deprecated
+...@component( role = ModelInterpolator.class )
public class StringSearchModelInterpolator
extends AbstractStringBasedModelInterpolator
{
@@ -77,8 +80,7 @@
new InterpolateObjectAction( obj, valueSources,
postProcessors, debugEnabled,
this, getLogger() );
- ModelInterpolationException error =
- (ModelInterpolationException) AccessController.doPrivileged(
action );
+ ModelInterpolationException error = AccessController.doPrivileged(
action );
if ( error != null )
{
@@ -159,7 +161,7 @@
}
else if ( isQualifiedForInterpolation( cls ) )
{
- Field[] fields = (Field[]) fieldsByClass.get( cls );
+ Field[] fields = fieldsByClass.get( cls );
if ( fields == null )
{
fields = cls.getDeclaredFields();
@@ -341,7 +343,7 @@
fieldIsPrimitiveByClass.put( fieldType, Boolean.valueOf(
fieldType.isPrimitive() ) );
}
- if ( ((Boolean) fieldIsPrimitiveByClass.get( fieldType
)).booleanValue() )
+ if ( fieldIsPrimitiveByClass.get( fieldType ).booleanValue() )
{
return false;
}
