[MWAR-366] Change package to org.apache.maven.plugins to prevent conflict with Maven Core
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1734135 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java b/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
similarity index 97%
rename from src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
rename to src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
index 008b6b3..6863cf3 100644
--- a/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/war/AbstractWarMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -34,19 +34,19 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugin.war.overlay.OverlayManager;
-import org.apache.maven.plugin.war.packaging.CopyUserManifestTask;
-import org.apache.maven.plugin.war.packaging.DependenciesAnalysisPackagingTask;
-import org.apache.maven.plugin.war.packaging.OverlayPackagingTask;
-import org.apache.maven.plugin.war.packaging.SaveWebappStructurePostPackagingTask;
-import org.apache.maven.plugin.war.packaging.WarPackagingContext;
-import org.apache.maven.plugin.war.packaging.WarPackagingTask;
-import org.apache.maven.plugin.war.packaging.WarPostPackagingTask;
-import org.apache.maven.plugin.war.packaging.WarProjectPackagingTask;
-import org.apache.maven.plugin.war.util.WebappStructure;
-import org.apache.maven.plugin.war.util.WebappStructureSerializer;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.war.overlay.OverlayManager;
+import org.apache.maven.plugins.war.packaging.CopyUserManifestTask;
+import org.apache.maven.plugins.war.packaging.DependenciesAnalysisPackagingTask;
+import org.apache.maven.plugins.war.packaging.OverlayPackagingTask;
+import org.apache.maven.plugins.war.packaging.SaveWebappStructurePostPackagingTask;
+import org.apache.maven.plugins.war.packaging.WarPackagingContext;
+import org.apache.maven.plugins.war.packaging.WarPackagingTask;
+import org.apache.maven.plugins.war.packaging.WarPostPackagingTask;
+import org.apache.maven.plugins.war.packaging.WarProjectPackagingTask;
+import org.apache.maven.plugins.war.util.WebappStructure;
+import org.apache.maven.plugins.war.util.WebappStructureSerializer;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.apache.maven.shared.filtering.MavenFilteringException;
@@ -507,7 +507,7 @@
}
/**
- * Returns a <tt>List</tt> of the {@link org.apache.maven.plugin.war.packaging.WarPackagingTask} instances to invoke
+ * Returns a <tt>List</tt> of the {@link org.apache.maven.plugins.war.packaging.WarPackagingTask} instances to invoke
* to perform the packaging.
*
* @param overlayManager the overlay manager
@@ -544,7 +544,7 @@
}
/**
- * Returns a <tt>List</tt> of the {@link org.apache.maven.plugin.war.packaging.WarPostPackagingTask} instances to
+ * Returns a <tt>List</tt> of the {@link org.apache.maven.plugins.war.packaging.WarPostPackagingTask} instances to
* invoke to perform the post-packaging.
*
* @return the list of post packaging tasks
diff --git a/src/main/java/org/apache/maven/plugin/war/Overlay.java b/src/main/java/org/apache/maven/plugins/war/Overlay.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugin/war/Overlay.java
rename to src/main/java/org/apache/maven/plugins/war/Overlay.java
index 63f5ab1..82f8f7f 100644
--- a/src/main/java/org/apache/maven/plugin/war/Overlay.java
+++ b/src/main/java/org/apache/maven/plugins/war/Overlay.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java b/src/main/java/org/apache/maven/plugins/war/WarExplodedMojo.java
similarity index 97%
rename from src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
rename to src/main/java/org/apache/maven/plugins/war/WarExplodedMojo.java
index df11a39..d1d6e0d 100644
--- a/src/main/java/org/apache/maven/plugin/war/WarExplodedMojo.java
+++ b/src/main/java/org/apache/maven/plugins/war/WarExplodedMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java b/src/main/java/org/apache/maven/plugins/war/WarInPlaceMojo.java
similarity index 97%
rename from src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java
rename to src/main/java/org/apache/maven/plugins/war/WarInPlaceMojo.java
index 9987896..fb2a5e6 100644
--- a/src/main/java/org/apache/maven/plugin/war/WarInPlaceMojo.java
+++ b/src/main/java/org/apache/maven/plugins/war/WarInPlaceMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java b/src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java
similarity index 98%
rename from src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java
rename to src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java
index c0639ec..23112d6 100644
--- a/src/main/java/org/apache/maven/plugin/war/WarManifestMojo.java
+++ b/src/main/java/org/apache/maven/plugins/war/WarManifestMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/war/WarMojo.java b/src/main/java/org/apache/maven/plugins/war/WarMojo.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugin/war/WarMojo.java
rename to src/main/java/org/apache/maven/plugins/war/WarMojo.java
index c59f3df..ec770bc 100644
--- a/src/main/java/org/apache/maven/plugin/war/WarMojo.java
+++ b/src/main/java/org/apache/maven/plugins/war/WarMojo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -28,12 +28,12 @@
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.war.util.ClassesPackager;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.plugins.war.util.ClassesPackager;
import org.apache.maven.project.MavenProjectHelper;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
diff --git a/src/main/java/org/apache/maven/plugin/war/overlay/DefaultOverlay.java b/src/main/java/org/apache/maven/plugins/war/overlay/DefaultOverlay.java
similarity index 94%
rename from src/main/java/org/apache/maven/plugin/war/overlay/DefaultOverlay.java
rename to src/main/java/org/apache/maven/plugins/war/overlay/DefaultOverlay.java
index 4c86e94..1b6cb9f 100644
--- a/src/main/java/org/apache/maven/plugin/war/overlay/DefaultOverlay.java
+++ b/src/main/java/org/apache/maven/plugins/war/overlay/DefaultOverlay.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.overlay;
+package org.apache.maven.plugins.war.overlay;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,7 @@
*/
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.war.Overlay;
+import org.apache.maven.plugins.war.Overlay;
/**
* A default overlay implementation based on an {@link Artifact}.
diff --git a/src/main/java/org/apache/maven/plugin/war/overlay/InvalidOverlayConfigurationException.java b/src/main/java/org/apache/maven/plugins/war/overlay/InvalidOverlayConfigurationException.java
similarity index 96%
rename from src/main/java/org/apache/maven/plugin/war/overlay/InvalidOverlayConfigurationException.java
rename to src/main/java/org/apache/maven/plugins/war/overlay/InvalidOverlayConfigurationException.java
index 2569d22..1c846e4 100644
--- a/src/main/java/org/apache/maven/plugin/war/overlay/InvalidOverlayConfigurationException.java
+++ b/src/main/java/org/apache/maven/plugins/war/overlay/InvalidOverlayConfigurationException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.overlay;
+package org.apache.maven.plugins.war.overlay;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java b/src/main/java/org/apache/maven/plugins/war/overlay/OverlayManager.java
similarity index 97%
rename from src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java
rename to src/main/java/org/apache/maven/plugins/war/overlay/OverlayManager.java
index c81d25e..726604a 100644
--- a/src/main/java/org/apache/maven/plugin/war/overlay/OverlayManager.java
+++ b/src/main/java/org/apache/maven/plugins/war/overlay/OverlayManager.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.overlay;
+package org.apache.maven.plugins.war.overlay;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,7 +27,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
-import org.apache.maven.plugin.war.Overlay;
+import org.apache.maven.plugins.war.Overlay;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.StringUtils;
@@ -176,7 +176,7 @@
*
* @param overlay an overlay
* @return the artifact associated to the overlay
- * @throws org.apache.maven.plugin.war.overlay.InvalidOverlayConfigurationException if the overlay does not have an
+ * @throws org.apache.maven.plugins.war.overlay.InvalidOverlayConfigurationException if the overlay does not have an
* associated artifact
*/
Artifact getAssociatedArtifact( final Overlay overlay )
diff --git a/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java b/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java
similarity index 98%
rename from src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
rename to src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java
index 78f0bfe..0180f02 100644
--- a/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
+++ b/src/main/java/org/apache/maven/plugins/war/packaging/AbstractWarPackagingTask.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,8 +25,8 @@
import org.apache.commons.io.input.XmlStreamReader;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.war.util.PathSet;
-import org.apache.maven.plugin.war.util.WebappStructure;
+import org.apache.maven.plugins.war.util.PathSet;
+import org.apache.maven.plugins.war.util.WebappStructure;
import org.apache.maven.shared.filtering.MavenFilteringException;
import org.apache.maven.shared.mapping.MappingUtils;
import org.codehaus.plexus.archiver.ArchiverException;
diff --git a/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java b/src/main/java/org/apache/maven/plugins/war/packaging/ArtifactsPackagingTask.java
similarity index 98%
rename from src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
rename to src/main/java/org/apache/maven/plugins/war/packaging/ArtifactsPackagingTask.java
index 9752a1a..aed17f4 100644
--- a/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
+++ b/src/main/java/org/apache/maven/plugins/war/packaging/ArtifactsPackagingTask.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,7 +27,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.war.Overlay;
+import org.apache.maven.plugins.war.Overlay;
import org.codehaus.plexus.interpolation.InterpolationException;
/**
diff --git a/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java b/src/main/java/org/apache/maven/plugins/war/packaging/ClassesPackagingTask.java
similarity index 95%
rename from src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java
rename to src/main/java/org/apache/maven/plugins/war/packaging/ClassesPackagingTask.java
index 094a3d4..42db504 100644
--- a/src/main/java/org/apache/maven/plugin/war/packaging/ClassesPackagingTask.java
+++ b/src/main/java/org/apache/maven/plugins/war/packaging/ClassesPackagingTask.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,9 +22,9 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.war.Overlay;
-import org.apache.maven.plugin.war.util.ClassesPackager;
-import org.apache.maven.plugin.war.util.PathSet;
+import org.apache.maven.plugins.war.Overlay;
+import org.apache.maven.plugins.war.util.ClassesPackager;
+import org.apache.maven.plugins.war.util.PathSet;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.interpolation.InterpolationException;
diff --git a/src/main/java/org/apache/maven/plugin/war/packaging/CopyUserManifestTask.java b/src/main/java/org/apache/maven/plugins/war/packaging/CopyUserManifestTask.java
similarity index 97%
rename from src/main/java/org/apache/maven/plugin/war/packaging/CopyUserManifestTask.java
rename to src/main/java/org/apache/maven/plugins/war/packaging/CopyUserManifestTask.java
index 34a2ad5..217c18a 100644
--- a/src/main/java/org/apache/maven/plugin/war/packaging/CopyUserManifestTask.java
+++ b/src/main/java/org/apache/maven/plugins/war/packaging/CopyUserManifestTask.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java b/src/main/java/org/apache/maven/plugins/war/packaging/DependenciesAnalysisPackagingTask.java
similarity index 98%
rename from src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
rename to src/main/java/org/apache/maven/plugins/war/packaging/DependenciesAnalysisPackagingTask.java
index 8dace9c..4e53eab 100644
--- a/src/main/java/org/apache/maven/plugin/war/packaging/DependenciesAnalysisPackagingTask.java
+++ b/src/main/java/org/apache/maven/plugins/war/packaging/DependenciesAnalysisPackagingTask.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,7 @@
import org.apache.maven.model.Dependency;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.war.util.WebappStructure;
+import org.apache.maven.plugins.war.util.WebappStructure;
import java.io.File;
diff --git a/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java b/src/main/java/org/apache/maven/plugins/war/packaging/OverlayPackagingTask.java
similarity index 97%
rename from src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java
rename to src/main/java/org/apache/maven/plugins/war/packaging/OverlayPackagingTask.java
index 18b433a..057b868 100644
--- a/src/main/java/org/apache/maven/plugin/war/packaging/OverlayPackagingTask.java
+++ b/src/main/java/org/apache/maven/plugins/war/packaging/OverlayPackagingTask.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,8 +20,8 @@
*/
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.war.Overlay;
-import org.apache.maven.plugin.war.util.PathSet;
+import org.apache.maven.plugins.war.Overlay;
+import org.apache.maven.plugins.war.util.PathSet;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
diff --git a/src/main/java/org/apache/maven/plugin/war/packaging/SaveWebappStructurePostPackagingTask.java b/src/main/java/org/apache/maven/plugins/war/packaging/SaveWebappStructurePostPackagingTask.java
similarity index 94%
rename from src/main/java/org/apache/maven/plugin/war/packaging/SaveWebappStructurePostPackagingTask.java
rename to src/main/java/org/apache/maven/plugins/war/packaging/SaveWebappStructurePostPackagingTask.java
index 0a60e5e..d34bda2 100644
--- a/src/main/java/org/apache/maven/plugin/war/packaging/SaveWebappStructurePostPackagingTask.java
+++ b/src/main/java/org/apache/maven/plugins/war/packaging/SaveWebappStructurePostPackagingTask.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.war.util.WebappStructureSerializer;
+import org.apache.maven.plugins.war.util.WebappStructureSerializer;
import java.io.File;
import java.io.IOException;
diff --git a/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingContext.java b/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java
similarity index 98%
rename from src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingContext.java
rename to src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java
index 1e2453f..68c3831 100644
--- a/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingContext.java
+++ b/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingContext.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,7 +26,7 @@
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugin.war.util.WebappStructure;
+import org.apache.maven.plugins.war.util.WebappStructure;
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.apache.maven.shared.utils.io.FileUtils.FilterWrapper;
diff --git a/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingTask.java b/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingTask.java
similarity index 96%
rename from src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingTask.java
rename to src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingTask.java
index 6e766c4..f00ae44 100644
--- a/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingTask.java
+++ b/src/main/java/org/apache/maven/plugins/war/packaging/WarPackagingTask.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/war/packaging/WarPostPackagingTask.java b/src/main/java/org/apache/maven/plugins/war/packaging/WarPostPackagingTask.java
similarity index 96%
rename from src/main/java/org/apache/maven/plugin/war/packaging/WarPostPackagingTask.java
rename to src/main/java/org/apache/maven/plugins/war/packaging/WarPostPackagingTask.java
index 276d7bd..f100032 100644
--- a/src/main/java/org/apache/maven/plugin/war/packaging/WarPostPackagingTask.java
+++ b/src/main/java/org/apache/maven/plugins/war/packaging/WarPostPackagingTask.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java b/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
similarity index 98%
rename from src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
rename to src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
index 7d13e5d..8872a53 100644
--- a/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
+++ b/src/main/java/org/apache/maven/plugins/war/packaging/WarProjectPackagingTask.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.packaging;
+package org.apache.maven.plugins.war.packaging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,8 +25,8 @@
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.war.Overlay;
-import org.apache.maven.plugin.war.util.PathSet;
+import org.apache.maven.plugins.war.Overlay;
+import org.apache.maven.plugins.war.util.PathSet;
import org.apache.maven.shared.filtering.MavenFilteringException;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.StringUtils;
diff --git a/src/main/java/org/apache/maven/plugin/war/util/ClassesPackager.java b/src/main/java/org/apache/maven/plugins/war/util/ClassesPackager.java
similarity index 96%
rename from src/main/java/org/apache/maven/plugin/war/util/ClassesPackager.java
rename to src/main/java/org/apache/maven/plugins/war/util/ClassesPackager.java
index bd526c0..3001674 100644
--- a/src/main/java/org/apache/maven/plugin/war/util/ClassesPackager.java
+++ b/src/main/java/org/apache/maven/plugins/war/util/ClassesPackager.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.plugins.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,7 @@
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.war.packaging.AbstractWarPackagingTask;
+import org.apache.maven.plugins.war.packaging.AbstractWarPackagingTask;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.jar.JarArchiver;
diff --git a/src/main/java/org/apache/maven/plugin/war/util/DependencyInfo.java b/src/main/java/org/apache/maven/plugins/war/util/DependencyInfo.java
similarity index 98%
rename from src/main/java/org/apache/maven/plugin/war/util/DependencyInfo.java
rename to src/main/java/org/apache/maven/plugins/war/util/DependencyInfo.java
index d7a71ed..164487b 100644
--- a/src/main/java/org/apache/maven/plugin/war/util/DependencyInfo.java
+++ b/src/main/java/org/apache/maven/plugins/war/util/DependencyInfo.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.plugins.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/war/util/PathSet.java b/src/main/java/org/apache/maven/plugins/war/util/PathSet.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugin/war/util/PathSet.java
rename to src/main/java/org/apache/maven/plugins/war/util/PathSet.java
index 17b786e..ab64680 100644
--- a/src/main/java/org/apache/maven/plugin/war/util/PathSet.java
+++ b/src/main/java/org/apache/maven/plugins/war/util/PathSet.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.plugins.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java b/src/main/java/org/apache/maven/plugins/war/util/WarUtils.java
similarity index 98%
rename from src/main/java/org/apache/maven/plugin/war/util/WarUtils.java
rename to src/main/java/org/apache/maven/plugins/war/util/WarUtils.java
index 0562f73..50a9628 100644
--- a/src/main/java/org/apache/maven/plugin/war/util/WarUtils.java
+++ b/src/main/java/org/apache/maven/plugins/war/util/WarUtils.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.plugins.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java b/src/main/java/org/apache/maven/plugins/war/util/WebappStructure.java
similarity index 99%
rename from src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java
rename to src/main/java/org/apache/maven/plugins/war/util/WebappStructure.java
index cca4ba6..13e20f8 100644
--- a/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java
+++ b/src/main/java/org/apache/maven/plugins/war/util/WebappStructure.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.plugins.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java b/src/main/java/org/apache/maven/plugins/war/util/WebappStructureSerializer.java
similarity index 98%
rename from src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java
rename to src/main/java/org/apache/maven/plugins/war/util/WebappStructureSerializer.java
index 8b6a037..b3e1914 100644
--- a/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java
+++ b/src/main/java/org/apache/maven/plugins/war/util/WebappStructureSerializer.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.plugins.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java b/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java
rename to src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java
index d7902a7..ec0f43b 100644
--- a/src/test/java/org/apache/maven/plugin/war/AbstractWarExplodedMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/AbstractWarExplodedMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,8 @@
*/
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
-import org.apache.maven.plugin.war.stub.MavenProjectArtifactsStub;
+import org.apache.maven.plugins.war.WarExplodedMojo;
+import org.apache.maven.plugins.war.stub.MavenProjectArtifactsStub;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
diff --git a/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java b/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java
rename to src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java
index d379147..30ec2e2 100644
--- a/src/test/java/org/apache/maven/plugin/war/AbstractWarMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/AbstractWarMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -28,8 +28,9 @@
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
-import org.apache.maven.plugin.war.stub.MavenProjectBasicStub;
-import org.apache.maven.plugin.war.stub.WarOverlayStub;
+import org.apache.maven.plugins.war.AbstractWarMojo;
+import org.apache.maven.plugins.war.stub.MavenProjectBasicStub;
+import org.apache.maven.plugins.war.stub.WarOverlayStub;
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.archiver.Archiver;
diff --git a/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java b/src/test/java/org/apache/maven/plugins/war/WarDependenciesAnalysisTest.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java
rename to src/test/java/org/apache/maven/plugins/war/WarDependenciesAnalysisTest.java
index e7cce82..dc103bf 100644
--- a/src/test/java/org/apache/maven/plugin/war/WarDependenciesAnalysisTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarDependenciesAnalysisTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +22,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
-import org.apache.maven.plugin.war.stub.JarArtifactStub;
+import org.apache.maven.plugins.war.stub.JarArtifactStub;
import java.io.File;
import java.io.FileFilter;
diff --git a/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoFilteringTest.java b/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoFilteringTest.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/war/WarExplodedMojoFilteringTest.java
rename to src/test/java/org/apache/maven/plugins/war/WarExplodedMojoFilteringTest.java
index 02cb9aa..554e7d5 100644
--- a/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoFilteringTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoFilteringTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,8 +25,8 @@
import java.util.LinkedList;
import java.util.List;
-import org.apache.maven.plugin.war.stub.MavenProjectBasicStub;
-import org.apache.maven.plugin.war.stub.ResourceStub;
+import org.apache.maven.plugins.war.stub.MavenProjectBasicStub;
+import org.apache.maven.plugins.war.stub.ResourceStub;
import org.codehaus.plexus.util.FileUtils;
/**
diff --git a/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java b/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
rename to src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java
index 90a0835..2848031 100644
--- a/src/test/java/org/apache/maven/plugin/war/WarExplodedMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarExplodedMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,20 +21,20 @@
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
-import org.apache.maven.plugin.war.stub.AarArtifactStub;
-import org.apache.maven.plugin.war.stub.EJBArtifactStub;
-import org.apache.maven.plugin.war.stub.EJBArtifactStubWithClassifier;
-import org.apache.maven.plugin.war.stub.EJBClientArtifactStub;
-import org.apache.maven.plugin.war.stub.IncludeExcludeWarArtifactStub;
-import org.apache.maven.plugin.war.stub.JarArtifactStub;
-import org.apache.maven.plugin.war.stub.MarArtifactStub;
-import org.apache.maven.plugin.war.stub.MavenProjectArtifactsStub;
-import org.apache.maven.plugin.war.stub.MavenProjectBasicStub;
-import org.apache.maven.plugin.war.stub.PARArtifactStub;
-import org.apache.maven.plugin.war.stub.ResourceStub;
-import org.apache.maven.plugin.war.stub.TLDArtifactStub;
-import org.apache.maven.plugin.war.stub.WarArtifactStub;
-import org.apache.maven.plugin.war.stub.XarArtifactStub;
+import org.apache.maven.plugins.war.stub.AarArtifactStub;
+import org.apache.maven.plugins.war.stub.EJBArtifactStub;
+import org.apache.maven.plugins.war.stub.EJBArtifactStubWithClassifier;
+import org.apache.maven.plugins.war.stub.EJBClientArtifactStub;
+import org.apache.maven.plugins.war.stub.IncludeExcludeWarArtifactStub;
+import org.apache.maven.plugins.war.stub.JarArtifactStub;
+import org.apache.maven.plugins.war.stub.MarArtifactStub;
+import org.apache.maven.plugins.war.stub.MavenProjectArtifactsStub;
+import org.apache.maven.plugins.war.stub.MavenProjectBasicStub;
+import org.apache.maven.plugins.war.stub.PARArtifactStub;
+import org.apache.maven.plugins.war.stub.ResourceStub;
+import org.apache.maven.plugins.war.stub.TLDArtifactStub;
+import org.apache.maven.plugins.war.stub.WarArtifactStub;
+import org.apache.maven.plugins.war.stub.XarArtifactStub;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
diff --git a/src/test/java/org/apache/maven/plugin/war/WarInPlaceMojoTest.java b/src/test/java/org/apache/maven/plugins/war/WarInPlaceMojoTest.java
similarity index 73%
rename from src/test/java/org/apache/maven/plugin/war/WarInPlaceMojoTest.java
rename to src/test/java/org/apache/maven/plugins/war/WarInPlaceMojoTest.java
index b9eb7bb..a9a814d 100644
--- a/src/test/java/org/apache/maven/plugin/war/WarInPlaceMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarInPlaceMojoTest.java
@@ -1,26 +1,8 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.maven.plugin.war.stub.MavenProjectBasicStub;
-import org.apache.maven.plugin.war.stub.ResourceStub;
+import org.apache.maven.plugins.war.WarInPlaceMojo;
+import org.apache.maven.plugins.war.stub.MavenProjectBasicStub;
+import org.apache.maven.plugins.war.stub.ResourceStub;
import java.io.File;
import java.util.LinkedList;
diff --git a/src/test/java/org/apache/maven/plugin/war/WarManifestMojoTest.java b/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/war/WarManifestMojoTest.java
rename to src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java
index 20a206a..c7faf7f 100644
--- a/src/test/java/org/apache/maven/plugin/war/WarManifestMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarManifestMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,7 @@
import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.apache.maven.plugins.war.WarManifestMojo;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
diff --git a/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java b/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
rename to src/test/java/org/apache/maven/plugins/war/WarMojoTest.java
index df4c69a..df94f89 100644
--- a/src/test/java/org/apache/maven/plugin/war/WarMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarMojoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -30,9 +30,10 @@
import java.util.zip.ZipEntry;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.war.stub.MavenProject4CopyConstructor;
-import org.apache.maven.plugin.war.stub.ProjectHelperStub;
-import org.apache.maven.plugin.war.stub.WarArtifact4CCStub;
+import org.apache.maven.plugins.war.WarMojo;
+import org.apache.maven.plugins.war.stub.MavenProject4CopyConstructor;
+import org.apache.maven.plugins.war.stub.ProjectHelperStub;
+import org.apache.maven.plugins.war.stub.WarArtifact4CCStub;
import org.codehaus.plexus.util.IOUtil;
/**
diff --git a/src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java b/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java
similarity index 99%
rename from src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java
rename to src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java
index 8a2e8ac..869b027 100644
--- a/src/test/java/org/apache/maven/plugin/war/WarOverlaysTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarOverlaysTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,8 @@
*/
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
-import org.apache.maven.plugin.war.overlay.DefaultOverlay;
+import org.apache.maven.plugins.war.Overlay;
+import org.apache.maven.plugins.war.overlay.DefaultOverlay;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
diff --git a/src/test/java/org/apache/maven/plugin/war/WarZipTest.java b/src/test/java/org/apache/maven/plugins/war/WarZipTest.java
similarity index 94%
rename from src/test/java/org/apache/maven/plugin/war/WarZipTest.java
rename to src/test/java/org/apache/maven/plugins/war/WarZipTest.java
index 4407635..f88b273 100644
--- a/src/test/java/org/apache/maven/plugin/war/WarZipTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/WarZipTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugins.war;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,10 +21,12 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
-import org.apache.maven.plugin.war.overlay.DefaultOverlay;
-import org.apache.maven.plugin.war.stub.MavenZipProject;
-import org.apache.maven.plugin.war.stub.WarArtifactStub;
-import org.apache.maven.plugin.war.stub.ZipArtifactStub;
+import org.apache.maven.plugins.war.Overlay;
+import org.apache.maven.plugins.war.WarMojo;
+import org.apache.maven.plugins.war.overlay.DefaultOverlay;
+import org.apache.maven.plugins.war.stub.MavenZipProject;
+import org.apache.maven.plugins.war.stub.WarArtifactStub;
+import org.apache.maven.plugins.war.stub.ZipArtifactStub;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
diff --git a/src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java b/src/test/java/org/apache/maven/plugins/war/overlay/OverlayManagerTest.java
similarity index 95%
rename from src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java
rename to src/test/java/org/apache/maven/plugins/war/overlay/OverlayManagerTest.java
index 87a39f5..5f9a758 100644
--- a/src/test/java/org/apache/maven/plugin/war/overlay/OverlayManagerTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/overlay/OverlayManagerTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.overlay;
+package org.apache.maven.plugins.war.overlay;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,9 +20,12 @@
*/
import org.apache.maven.plugin.testing.stubs.ArtifactStub;
-import org.apache.maven.plugin.war.Overlay;
-import org.apache.maven.plugin.war.stub.MavenProjectArtifactsStub;
-import org.apache.maven.plugin.war.stub.WarArtifactStub;
+import org.apache.maven.plugins.war.Overlay;
+import org.apache.maven.plugins.war.overlay.DefaultOverlay;
+import org.apache.maven.plugins.war.overlay.InvalidOverlayConfigurationException;
+import org.apache.maven.plugins.war.overlay.OverlayManager;
+import org.apache.maven.plugins.war.stub.MavenProjectArtifactsStub;
+import org.apache.maven.plugins.war.stub.WarArtifactStub;
import org.codehaus.plexus.PlexusTestCase;
import java.util.ArrayList;
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/AarArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/AarArtifactStub.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugin/war/stub/AarArtifactStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/AarArtifactStub.java
index a70667c..572cf84 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/AarArtifactStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/AarArtifactStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java
index 8d60163..3ac8f13 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/AbstractArtifactStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/AbstractArtifactStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/EJBArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStub.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugin/war/stub/EJBArtifactStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStub.java
index 31500dc..7383715 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/EJBArtifactStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/EJBArtifactStubWithClassifier.java b/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStubWithClassifier.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugin/war/stub/EJBArtifactStubWithClassifier.java
rename to src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStubWithClassifier.java
index bc1aef2..35869c5 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/EJBArtifactStubWithClassifier.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/EJBArtifactStubWithClassifier.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/EJBClientArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/EJBClientArtifactStub.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugin/war/stub/EJBClientArtifactStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/EJBClientArtifactStub.java
index 9ae4236..7e97896 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/EJBClientArtifactStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/EJBClientArtifactStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/IncludeExcludeWarArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/IncludeExcludeWarArtifactStub.java
similarity index 96%
rename from src/test/java/org/apache/maven/plugin/war/stub/IncludeExcludeWarArtifactStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/IncludeExcludeWarArtifactStub.java
index d554570..9f879b3 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/IncludeExcludeWarArtifactStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/IncludeExcludeWarArtifactStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/JarArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/JarArtifactStub.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/war/stub/JarArtifactStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/JarArtifactStub.java
index 1665931..62266ce 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/JarArtifactStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/JarArtifactStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/MarArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/MarArtifactStub.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugin/war/stub/MarArtifactStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/MarArtifactStub.java
index 93967c1..e266557 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/MarArtifactStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/MarArtifactStub.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
import org.apache.maven.artifact.handler.ArtifactHandler;
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/MavenProject4CopyConstructor.java b/src/test/java/org/apache/maven/plugins/war/stub/MavenProject4CopyConstructor.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugin/war/stub/MavenProject4CopyConstructor.java
rename to src/test/java/org/apache/maven/plugins/war/stub/MavenProject4CopyConstructor.java
index 1e4fa7f..e923a95 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/MavenProject4CopyConstructor.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/MavenProject4CopyConstructor.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java b/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.java
index 5dbed85..4e10cd4 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectArtifactsStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectArtifactsStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java b/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectBasicStub.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/MavenProjectBasicStub.java
index 9d64eae..efbc7fc 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/MavenProjectBasicStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/MavenProjectBasicStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/MavenZipProject.java b/src/test/java/org/apache/maven/plugins/war/stub/MavenZipProject.java
similarity index 96%
rename from src/test/java/org/apache/maven/plugin/war/stub/MavenZipProject.java
rename to src/test/java/org/apache/maven/plugins/war/stub/MavenZipProject.java
index faea95e..ef61db4 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/MavenZipProject.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/MavenZipProject.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/ModelStub.java b/src/test/java/org/apache/maven/plugins/war/stub/ModelStub.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugin/war/stub/ModelStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/ModelStub.java
index 19e92cf..97dedc5 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/ModelStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/ModelStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/PARArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/PARArtifactStub.java
similarity index 96%
rename from src/test/java/org/apache/maven/plugin/war/stub/PARArtifactStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/PARArtifactStub.java
index 7639e6c..588b22e 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/PARArtifactStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/PARArtifactStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/ProjectHelperStub.java b/src/test/java/org/apache/maven/plugins/war/stub/ProjectHelperStub.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugin/war/stub/ProjectHelperStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/ProjectHelperStub.java
index 2d037d1..9fe114f 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/ProjectHelperStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/ProjectHelperStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/ResourceStub.java b/src/test/java/org/apache/maven/plugins/war/stub/ResourceStub.java
similarity index 96%
rename from src/test/java/org/apache/maven/plugin/war/stub/ResourceStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/ResourceStub.java
index d8daecc..53c5fb3 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/ResourceStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/ResourceStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/TLDArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/TLDArtifactStub.java
similarity index 96%
rename from src/test/java/org/apache/maven/plugin/war/stub/TLDArtifactStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/TLDArtifactStub.java
index a5db774..bd2c2fd 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/TLDArtifactStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/TLDArtifactStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/WarArtifact4CCStub.java b/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugin/war/stub/WarArtifact4CCStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java
index 6935f2c..ed54297 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/WarArtifact4CCStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/WarArtifact4CCStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/WarArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/WarArtifactStub.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugin/war/stub/WarArtifactStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/WarArtifactStub.java
index 1e33f67..9b4c63e 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/WarArtifactStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/WarArtifactStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/WarOverlayStub.java b/src/test/java/org/apache/maven/plugins/war/stub/WarOverlayStub.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugin/war/stub/WarOverlayStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/WarOverlayStub.java
index 53b95d1..892f979 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/WarOverlayStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/WarOverlayStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/XarArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/XarArtifactStub.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugin/war/stub/XarArtifactStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/XarArtifactStub.java
index 611b7b4..d99f7a1 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/XarArtifactStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/XarArtifactStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/stub/ZipArtifactStub.java b/src/test/java/org/apache/maven/plugins/war/stub/ZipArtifactStub.java
similarity index 97%
rename from src/test/java/org/apache/maven/plugin/war/stub/ZipArtifactStub.java
rename to src/test/java/org/apache/maven/plugins/war/stub/ZipArtifactStub.java
index 0365ec7..8bad697 100644
--- a/src/test/java/org/apache/maven/plugin/war/stub/ZipArtifactStub.java
+++ b/src/test/java/org/apache/maven/plugins/war/stub/ZipArtifactStub.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.stub;
+package org.apache.maven.plugins.war.stub;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java b/src/test/java/org/apache/maven/plugins/war/util/PathSetTest.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java
rename to src/test/java/org/apache/maven/plugins/war/util/PathSetTest.java
index 52b9ce9..f644ed9 100644
--- a/src/test/java/org/apache/maven/plugin/war/util/PathSetTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/util/PathSetTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.plugins.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,8 @@
*/
import junit.framework.TestCase;
+
+import org.apache.maven.plugins.war.util.PathSet;
import org.codehaus.plexus.util.StringUtils;
import java.io.File;
diff --git a/src/test/java/org/apache/maven/plugin/war/util/WarUtilsTest.java b/src/test/java/org/apache/maven/plugins/war/util/WarUtilsTest.java
similarity index 96%
rename from src/test/java/org/apache/maven/plugin/war/util/WarUtilsTest.java
rename to src/test/java/org/apache/maven/plugins/war/util/WarUtilsTest.java
index 9a40105..35e0a41 100644
--- a/src/test/java/org/apache/maven/plugin/war/util/WarUtilsTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/util/WarUtilsTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.plugins.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,7 @@
import junit.framework.TestCase;
import org.apache.maven.model.Dependency;
+import org.apache.maven.plugins.war.util.WarUtils;
/**
* Test the WarUtils.
diff --git a/src/test/java/org/apache/maven/plugin/war/util/WebappStructureTest.java b/src/test/java/org/apache/maven/plugins/war/util/WebappStructureTest.java
similarity index 98%
rename from src/test/java/org/apache/maven/plugin/war/util/WebappStructureTest.java
rename to src/test/java/org/apache/maven/plugins/war/util/WebappStructureTest.java
index aa55f20..b4cd051 100644
--- a/src/test/java/org/apache/maven/plugin/war/util/WebappStructureTest.java
+++ b/src/test/java/org/apache/maven/plugins/war/util/WebappStructureTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war.util;
+package org.apache.maven.plugins.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,6 +22,7 @@
import junit.framework.TestCase;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
+import org.apache.maven.plugins.war.util.WebappStructure;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml b/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml
index ced64a7..4c99b21 100644
--- a/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml
+++ b/src/test/resources/unit/manifest/basic-manifest-test/plugin-config.xml
@@ -24,7 +24,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <project implementation="org.apache.maven.plugin.war.stub.MavenProjectBasicStub" />
+ <project implementation="org.apache.maven.plugins.war.stub.MavenProjectBasicStub" />
<warSourceDirectory>${basedir}/target/test-classes/unit/manifest/basic-manifest-test/src/main</warSourceDirectory>
</configuration>
</plugin>
diff --git a/src/test/resources/unit/manifest/manifest-with-classpath/plugin-config.xml b/src/test/resources/unit/manifest/manifest-with-classpath/plugin-config.xml
index f7ebe61..fd94630 100644
--- a/src/test/resources/unit/manifest/manifest-with-classpath/plugin-config.xml
+++ b/src/test/resources/unit/manifest/manifest-with-classpath/plugin-config.xml
@@ -24,7 +24,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <project implementation="org.apache.maven.plugin.war.stub.MavenProjectArtifactsStub"/>
+ <project implementation="org.apache.maven.plugins.war.stub.MavenProjectArtifactsStub"/>
<warSourceDirectory>
${basedir}/target/test-classes/unit/manifest/manifest-with-classpath/src/main</warSourceDirectory>
<archive>
diff --git a/src/test/resources/unit/manifest/manifest-with-custom-attrs/plugin-config.xml b/src/test/resources/unit/manifest/manifest-with-custom-attrs/plugin-config.xml
index 25587da..60bc2d9 100644
--- a/src/test/resources/unit/manifest/manifest-with-custom-attrs/plugin-config.xml
+++ b/src/test/resources/unit/manifest/manifest-with-custom-attrs/plugin-config.xml
@@ -24,7 +24,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <project implementation="org.apache.maven.plugin.war.stub.MavenProjectBasicStub"/>
+ <project implementation="org.apache.maven.plugins.war.stub.MavenProjectBasicStub"/>
<warSourceDirectory>
${basedir}/target/test-classes/unit/manifest/manifest-with-custom-attrs/src/main</warSourceDirectory>
<archive>
diff --git a/src/test/resources/unit/manifest/manifest-with-main-class/plugin-config.xml b/src/test/resources/unit/manifest/manifest-with-main-class/plugin-config.xml
index ab75b04..078b547 100644
--- a/src/test/resources/unit/manifest/manifest-with-main-class/plugin-config.xml
+++ b/src/test/resources/unit/manifest/manifest-with-main-class/plugin-config.xml
@@ -24,7 +24,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <project implementation="org.apache.maven.plugin.war.stub.MavenProjectArtifactsStub" />
+ <project implementation="org.apache.maven.plugins.war.stub.MavenProjectArtifactsStub" />
<warSourceDirectory>${basedir}/target/test-classes/unit/manifest/manifest-with-main-class/src/main</warSourceDirectory>
<archive>
<manifest>
diff --git a/src/test/resources/unit/manifest/manifest-with-other-attrs/plugin-config.xml b/src/test/resources/unit/manifest/manifest-with-other-attrs/plugin-config.xml
index bede0f9..66d2484 100644
--- a/src/test/resources/unit/manifest/manifest-with-other-attrs/plugin-config.xml
+++ b/src/test/resources/unit/manifest/manifest-with-other-attrs/plugin-config.xml
@@ -24,7 +24,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
- <project implementation="org.apache.maven.plugin.war.stub.MavenProjectBasicStub"/>
+ <project implementation="org.apache.maven.plugins.war.stub.MavenProjectBasicStub"/>
<warSourceDirectory>
${basedir}/target/test-classes/unit/manifest/manifest-with-other-attrs/src/main</warSourceDirectory>
<archive>
