You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2008/04/19 23:41:40 UTC
svn commit: r649855 - in /maven/ant-tasks/trunk/src:
main/java/org/apache/maven/artifact/ant/
test/java/org/apache/maven/artifact/ant/
Author: hboutemy
Date: Sat Apr 19 14:41:34 2008
New Revision: 649855
URL: http://svn.apache.org/viewvc?rev=649855&view=rev
Log:
fixed errors reported by CheckStyle
Modified:
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntResolutionListener.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AttachedArtifact.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallDeployTaskSupport.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java
maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java
maven/ant-tasks/trunk/src/test/java/org/apache/maven/artifact/ant/ClassLoaderTask.java
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java?rev=649855&r1=649854&r2=649855&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java Sat Apr 19 14:41:34 2008
@@ -234,7 +234,9 @@
if ( settingsFile.exists() )
{
userSettingsFile = settingsFile;
- } else {
+ }
+ else
+ {
settingsFile = newFile( System.getProperty( "user.home" ), ".m2", "settings.xml" );
if ( settingsFile.exists() )
{
@@ -248,7 +250,9 @@
if ( settingsFile.exists() )
{
globalSettingsFile = settingsFile;
- } else {
+ }
+ else
+ {
// look in ${M2_HOME}/conf
List env = Execute.getProcEnvironment();
for ( Iterator iter = env.iterator(); iter.hasNext(); )
@@ -256,8 +260,8 @@
String var = (String) iter.next();
if ( var.startsWith( "M2_HOME=" ) )
{
- String m2_home = var.substring( "M2_HOME=".length() );
- globalSettingsFile = newFile( m2_home, "conf", "settings.xml" );
+ String m2Home = var.substring( "M2_HOME=".length() );
+ globalSettingsFile = newFile( m2Home, "conf", "settings.xml" );
break;
}
}
@@ -316,8 +320,8 @@
if ( settings == null )
{
settings = new Settings();
- RuntimeInfo rtInfo = new RuntimeInfo(settings);
- settings.setRuntimeInfo(rtInfo);
+ RuntimeInfo rtInfo = new RuntimeInfo( settings );
+ settings.setRuntimeInfo( rtInfo );
}
return settings;
@@ -326,7 +330,9 @@
public void setSettingsFile( File settingsFile )
{
if ( !settingsFile.exists() )
+ {
throw new BuildException( "settingsFile does not exist: " + settingsFile.getAbsolutePath() );
+ }
userSettingsFile = settingsFile;
settings = null;
@@ -358,7 +364,8 @@
}
catch ( Exception e )
{
- log( "Failed to initialize environment variable resolver. Skipping environment substitution in settings." );
+ log( "Failed to initialize environment variable resolver. Skipping environment substitution in "
+ + "settings." );
}
StringReader sReader = new StringReader( rawInput );
@@ -533,14 +540,14 @@
MavenProjectBuilder projectBuilder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE );
MavenProject mavenProject;
- try
- {
- mavenProject = projectBuilder.buildStandaloneSuperProject( localArtifactRepository, getProfileManager() );
- }
- catch (ProjectBuildingException e)
- {
+ try
+ {
+ mavenProject = projectBuilder.buildStandaloneSuperProject( localArtifactRepository, getProfileManager() );
+ }
+ catch ( ProjectBuildingException e )
+ {
throw new BuildException( "Unable to create dummy Pom", e );
- }
+ }
Pom pom = new Pom();
@@ -625,7 +632,7 @@
protected ProfileManager getProfileManager()
{
- return profileManager;
+ return profileManager;
}
public void addLocalRepository( LocalRepository localRepository )
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java?rev=649855&r1=649854&r2=649855&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactWithRepositoryTask.java Sat Apr 19 14:41:34 2008
@@ -56,12 +56,12 @@
private static String statusAsString( RepositoryPolicy policy )
{
- return (policy == null) || policy.isEnabled() ? "enabled" : "disabled";
+ return ( policy == null ) || policy.isEnabled() ? "enabled" : "disabled";
}
protected List createRemoteArtifactRepositories()
{
- return createRemoteArtifactRepositories( null );
+ return createRemoteArtifactRepositories( null );
}
/**
@@ -71,24 +71,24 @@
* @return the list of ArtifactRepository-ies
* @see #createRemoteArtifactRepository(RemoteRepository)
*/
- protected List createRemoteArtifactRepositories(List pomRepositories)
+ protected List createRemoteArtifactRepositories( List pomRepositories )
{
List remoteRepositories = new ArrayList();
remoteRepositories.addAll( getRemoteRepositories() );
if ( getRemoteRepositories().isEmpty() )
{
- remoteRepositories.add( getDefaultRemoteRepository() );
+ remoteRepositories.add( getDefaultRemoteRepository() );
}
if ( pomRepositories != null )
{
- for ( Iterator i = pomRepositories.iterator(); i.hasNext(); )
- {
- Repository pomRepository = (Repository) i.next();
-
- remoteRepositories.add( createAntRemoteRepository( pomRepository ) );
- }
+ for ( Iterator i = pomRepositories.iterator(); i.hasNext(); )
+ {
+ Repository pomRepository = (Repository) i.next();
+
+ remoteRepositories.add( createAntRemoteRepository( pomRepository ) );
+ }
}
log( "Using remote repositories:", Project.MSG_VERBOSE );
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java?rev=649855&r1=649854&r2=649855&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntDownloadMonitor.java Sat Apr 19 14:41:34 2008
@@ -34,6 +34,8 @@
extends ProjectComponent
implements TransferListener
{
+ private static final int KILO = 1024;
+
public void debug( String s )
{
log( s, Project.MSG_DEBUG );
@@ -44,7 +46,7 @@
long contentLength = event.getResource().getContentLength();
if ( ( contentLength > 0 ) && ( event.getRequestType() == TransferEvent.REQUEST_PUT ) )
{
- log( "Uploaded " + ( ( contentLength + 512 ) / 1024 ) + "K" );
+ log( "Uploaded " + ( ( contentLength + KILO / 2 ) / KILO ) + "K" );
}
}
@@ -70,7 +72,7 @@
long contentLength = event.getResource().getContentLength();
if ( contentLength > 0 )
{
- log( "Transferring " + ( ( contentLength + 512 ) / 1024 ) + "K from "
+ log( "Transferring " + ( ( contentLength + KILO / 2 ) / KILO ) + "K from "
+ event.getWagon().getRepository().getId() );
}
}
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntResolutionListener.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntResolutionListener.java?rev=649855&r1=649854&r2=649855&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntResolutionListener.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AntResolutionListener.java Sat Apr 19 14:41:34 2008
@@ -81,20 +81,20 @@
public void updateScopeCurrentPom( Artifact artifact, String scope )
{
- project.log( indent + artifact + " (not setting scope to: " + scope + "; local scope " + artifact.getScope() +
- " wins)", logLevel );
+ project.log( indent + artifact + " (not setting scope to: " + scope + "; local scope " + artifact.getScope()
+ + " wins)", logLevel );
}
public void selectVersionFromRange( Artifact artifact )
{
- project.log( indent + artifact + " (setting version to: " + artifact.getVersion() + " from range: " +
- artifact.getVersionRange() + ")", logLevel );
+ project.log( indent + artifact + " (setting version to: " + artifact.getVersion() + " from range: "
+ + artifact.getVersionRange() + ")", logLevel );
}
public void restrictRange( Artifact artifact, Artifact replacement, VersionRange newRange )
{
- project.log( indent + artifact + " (range restricted from: " + artifact.getVersionRange() + " and: " +
- replacement.getVersionRange() + " to: " + newRange + " )", logLevel );
+ project.log( indent + artifact + " (range restricted from: " + artifact.getVersionRange() + " and: "
+ + replacement.getVersionRange() + " to: " + newRange + " )", logLevel );
}
public void manageArtifact( Artifact artifact, Artifact replacement )
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AttachedArtifact.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AttachedArtifact.java?rev=649855&r1=649854&r2=649855&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AttachedArtifact.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/AttachedArtifact.java Sat Apr 19 14:41:34 2008
@@ -35,27 +35,33 @@
private String classifier;
- public File getFile() {
+ public File getFile()
+ {
return file;
}
- public void setFile(final File file) {
+ public void setFile( final File file )
+ {
this.file = file;
}
- public String getType() {
+ public String getType()
+ {
return type;
}
- public void setType(final String type) {
+ public void setType( final String type )
+ {
this.type = type;
}
- public String getClassifier() {
+ public String getClassifier()
+ {
return classifier;
}
- public void setClassifier(final String classifier) {
+ public void setClassifier( final String classifier )
+ {
this.classifier = classifier;
}
}
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java?rev=649855&r1=649854&r2=649855&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java Sat Apr 19 14:41:34 2008
@@ -172,24 +172,6 @@
throw new BuildException( e.getMessage(), e );
}
- /*
- MANTTASKS-37: Do what other ant tasks do and just override the path id.
- if ( pathId != null && getProject().getReference( pathId ) != null )
- {
- throw new BuildException( "Reference ID " + pathId + " already exists" );
- }
-
- if ( filesetId != null && getProject().getReference( filesetId ) != null )
- {
- throw new BuildException( "Reference ID " + filesetId + " already exists" );
- }
-
- if ( sourcesFilesetId != null && getProject().getReference( sourcesFilesetId ) != null )
- {
- throw new BuildException( "Reference ID " + sourcesFilesetId + " already exists" );
- }
- */
-
FileList fileList = new FileList();
fileList.setDir( getLocalRepository().getPath() );
@@ -273,7 +255,7 @@
toFileSet.createInclude().setName( filename );
- if ( toFileList != null)
+ if ( toFileList != null )
{
FileList.FileName file = new FileList.FileName();
file.setName( filename );
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java?rev=649855&r1=649854&r2=649855&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/DeployTask.java Sat Apr 19 14:41:34 2008
@@ -54,7 +54,7 @@
*/
protected ArtifactRepository createDeploymentArtifactRepository( RemoteRepository repository )
{
- if ( repository.getId().equals( repository.getUrl() ))
+ if ( repository.getId().equals( repository.getUrl() ) )
{
// MANTTASKS-103: avoid default id set to the url, since it is used for maven-metadata-<id>.xml
repository.setId( "remote" );
@@ -73,8 +73,9 @@
{
repositoryFactory = getArtifactRepositoryFactory( repository );
- artifactRepository = repositoryFactory.createDeploymentArtifactRepository( repository.getId(), repository.getUrl(),
- repositoryLayout, uniqueVersion );
+ artifactRepository =
+ repositoryFactory.createDeploymentArtifactRepository( repository.getId(), repository.getUrl(),
+ repositoryLayout, uniqueVersion );
}
finally
{
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallDeployTaskSupport.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallDeployTaskSupport.java?rev=649855&r1=649854&r2=649855&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallDeployTaskSupport.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallDeployTaskSupport.java Sat Apr 19 14:41:34 2008
@@ -54,11 +54,13 @@
Pom pom = super.buildPom( localArtifactRepository );
// attach artifacts
- if (attachedArtifacts != null) {
+ if ( attachedArtifacts != null )
+ {
Iterator iter = attachedArtifacts.iterator();
- while (iter.hasNext()) {
- AttachedArtifact attached = (AttachedArtifact)iter.next();
+ while ( iter.hasNext() )
+ {
+ AttachedArtifact attached = (AttachedArtifact) iter.next();
pom.attach( attached );
}
}
@@ -68,12 +70,13 @@
public AttachedArtifact createAttach()
{
- if (attachedArtifacts == null) {
+ if ( attachedArtifacts == null )
+ {
attachedArtifacts = new ArrayList();
}
AttachedArtifact attach = new AttachedArtifact();
- attachedArtifacts.add(attach);
+ attachedArtifacts.add( attach );
return attach;
}
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java?rev=649855&r1=649854&r2=649855&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/InstallWagonProviderTask.java Sat Apr 19 14:41:34 2008
@@ -47,20 +47,20 @@
public class InstallWagonProviderTask
extends AbstractArtifactWithRepositoryTask
{
- private String groupId = "org.apache.maven.wagon";
-
+ private String groupId = "org.apache.maven.wagon";
+
private String artifactId;
private String version;
public String getGroupId()
{
- return groupId;
+ return groupId;
}
public void setGroupId( String groupId )
{
- this.groupId = groupId;
+ this.groupId = groupId;
}
public String getArtifactId()
@@ -84,7 +84,6 @@
}
public void doExecute()
- throws BuildException
{
VersionRange versionRange;
try
@@ -93,9 +92,9 @@
}
catch ( InvalidVersionSpecificationException e )
{
- throw new BuildException( "Unable to get extension '" +
- ArtifactUtils.versionlessKey( groupId, artifactId ) + "' because version '" + version +
- " is invalid: " + e.getMessage(), e );
+ throw new BuildException( "Unable to get extension '"
+ + ArtifactUtils.versionlessKey( groupId, artifactId ) + "' because version '"
+ + version + " is invalid: " + e.getMessage(), e );
}
ArtifactFactory factory = (ArtifactFactory) lookup( ArtifactFactory.ROLE );
Modified: maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java?rev=649855&r1=649854&r2=649855&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java (original)
+++ maven/ant-tasks/trunk/src/main/java/org/apache/maven/artifact/ant/Pom.java Sat Apr 19 14:41:34 2008
@@ -57,20 +57,17 @@
/**
* A POM typedef.
- *
- * Also an Ant Task that registers a handler called POMPropertyHelper
- * that intercepts all calls to property value resolution and replies instead
- * of Ant to properties that start with the id of the pom.
- *
- * Example:
- * ${maven.project.artifactId}
- *
+ *
+ * Also an Ant Task that registers a handler called POMPropertyHelper that intercepts all calls to property value
+ * resolution and replies instead of Ant to properties that start with the id of the pom.
+ *
+ * Example: ${maven.project.artifactId}
+ *
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @author <a href="mailto:nicolaken@apache.org">Nicola Ken Barozzi</a>
* @version $Id$
*/
-public class Pom
- extends AbstractArtifactWithRepositoryTask
+public class Pom extends AbstractArtifactWithRepositoryTask
{
private String refid;
@@ -138,10 +135,12 @@
{
MavenProjectHelper helper = (MavenProjectHelper) lookup( MavenProjectHelper.ROLE );
MavenProject project = getMavenProject();
- if (attached.getClassifier() != null) {
+ if ( attached.getClassifier() != null )
+ {
helper.attachArtifact( project, attached.getType(), attached.getClassifier(), attached.getFile() );
}
- else {
+ else
+ {
helper.attachArtifact( project, attached.getType(), attached.getFile() );
}
}
@@ -213,9 +212,9 @@
ArtifactResolver resolver = (ArtifactResolver) lookup( ArtifactResolver.ROLE );
List remoteRepositories = createRemoteArtifactRepositories( model.getRepositories() );
- resolver.resolveTransitively( Collections.singleton( parentArtifact ),
- createDummyArtifact(), createLocalArtifactRepository(),
- remoteRepositories, metadataSource, null );
+ resolver.resolveTransitively( Collections.singleton( parentArtifact ), createDummyArtifact(),
+ createLocalArtifactRepository(), remoteRepositories, metadataSource,
+ null );
}
catch ( ArtifactResolutionException e )
{
@@ -224,7 +223,8 @@
}
catch ( ArtifactNotFoundException e )
{
- throw new BuildException( "Unable to download parent pom " + parent.getId() + " in remote repository: " + e.getMessage(), e );
+ throw new BuildException( "Unable to download parent pom " + parent.getId() + " in remote repository: "
+ + e.getMessage(), e );
}
}
}
@@ -237,127 +237,127 @@
public String getArtifactId()
{
return getMavenProject().getArtifactId();
- } //-- String getArtifactId()
+ } // -- String getArtifactId()
public Build getBuild()
{
return getMavenProject().getBuild();
- } //-- Build getBuild()
+ } // -- Build getBuild()
public CiManagement getCiManagement()
{
return getMavenProject().getCiManagement();
- } //-- CiManagement getCiManagement()
+ } // -- CiManagement getCiManagement()
public List getContributors()
{
return getMavenProject().getContributors();
- } //-- List getContributors()
+ } // -- List getContributors()
public List getDependencies()
{
return getMavenProject().getDependencies();
- } //-- List getDependencies()
+ } // -- List getDependencies()
public DependencyManagement getDependencyManagement()
{
return getMavenProject().getDependencyManagement();
- } //-- DependencyManagement getDependencyManagement()
+ } // -- DependencyManagement getDependencyManagement()
public String getDescription()
{
return getMavenProject().getDescription();
- } //-- String getDescription()
+ } // -- String getDescription()
public List getDevelopers()
{
return getMavenProject().getDevelopers();
- } //-- List getDevelopers()
+ } // -- List getDevelopers()
public DistributionManagement getDistributionManagement()
{
return getMavenProject().getDistributionManagement();
- } //-- DistributionManagement getDistributionManagement()
+ } // -- DistributionManagement getDistributionManagement()
public String getGroupId()
{
return getMavenProject().getGroupId();
- } //-- String getGroupId()
+ } // -- String getGroupId()
public String getInceptionYear()
{
return getMavenProject().getInceptionYear();
- } //-- String getInceptionYear()
+ } // -- String getInceptionYear()
public IssueManagement getIssueManagement()
{
return getMavenProject().getIssueManagement();
- } //-- IssueManagement getIssueManagement()
+ } // -- IssueManagement getIssueManagement()
public List getLicenses()
{
return getMavenProject().getLicenses();
- } //-- List getLicenses()
+ } // -- List getLicenses()
public List getMailingLists()
{
return getMavenProject().getMailingLists();
- } //-- List getMailingLists()
+ } // -- List getMailingLists()
public String getModelVersion()
{
return getMavenProject().getModelVersion();
- } //-- String getModelVersion()
+ } // -- String getModelVersion()
public List getModules()
{
return getMavenProject().getModules();
- } //-- List getModules()
+ } // -- List getModules()
public String getName()
{
return getMavenProject().getName();
- } //-- String getName()
+ } // -- String getName()
public Organization getOrganization()
{
return getMavenProject().getOrganization();
- } //-- Organization getOrganization()
+ } // -- Organization getOrganization()
public String getPackaging()
{
return getMavenProject().getPackaging();
- } //-- String getPackaging()
+ } // -- String getPackaging()
public List getPluginRepositories()
{
return getMavenProject().getPluginRepositories();
- } //-- List getPluginRepositories()
+ } // -- List getPluginRepositories()
public Reporting getReporting()
{
return getMavenProject().getReporting();
- } //-- Reports getReports()
+ } // -- Reports getReports()
public List getRepositories()
{
return getMavenProject().getRepositories();
- } //-- List getRepositories()
+ } // -- List getRepositories()
public Scm getScm()
{
return getMavenProject().getScm();
- } //-- Scm getScm()
+ } // -- Scm getScm()
public String getUrl()
{
return getMavenProject().getUrl();
- } //-- String getUrl()
+ } // -- String getUrl()
public String getVersion()
{
return getMavenProject().getVersion();
- } //-- String getVersion()
+ } // -- String getVersion()
public String getId()
{
@@ -388,8 +388,7 @@
/**
* The property interceptor that handles the calls for "pom." properties
*/
- private class POMPropertyHelper
- extends PropertyHelper
+ private class POMPropertyHelper extends PropertyHelper
{
/**
* The method that gets called by Ant with every request of property
@@ -417,15 +416,17 @@
}
}
+ private static final String PROPERTIES_PREFIX = "project.properties.";
+
private Object getPOMValue( String expression )
{
Object value = null;
try
{
- if ( expression.startsWith( "project.properties." ) )
+ if ( expression.startsWith( PROPERTIES_PREFIX ) )
{
- expression = expression.substring( 19 );
+ expression = expression.substring( PROPERTIES_PREFIX.length() );
value = getMavenProject().getProperties().get( expression );
}
else
Modified: maven/ant-tasks/trunk/src/test/java/org/apache/maven/artifact/ant/ClassLoaderTask.java
URL: http://svn.apache.org/viewvc/maven/ant-tasks/trunk/src/test/java/org/apache/maven/artifact/ant/ClassLoaderTask.java?rev=649855&r1=649854&r2=649855&view=diff
==============================================================================
--- maven/ant-tasks/trunk/src/test/java/org/apache/maven/artifact/ant/ClassLoaderTask.java (original)
+++ maven/ant-tasks/trunk/src/test/java/org/apache/maven/artifact/ant/ClassLoaderTask.java Sat Apr 19 14:41:34 2008
@@ -23,6 +23,12 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
+/**
+ * Task to test context classloader.
+ *
+ * @author <a href="mailto:hboutemy@apache.org">Herve Boutemy</a>
+ * @version $Id$
+ */
public class ClassLoaderTask
extends Task
{