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/08/05 22:16:54 UTC
svn commit: r682924 - in /maven/plugins/trunk/maven-war-plugin/src:
main/java/org/apache/maven/plugin/war/
main/java/org/apache/maven/plugin/war/packaging/
test/java/org/apache/maven/plugin/war/
test/java/org/apache/maven/plugin/war/util/
Author: hboutemy
Date: Tue Aug 5 13:16:53 2008
New Revision: 682924
URL: http://svn.apache.org/viewvc?rev=682924&view=rev
Log:
fixed typo
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java
maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=682924&r1=682923&r2=682924&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java Tue Aug 5 13:16:53 2008
@@ -390,9 +390,9 @@
*
* @param project the maven project
* @param webappDirectory the target directory
- * @throws MojoExecutionException if an error occured while packaging the webapp
- * @throws MojoFailureException if an unexpected error occured while packaging the webapp
- * @throws IOException if an error occured while copying the files
+ * @throws MojoExecutionException if an error occurred while packaging the webapp
+ * @throws MojoFailureException if an unexpected error occurred while packaging the webapp
+ * @throws IOException if an error occurred while copying the files
*/
public void buildWebapp( MavenProject project, File webappDirectory )
throws MojoExecutionException, MojoFailureException, IOException
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java?rev=682924&r1=682923&r2=682924&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java Tue Aug 5 13:16:53 2008
@@ -71,7 +71,7 @@
* @param sourceBaseDir the base directory from which the <tt>sourceFilesSet</tt> will be copied
* @param sourceFilesSet the files to be copied
* @param targetPrefix the prefix to add to the target file name
- * @throws IOException if an error occured while copying the files
+ * @throws IOException if an error occurred while copying the files
*/
protected void copyFiles( String sourceId, WarPackagingContext context, File sourceBaseDir, PathSet sourceFilesSet,
String targetPrefix, boolean filtered )
@@ -116,7 +116,7 @@
* @param context the context to use
* @param sourceBaseDir the base directory from which the <tt>sourceFilesSet</tt> will be copied
* @param sourceFilesSet the files to be copied
- * @throws IOException if an error occured while copying the files
+ * @throws IOException if an error occurred while copying the files
*/
protected void copyFiles( String sourceId, WarPackagingContext context, File sourceBaseDir, PathSet sourceFilesSet,
boolean filtered )
@@ -135,7 +135,7 @@
* @param context the context to use
* @param file the file to copy
* @param targetFilename the relative path according to the root of the webapp
- * @throws IOException if an error occured while copying
+ * @throws IOException if an error occurred while copying
*/
protected void copyFile( String sourceId, final WarPackagingContext context, final File file,
String targetFilename )
@@ -185,7 +185,7 @@
/**
* Copy the specified file if the target location has not yet already been
- * used and filter its content with the configureed filter properties.
+ * used and filter its content with the configured filter properties.
* <p/>
* The <tt>targetFileName</tt> is the relative path according to the root of
* the generated web application.
@@ -195,8 +195,8 @@
* @param file the file to copy
* @param targetFilename the relative path according to the root of the webapp
* @return true if the file has been copied, false otherwise
- * @throws IOException if an error occured while copying
- * @throws MojoExecutionException if an error occured while retrieving the filter properties
+ * @throws IOException if an error occurred while copying
+ * @throws MojoExecutionException if an error occurred while retrieving the filter properties
*/
protected boolean copyFilteredFile( String sourceId, final WarPackagingContext context, File file,
String targetFilename )
@@ -235,7 +235,7 @@
* @param context the packaging context
* @param file the file to unpack
* @param unpackDirectory the directory to use for th unpacked file
- * @throws MojoExecutionException if an error occured while unpacking the file
+ * @throws MojoExecutionException if an error occurred while unpacking the file
*/
protected void doUnpack( WarPackagingContext context, File file, File unpackDirectory )
throws MojoExecutionException
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java?rev=682924&r1=682923&r2=682924&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java Tue Aug 5 13:16:53 2008
@@ -108,7 +108,7 @@
* @param context the packaging context
* @param overlay the overlay
* @return the directory containing the unpacked overlay
- * @throws MojoExecutionException if an error occured while unpacking the overlay
+ * @throws MojoExecutionException if an error occurred while unpacking the overlay
*/
protected File unpackOverlay( WarPackagingContext context, Overlay overlay )
throws MojoExecutionException
Modified: maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java?rev=682924&r1=682923&r2=682924&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java Tue Aug 5 13:16:53 2008
@@ -205,7 +205,7 @@
* @param webinfDir the web-inf directory
* @param metainfDir the meta-inf directory
* @throws MojoFailureException if the web.xml is specified but does not exist
- * @throws MojoExecutionException if an error occured while copying the descriptors
+ * @throws MojoExecutionException if an error occurred while copying the descriptors
*/
protected void handleDeploymentDescriptors( WarPackagingContext context, File webinfDir, File metainfDir )
throws MojoFailureException, MojoExecutionException
@@ -275,8 +275,8 @@
*
* @param context the war packaging context to use
* @param resource the resource to copy
- * @throws IOException if an error occured while copying the resources
- * @throws MojoExecutionException if an error occured while retrieving the filter properties
+ * @throws IOException if an error occurred while copying the resources
+ * @throws MojoExecutionException if an error occurred while retrieving the filter properties
*/
public void copyResources( WarPackagingContext context, Resource resource )
throws IOException, MojoExecutionException
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java?rev=682924&r1=682923&r2=682924&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java Tue Aug 5 13:16:53 2008
@@ -138,7 +138,7 @@
* Cleans up a directory.
*
* @param directory the directory to remove
- * @throws IOException if an error occured while removing the directory
+ * @throws IOException if an error occurred while removing the directory
*/
protected void cleanDirectory( File directory )
throws IOException
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java?rev=682924&r1=682923&r2=682924&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java Tue Aug 5 13:16:53 2008
@@ -572,7 +572,7 @@
* @param webAppDirectory the webapp directory
* @param overlayId the id of the overlay
* @param filePath the relative path
- * @throws IOException if an error occured while reading the files
+ * @throws IOException if an error occurred while reading the files
*/
protected void assertOverlayedFile( File webAppDirectory, String overlayId, String filePath )
throws IOException
@@ -594,7 +594,7 @@
* @param testId te id of the test
* @param webAppDirectory the webapp directory
* @param filePath the relative path
- * @throws IOException if an error occured while reading the files
+ * @throws IOException if an error occurred while reading the files
*/
protected void assertDefaultFileContent( String testId, File webAppDirectory, String filePath )
throws Exception
Modified: maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java?rev=682924&r1=682923&r2=682924&view=diff
==============================================================================
--- maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java (original)
+++ maven/plugins/trunk/maven-war-plugin/src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java Tue Aug 5 13:16:53 2008
@@ -221,7 +221,7 @@
/**
* Test method for 'org.apache.maven.plugin.war.PathSet.addAllFilesInDirectory(File, String)'
*
- * @throws IOException if an io error occured
+ * @throws IOException if an io error occurred
*/
public void testAddAllFilesInDirectory()
throws IOException