Author: dennisl
Date: Sun Jul 16 03:09:16 2006
New Revision: 422425
URL: http://svn.apache.org/viewvc?rev=422425&view=rev
Log:
Use consistent spelling of JIRA
Modified:
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/announcement/AnnouncementMojo.java
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/announcement/JiraAnnouncementDownloader.java
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraDownloader2.java
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraMojo.java
maven/sandbox/plugins/maven-changes-plugin/src/site/apt/usage.apt
Modified:
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/announcement/AnnouncementMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/announcement/AnnouncementMojo.java?rev=422425&r1=422424&r2=422425&view=diff
==============================================================================
---
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/announcement/AnnouncementMojo.java
(original)
+++
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/announcement/AnnouncementMojo.java
Sun Jul 16 03:09:16 2006
@@ -155,7 +155,7 @@
private ChangesXML xml;
//=======================================//
- // Jira-Announcement Needed Parameters //
+ // JIRA-Announcement Needed Parameters //
//=======================================//
/**
@@ -198,7 +198,7 @@
private String resolutionId;
/**
- * The path of the XML file of Jira-announcements to be parsed.
+ * The path of the XML file of JIRA-announcements to be parsed.
*
* @parameter expression="${project.build.directory}/jira-announcement.xml"
* @required
@@ -471,7 +471,7 @@
catch( Exception e )
{
throw new MojoExecutionException(
- "Failed to download Jira Announcement", e );
+ "Failed to download JIRA Announcement", e );
}
}
Modified:
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/announcement/JiraAnnouncementDownloader.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/announcement/JiraAnnouncementDownloader.java?rev=422425&r1=422424&r2=422425&view=diff
==============================================================================
---
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/announcement/JiraAnnouncementDownloader.java
(original)
+++
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/announcement/JiraAnnouncementDownloader.java
Sun Jul 16 03:09:16 2006
@@ -116,7 +116,7 @@
}
/**
- * Creates a filter given the maven.jira parameters and some defaults.
+ * Creates a filter given the parameters and some defaults.
*
* @return request parameters to be added to URL used for downloading the
JIRA issues
*/
@@ -280,7 +280,7 @@
{
jiraUrl = jiraUrl.substring( 0, jiraUrl.lastIndexOf( "/" ) );
}
- getLog().info( "Jira lives at: " + jiraUrl );
+ getLog().info( "JIRA lives at: " + jiraUrl );
urlMap.put("url", jiraUrl);
@@ -416,8 +416,7 @@
* Downloads the given link using the configured HttpClient, possibly
following redirects.
*
* @param cl the HttpClient
- * @param link the JiraUrl
- * @return
+ * @param link the URL to JIRA
*/
private void download( final HttpClient cl, final String link )
{
Modified:
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraDownloader2.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraDownloader2.java?rev=422425&r1=422424&r2=422425&view=diff
==============================================================================
---
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraDownloader2.java
(original)
+++
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraDownloader2.java
Sun Jul 16 03:09:16 2006
@@ -124,7 +124,7 @@
}
/**
- * Creates a filter given the maven.jira parameters and some defaults.
+ * Creates a filter given the parameters and some defaults.
*
* @return request parameters to be added to URL used for downloading the
JIRA issues
*/
@@ -285,7 +285,7 @@
{
jiraUrl = jiraUrl.substring( 0, jiraUrl.lastIndexOf( "/" ) );
}
- getLog().info( "Jira lives at: " + jiraUrl );
+ getLog().info( "JIRA lives at: " + jiraUrl );
urlMap.put("url", jiraUrl);
Modified:
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraMojo.java?rev=422425&r1=422424&r2=422425&view=diff
==============================================================================
---
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraMojo.java
(original)
+++
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraMojo.java
Sun Jul 16 03:09:16 2006
@@ -46,7 +46,7 @@
private String outputDirectory;
/**
- * Path of the Jira XML file to be parsed.
+ * Path of the JIRA XML file to be parsed.
*
* @parameter expression="${project.build.directory}/jira-results.xml "
* @required
@@ -82,7 +82,7 @@
private Settings settings;
/**
- * Maximum number of entries to be displayed by the Jira Report.
+ * Maximum number of entries to be displayed by the JIRA Report.
*
* @parameter default-value=100
*
@@ -90,8 +90,8 @@
private int maxEntries;
/**
- * Defines the filter parameters to restrict the result issues from Jira.
- * The filter parameters property must use the same format of url
parameters from the Jira search.
+ * Defines the filter parameters to restrict the result issues from JIRA.
+ * The filter parameters property must use the same format of url
parameters from the JIRA search.
*
* @parameter default-value=""
*/
@@ -132,28 +132,28 @@
private String component;
/**
- * Defines the Jira username for authentication into a private Jira
installation.
+ * Defines the JIRA username for authentication into a private JIRA
installation.
*
* @parameter default-value=""
*/
private String jiraUser;
/**
- * Defines the Jira password for authentication into a private Jira
installation.
+ * Defines the JIRA password for authentication into a private JIRA
installation.
*
* @parameter default-value=""
*/
private String jiraPassword;
/**
- * Defines the http user for basic authentication into the Jira webserver.
+ * Defines the http user for basic authentication into the JIRA webserver.
*
* @parameter default-value=""
*/
private String webUser;
/**
- * Defines the http password for basic authentication into the Jira
webserver.
+ * Defines the http password for basic authentication into the JIRA
webserver.
*
* @parameter default-value=""
*/
@@ -265,21 +265,21 @@
{
if ( ( (MavenProject) project ).getIssueManagement() == null )
{
- getLog().error( "No Issue Management set. Jira Report will not be
generated." );
+ getLog().error( "No Issue Management set. JIRA Report will not be
generated." );
return false;
}
else if ( ( ( (MavenProject) project ).getIssueManagement().getUrl()
== null )
|| ( ( (MavenProject) project
).getIssueManagement().getUrl().trim().equals( "" ) ) )
{
- getLog().error( "No URL set in Issue Management. Jira Report will
not be generated." );
+ getLog().error( "No URL set in Issue Management. JIRA Report will
not be generated." );
return false;
}
else if ( ( ( (MavenProject) project
).getIssueManagement().getSystem() != null )
&& !( ( (MavenProject) project
).getIssueManagement().getSystem().equalsIgnoreCase( "jira" ) ) )
{
- getLog().error( "Jira Report only supports JIRA. Jira Report will
not be generated." );
+ getLog().error( "JIRA Report only supports JIRA. JIRA Report will
not be generated." );
return false;
}
Modified: maven/sandbox/plugins/maven-changes-plugin/src/site/apt/usage.apt
URL:
http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-changes-plugin/src/site/apt/usage.apt?rev=422425&r1=422424&r2=422425&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-changes-plugin/src/site/apt/usage.apt (original)
+++ maven/sandbox/plugins/maven-changes-plugin/src/site/apt/usage.apt Sun Jul
16 03:09:16 2006
@@ -9,7 +9,7 @@
Usage
- This plugin is used to create a Changes Report, a Jira Report and an
Announcement text file.
+ This plugin is used to create a Changes Report, a JIRA Report and an
Announcement text file.
*How to Generate the Changes Report
@@ -106,9 +106,9 @@
-------------------
-*How to Generate the Jira Report
+*How to Generate the JIRA Report
- <<Note:>> To use the Jira Report, the <<<\<issueManagement\>>>> section in
the <<<pom.xml>>> of the project must be configured.
+ <<Note:>> To use the JIRA Report, the <<<\<issueManagement\>>>> section in
the <<<pom.xml>>> of the project must be configured.
Sample code inside your <<<pom.xml>>>:
@@ -123,7 +123,7 @@
-------------------
- To generate the Jira report, insert the changes plugin in the
<<<\<reporting\>>>> section of your project <<<pom.xml>>>
+ To generate the JIRA report, insert the changes plugin in the
<<<\<reporting\>>>> section of your project <<<pom.xml>>>
-------------------
<project>
