[#74] rework integration tests pt.2

pom.xml

@@ -183,6 +183,11 @@
       <artifactId>slf4j-api</artifactId>
       <version>1.7.9</version>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>1.7.9</version>
+    </dependency>
 
     <!-- needed to debug plugin under m2e -->
     <dependency>
@@ -210,6 +215,18 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>9.4.51.v20230217</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-http</artifactId>
+      <version>9.4.51.v20230217</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

src/main/java/org/codehaus/mojo/wagon/AbstractCopyMojo.java → src/main/java/org/mojohaus/mojo/wagon/AbstractCopyMojo.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -80,4 +80,4 @@ private void disconnectWagon( Wagon wagon )
         }
     }
 
-}
+}

src/main/java/org/codehaus/mojo/wagon/AbstractDoubleWagonMojo.java → src/main/java/org/mojohaus/mojo/wagon/AbstractDoubleWagonMojo.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

src/main/java/org/codehaus/mojo/wagon/AbstractSingleWagonMojo.java → src/main/java/org/mojohaus/mojo/wagon/AbstractSingleWagonMojo.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -92,4 +92,4 @@ public void execute()
     protected abstract void execute( Wagon wagon )
         throws MojoExecutionException, WagonException, IOException;
 
-}
+}

src/main/java/org/codehaus/mojo/wagon/AbstractWagonListMojo.java → src/main/java/org/mojohaus/mojo/wagon/AbstractWagonListMojo.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,8 +21,8 @@
 
 import org.apache.maven.plugins.annotations.Component;
 import org.apache.maven.plugins.annotations.Parameter;
-import org.codehaus.mojo.wagon.shared.WagonDownload;
-import org.codehaus.mojo.wagon.shared.WagonFileSet;
+import org.mojohaus.mojo.wagon.shared.WagonDownload;
+import org.mojohaus.mojo.wagon.shared.WagonFileSet;
 
 /**
  * Contains common configuration to scan for Wagon's files

src/main/java/org/codehaus/mojo/wagon/AbstractWagonMojo.java → src/main/java/org/mojohaus/mojo/wagon/AbstractWagonMojo.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -7,9 +7,9 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Settings;
 import org.apache.maven.wagon.Wagon;
-import org.codehaus.mojo.wagon.shared.WagonFactory;
-import org.codehaus.mojo.wagon.shared.WagonFileSet;
-import org.codehaus.mojo.wagon.shared.WagonUtils;
+import org.mojohaus.mojo.wagon.shared.WagonFactory;
+import org.mojohaus.mojo.wagon.shared.WagonFileSet;
+import org.mojohaus.mojo.wagon.shared.WagonUtils;
 
 /**
  * Provides base functionality for dealing with I/O using wagon.
@@ -61,4 +61,4 @@ protected WagonFileSet getWagonFileSet( String fromDir, String includes, String
     {
         return WagonUtils.getWagonFileSet( fromDir, includes, excludes, caseSensitive, toDir );
     }
-}
+}

src/main/java/org/codehaus/mojo/wagon/CopyMojo.java → src/main/java/org/mojohaus/mojo/wagon/CopyMojo.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,8 +26,8 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.WagonException;
-import org.codehaus.mojo.wagon.shared.WagonCopy;
-import org.codehaus.mojo.wagon.shared.WagonFileSet;
+import org.mojohaus.mojo.wagon.shared.WagonCopy;
+import org.mojohaus.mojo.wagon.shared.WagonFileSet;
 
 /**
  * Copy artifacts from one Wagon repository to another Wagon repository.
@@ -78,4 +78,4 @@ protected void copy( Wagon srcWagon, Wagon targetWagon )
         wagonCopy.copy( srcWagon, fileSet, targetWagon, optimize, this.getLog() );
     }
 
-}
+}

src/main/java/org/codehaus/mojo/wagon/DownloadMojo.java → src/main/java/org/mojohaus/mojo/wagon/DownloadMojo.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.WagonException;
-import org.codehaus.mojo.wagon.shared.WagonFileSet;
+import org.mojohaus.mojo.wagon.shared.WagonFileSet;
 
 /**
  * Transfers a set of files from a remote URL to a specified local directory.

src/main/java/org/codehaus/mojo/wagon/DownloadSingleMojo.java → src/main/java/org/mojohaus/mojo/wagon/DownloadSingleMojo.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

src/main/java/org/codehaus/mojo/wagon/ExistMojo.java → src/main/java/org/mojohaus/mojo/wagon/ExistMojo.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.WagonException;
-import org.codehaus.mojo.wagon.shared.WagonDownload;
+import org.mojohaus.mojo.wagon.shared.WagonDownload;
 
 /**
  * Check for the existing of remote resource.
@@ -56,4 +56,4 @@ protected void execute( Wagon wagon )
         }
     }
 
-}
+}

src/main/java/org/codehaus/mojo/wagon/ListMojo.java → src/main/java/org/mojohaus/mojo/wagon/ListMojo.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 import java.util.List;
 

src/main/java/org/codehaus/mojo/wagon/MergeMavenRepoMojo.java → src/main/java/org/mojohaus/mojo/wagon/MergeMavenRepoMojo.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,7 @@
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.WagonException;
-import org.codehaus.mojo.wagon.shared.MavenRepoMerger;
+import org.mojohaus.mojo.wagon.shared.MavenRepoMerger;
 
 /**
  * Merge artifacts from one Maven repository to another Maven repository.
@@ -45,4 +45,4 @@ protected void copy( Wagon srcWagon, Wagon targetWagon )
         mavenRepoMerger.merge( srcWagon, targetWagon, optimize, this.getLog() );
     }
 
-}
+}

src/main/java/org/codehaus/mojo/wagon/SshExecMojo.java → src/main/java/org/mojohaus/mojo/wagon/SshExecMojo.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

src/main/java/org/codehaus/mojo/wagon/UploadMojo.java → src/main/java/org/mojohaus/mojo/wagon/UploadMojo.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -29,7 +29,7 @@
 import org.apache.maven.shared.model.fileset.FileSet;
 import org.apache.maven.wagon.Wagon;
 import org.apache.maven.wagon.WagonException;
-import org.codehaus.mojo.wagon.shared.WagonUpload;
+import org.mojohaus.mojo.wagon.shared.WagonUpload;
 import org.codehaus.plexus.util.StringUtils;
 
 /**

src/main/java/org/codehaus/mojo/wagon/UploadSingleMojo.java → src/main/java/org/mojohaus/mojo/wagon/UploadSingleMojo.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

src/main/java/org/codehaus/mojo/wagon/shared/DefaultMavenRepoMerger.java → src/main/java/org/mojohaus/mojo/wagon/shared/DefaultMavenRepoMerger.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

src/main/java/org/codehaus/mojo/wagon/shared/DefaultWagonCopy.java → src/main/java/org/mojohaus/mojo/wagon/shared/DefaultWagonCopy.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

src/main/java/org/codehaus/mojo/wagon/shared/DefaultWagonDownload.java → src/main/java/org/mojohaus/mojo/wagon/shared/DefaultWagonDownload.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

src/main/java/org/codehaus/mojo/wagon/shared/DefaultWagonFactory.java → src/main/java/org/mojohaus/mojo/wagon/shared/DefaultWagonFactory.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 import org.apache.maven.settings.Proxy;
 import org.apache.maven.settings.Server;

src/main/java/org/codehaus/mojo/wagon/shared/DefaultWagonUpload.java → src/main/java/org/mojohaus/mojo/wagon/shared/DefaultWagonUpload.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,6 @@
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.shared.model.fileset.FileSet;
 import org.apache.maven.shared.model.fileset.util.FileSetManager;
 import org.apache.maven.wagon.CommandExecutor;

src/main/java/org/codehaus/mojo/wagon/shared/MavenRepoMerger.java → src/main/java/org/mojohaus/mojo/wagon/shared/MavenRepoMerger.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

src/main/java/org/codehaus/mojo/wagon/shared/SelectorUtils.java → src/main/java/org/mojohaus/mojo/wagon/shared/SelectorUtils.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

src/main/java/org/codehaus/mojo/wagon/shared/WagonCopy.java → src/main/java/org/mojohaus/mojo/wagon/shared/WagonCopy.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

src/main/java/org/codehaus/mojo/wagon/shared/WagonDirectoryScanner.java → src/main/java/org/mojohaus/mojo/wagon/shared/WagonDirectoryScanner.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

src/main/java/org/codehaus/mojo/wagon/shared/WagonDownload.java → src/main/java/org/mojohaus/mojo/wagon/shared/WagonDownload.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

src/main/java/org/codehaus/mojo/wagon/shared/WagonFactory.java → src/main/java/org/mojohaus/mojo/wagon/shared/WagonFactory.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 import org.apache.maven.settings.Settings;
 import org.apache.maven.wagon.Wagon;

src/main/java/org/codehaus/mojo/wagon/shared/WagonFileSet.java → src/main/java/org/mojohaus/mojo/wagon/shared/WagonFileSet.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

src/main/java/org/codehaus/mojo/wagon/shared/WagonUpload.java → src/main/java/org/mojohaus/mojo/wagon/shared/WagonUpload.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

src/main/java/org/codehaus/mojo/wagon/shared/WagonUtils.java → src/main/java/org/mojohaus/mojo/wagon/shared/WagonUtils.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon.shared;
+package org.mojohaus.mojo.wagon.shared;
 
 import org.codehaus.plexus.util.StringUtils;
 

src/test/java/org/mojohaus/mojo/wagon/AbstractJettyIT.java

@@ -0,0 +1,49 @@
+package org.mojohaus.mojo.wagon;
+
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.handler.DefaultHandler;
+import org.eclipse.jetty.server.handler.HandlerList;
+import org.eclipse.jetty.server.handler.ResourceHandler;
+import org.junit.After;
+import org.junit.Before;
+
+public abstract class AbstractJettyIT {
+
+    private Server server;
+    private int port;
+
+    @Before
+    public void runJetty() throws Exception {
+        server = new Server();
+        ServerConnector connector = new ServerConnector(server);
+        connector.setPort(0);
+        connector.setHost("localhost");
+        server.addConnector(connector);
+
+        ResourceHandler resource_handler = new ResourceHandler();
+        resource_handler.setDirectoriesListed(true);
+        resource_handler.setResourceBase(getDirectoryToServe());
+
+        HandlerList handlers = new HandlerList();
+        handlers.setHandlers(new Handler[] { resource_handler, new DefaultHandler() });
+        server.setHandler(handlers);
+
+        server.start();
+        this.port = connector.getLocalPort();
+    }
+
+
+    @After
+    public void tearDown() throws Exception {
+        server.stop();
+    }
+
+    protected int getServerPort() {
+        return this.port;
+    }
+
+    protected abstract String getDirectoryToServe();
+
+}

src/test/java/org/codehaus/mojo/wagon/Wagon334MojoHttpIT.java → src/test/java/org/mojohaus/mojo/wagon/Wagon334MojoHttpIT.java

@@ -1,4 +1,4 @@
-package org.codehaus.mojo.wagon;
+package org.mojohaus.mojo.wagon;
 
 import java.io.File;