o Removing comment about no contributors.

o Changing the promt from "$>" to "$ ".


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@232887 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Trygve Laugstol 2005-08-15 21:38:11 +00:00
parent ef2ef62898
commit b584a47541
3 changed files with 29 additions and 47 deletions

View File

@ -23,11 +23,11 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.AbstractMavenReportRenderer;
import org.apache.maven.reporting.MavenReportException;
import org.codehaus.doxia.sink.Sink;
import org.codehaus.doxia.site.renderer.SiteRenderer;
import org.codehaus.plexus.util.StringUtils;
import java.io.IOException;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@ -44,6 +44,10 @@ import java.util.ResourceBundle;
public class CimReport
extends AbstractMavenReport
{
// ----------------------------------------------------------------------
// Parameters
// ----------------------------------------------------------------------
/**
* @parameter expression="${project.build.directory}/site"
* @required
@ -64,57 +68,40 @@ public class CimReport
*/
private MavenProject project;
/**
* @see org.apache.maven.reporting.MavenReport#getName(java.util.Locale)
*/
// ----------------------------------------------------------------------
// MavenReport Implementation
// ----------------------------------------------------------------------
public String getName( Locale locale )
{
return getBundle( locale ).getString( "report.cim.name" );
}
/**
* @see org.apache.maven.reporting.MavenReport#getCategoryName()
*/
public String getCategoryName()
{
return CATEGORY_PROJECT_INFORMATION;
}
/**
* @see org.apache.maven.reporting.MavenReport#getDescription(java.util.Locale)
*/
public String getDescription( Locale locale )
{
return getBundle( locale ).getString( "report.cim.description" );
}
/**
* @see org.apache.maven.reporting.AbstractMavenReport#getOutputDirectory()
*/
protected String getOutputDirectory()
{
return outputDirectory;
}
/**
* @see org.apache.maven.reporting.AbstractMavenReport#getProject()
*/
protected MavenProject getProject()
{
return project;
}
/**
* @see org.apache.maven.reporting.AbstractMavenReport#getSiteRenderer()
*/
protected SiteRenderer getSiteRenderer()
{
return siteRenderer;
}
/**
* @see org.apache.maven.reporting.AbstractMavenReport#executeReport(java.util.Locale)
*/
public void executeReport( Locale locale )
throws MavenReportException
{
@ -123,14 +110,15 @@ public class CimReport
r.render();
}
/**
* @see org.apache.maven.reporting.MavenReport#getOutputName()
*/
public String getOutputName()
{
return "integration";
}
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
static class CimRenderer
extends AbstractMavenReportRenderer
{
@ -147,17 +135,11 @@ public class CimReport
this.locale = locale;
}
/**
* @see org.apache.maven.reporting.MavenReportRenderer#getTitle()
*/
public String getTitle()
{
return getBundle( locale ).getString( "report.cim.title" );
}
/**
* @see org.apache.maven.reporting.AbstractMavenReportRenderer#renderBody()
*/
public void renderBody()
{
CiManagement cim = model.getCiManagement();
@ -276,4 +258,4 @@ public class CimReport
{
return ResourceBundle.getBundle( "project-info-report", locale, CimReport.class.getClassLoader() );
}
}
}

View File

@ -416,7 +416,7 @@ public class ScmReport
paragraph( getBundle( locale ).getString( "report.scm.accessbehindfirewall.svn.intro" ) );
StringBuffer sb = new StringBuffer();
sb.append( "$>svn checkout " ).append( svnRepo.getUrl() ).append( " " ).append( model.getArtifactId() );
sb.append( "$ svn checkout " ).append( svnRepo.getUrl() ).append( " " ).append( model.getArtifactId() );
verbatimText( sb.toString() );
}
else if ( ( devRepository != null ) && ( isScmSystem( devRepository, "cvs" ) ) )
@ -472,7 +472,7 @@ public class ScmReport
paragraph( getBundle( locale ).getString( "report.scm.devaccess.clearcase.intro" ) );
StringBuffer command = new StringBuffer();
command.append( "$>cleartool checkout " ).append( clearCaseRepo.getModule() );
command.append( "$ cleartool checkout " ).append( clearCaseRepo.getModule() );
verbatimText( command.toString() );
}
@ -494,9 +494,9 @@ public class ScmReport
paragraph( getBundle( locale ).getString( "report.scm.anonymousaccess.cvs.intro" ) );
StringBuffer command = new StringBuffer();
command.append( "$>cvs -d " ).append( cvsRepo.getCvsRoot() ).append( " login" );
command.append( "$ cvs -d " ).append( cvsRepo.getCvsRoot() ).append( " login" );
command.append( "\n" );
command.append( "$>cvs -z3 -d " ).append( cvsRepo.getCvsRoot() );
command.append( "$ cvs -z3 -d " ).append( cvsRepo.getCvsRoot() );
command.append( " co " ).append( cvsRepo.getModule() );
verbatimText( command.toString() );
@ -520,9 +520,9 @@ public class ScmReport
String cvsRoot = StringUtils.replace( cvsRepo.getCvsRoot(), cvsRepo.getUser(), "username" );
StringBuffer command = new StringBuffer();
command.append( "$>cvs -d " ).append( cvsRoot ).append( " login" );
command.append( "$ cvs -d " ).append( cvsRoot ).append( " login" );
command.append( "\n" );
command.append( "$>cvs -z3 -d " ).append( cvsRoot ).append( " co " ).append( cvsRepo.getModule() );
command.append( "$ cvs -z3 -d " ).append( cvsRoot ).append( " co " ).append( cvsRepo.getModule() );
verbatimText( command.toString() );
}
@ -544,7 +544,7 @@ public class ScmReport
paragraph( getBundle( locale ).getString( "report.scm.devaccess.perforce.intro" ) );
StringBuffer command = new StringBuffer();
command.append( "$>p4" );
command.append( "$ p4" );
if ( !StringUtils.isEmpty( perforceRepo.getHost() ) )
{
command.append( " -H " ).append( perforceRepo.getHost() );
@ -558,7 +558,7 @@ public class ScmReport
command.append( " " );
command.append( perforceRepo.getPath() );
command.append( "\n" );
command.append( "$>p4 submit -c \"A comment\"" );
command.append( "$ p4 submit -c \"A comment\"" );
verbatimText( command.toString() );
}
@ -583,11 +583,11 @@ public class ScmReport
String fullUrl = StringUtils.replace( starteamRepo.getFullUrl(), starteamRepo.getUser(), "username" );
fullUrl = StringUtils.replace( fullUrl, starteamRepo.getPassword(), "password" );
command.append( "$>stcmd co -x -nologo -stop -p " );
command.append( "$ stcmd co -x -nologo -stop -p " );
command.append( fullUrl );
command.append( " -is" );
command.append( "\n" );
command.append( "$>stcmd ci -x -nologo -stop -p " );
command.append( "$ stcmd ci -x -nologo -stop -p " );
command.append( fullUrl );
command.append( " -f NCI -is" );
@ -610,7 +610,7 @@ public class ScmReport
paragraph( getBundle( locale ).getString( "report.scm.anonymousaccess.svn.intro" ) );
StringBuffer sb = new StringBuffer();
sb.append( "$>svn checkout " ).append( svnRepo.getUrl() ).append( " " ).append( model.getArtifactId() );
sb.append( "$ svn checkout " ).append( svnRepo.getUrl() ).append( " " ).append( model.getArtifactId() );
verbatimText( sb.toString() );
}
@ -631,14 +631,14 @@ public class ScmReport
StringBuffer sb = new StringBuffer();
sb.append( "$>svn checkout " ).append( svnRepo.getUrl() ).append( " " ).append( model.getArtifactId() );
sb.append( "$ svn checkout " ).append( svnRepo.getUrl() ).append( " " ).append( model.getArtifactId() );
verbatimText( sb.toString() );
paragraph( getBundle( locale ).getString( "report.scm.devaccess.svn.intro2" ) );
sb = new StringBuffer();
sb.append( "$>svn commit --username your-username -m \"A message\"" );
sb.append( "$ svn commit --username your-username -m \"A message\"" );
verbatimText( sb.toString() );
}

View File

@ -53,7 +53,7 @@ report.team-list.intro.title=The Team
report.team-list.intro.description1=A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.
report.team-list.intro.description2=The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.
report.team-list.developers.title=Members
report.team-list.nodeveloper=There are no developers working on this project. Please check back at a later date.
report.team-list.nodeveloper=There are no developers working on this project.
report.team-list.developers.intro=The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.
report.team-list.developers.id=Id
report.team-list.developers.name=Name
@ -109,7 +109,7 @@ report.scm.accessbehindfirewall.svn.intro=For those users who are stuck behind a
report.scm.accessbehindfirewall.cvs.intro=For those developers who are stuck behind a corporate firewall, {CVSGrab, http://cvsgrab.sourceforge.net/} can use the viewcvs web interface to checkout the source code.
report.scm.accessbehindfirewall.general.intro=Refer to the documentation of the SCM used for more information about an access behind a firewall.
report.scm.accessthroughtproxy.title=Access through a proxy
report.scm.accessthroughtproxy.svn.intro1=The Subversion client can go through a proxy, if you configure it to do so. First, edit your "servers" configuration file to indicate which proxy to use. The files location depends on your operating system. On Linux or Unix it is located in the directory "~/.subversion". On Windows it is in "%APPDATA%\Subversion". (Try "echo %APPDATA%", note this is a hidden directory.)
report.scm.accessthroughtproxy.svn.intro1=The Subversion client can go through a proxy, if you configure it to do so. First, edit your "servers" configuration file to indicate which proxy to use. The files location depends on your operating system. On Linux or Unix it is located in the directory "~/.subversion". On Windows it is in "%APPDATA%\\Subversion". (Try "echo %APPDATA%", note this is a hidden directory.)
report.scm.accessthroughtproxy.svn.intro2=There are comments in the file explaining what to do. If you don't have that file, get the latest Subversion client and run any command; this will cause the configuration directory and template files to be created.
report.scm.accessthroughtproxy.svn.intro3=Example : Edit the 'servers' file and add something like :