You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/07/17 17:58:45 UTC

svn commit: r556951 - in /maven/plugins/trunk/maven-stage-plugin: pom.xml src/main/java/org/apache/maven/plugins/stage/CopyRepositoryMojo.java src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java

Author: jvanzyl
Date: Tue Jul 17 08:58:44 2007
New Revision: 556951

URL: http://svn.apache.org/viewvc?view=rev&rev=556951
Log:
o set default value for repositoryId with default-value tag

Modified:
    maven/plugins/trunk/maven-stage-plugin/pom.xml
    maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/CopyRepositoryMojo.java
    maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java

Modified: maven/plugins/trunk/maven-stage-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/pom.xml?view=diff&rev=556951&r1=556950&r2=556951
==============================================================================
--- maven/plugins/trunk/maven-stage-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-stage-plugin/pom.xml Tue Jul 17 08:58:44 2007
@@ -19,8 +19,8 @@
   
 -->
 <project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
-  xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'
-  xmlns='http://maven.apache.org/POM/4.0.0'>
+         xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'
+         xmlns='http://maven.apache.org/POM/4.0.0'>
   <parent>
     <artifactId>maven-plugins</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
@@ -102,7 +102,7 @@
   </dependencies>
 
   <build>
-   <plugins>
+    <plugins>
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-maven-plugin</artifactId>

Modified: maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/CopyRepositoryMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/CopyRepositoryMojo.java?view=diff&rev=556951&r1=556950&r2=556951
==============================================================================
--- maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/CopyRepositoryMojo.java (original)
+++ maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/CopyRepositoryMojo.java Tue Jul 17 08:58:44 2007
@@ -40,8 +40,8 @@
     /** @parameter expression="${target}" */
     private String target;
 
-    /** @parameter expression="${repositoryId}" */
-    private String repositoryId = "target";
+    /** @parameter expression="${repositoryId}" default-value="target" */
+    private String repositoryId;
 
     /**
      * @parameter expression="${version}"
@@ -58,6 +58,7 @@
         try
         {
             Repository targetRepository = new Repository( repositoryId, target );
+
             copier.copy( source, targetRepository, version );
         }
         catch ( IOException e )

Modified: maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java?view=diff&rev=556951&r1=556950&r2=556951
==============================================================================
--- maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java (original)
+++ maven/plugins/trunk/maven-stage-plugin/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java Tue Jul 17 08:58:44 2007
@@ -19,6 +19,28 @@
  * under the License.
  */
 
+import org.apache.maven.artifact.manager.WagonManager;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.metadata.Metadata;
+import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
+import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Writer;
+import org.apache.maven.wagon.ConnectionException;
+import org.apache.maven.wagon.ResourceDoesNotExistException;
+import org.apache.maven.wagon.TransferFailedException;
+import org.apache.maven.wagon.UnsupportedProtocolException;
+import org.apache.maven.wagon.Wagon;
+import org.apache.maven.wagon.WagonException;
+import org.apache.maven.wagon.authentication.AuthenticationException;
+import org.apache.maven.wagon.authorization.AuthorizationException;
+import org.apache.maven.wagon.providers.ssh.jsch.ScpWagon;
+import org.apache.maven.wagon.repository.Repository;
+import org.codehaus.plexus.logging.LogEnabled;
+import org.codehaus.plexus.logging.Logger;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -40,32 +62,12 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import org.apache.maven.artifact.manager.WagonManager;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.Metadata;
-import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
-import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Writer;
-import org.apache.maven.wagon.ConnectionException;
-import org.apache.maven.wagon.ResourceDoesNotExistException;
-import org.apache.maven.wagon.TransferFailedException;
-import org.apache.maven.wagon.UnsupportedProtocolException;
-import org.apache.maven.wagon.Wagon;
-import org.apache.maven.wagon.WagonException;
-import org.apache.maven.wagon.authentication.AuthenticationException;
-import org.apache.maven.wagon.authorization.AuthorizationException;
-import org.apache.maven.wagon.providers.ssh.jsch.ScpWagon;
-import org.apache.maven.wagon.repository.Repository;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
 /**
  * @author Jason van Zyl
  * @plexus.component
  */
 public class DefaultRepositoryCopier
-    implements RepositoryCopier
+    implements LogEnabled, RepositoryCopier
 {
     private MetadataXpp3Reader reader = new MetadataXpp3Reader();
 
@@ -74,6 +76,8 @@
     /** @plexus.requirement */
     private WagonManager wagonManager;
 
+    private Logger logger;
+
     /**
      * @deprecated use {@link #copy(String, Repository, String)} so the server configuration applies
      */
@@ -81,6 +85,7 @@
         throws WagonException, IOException
     {
         Repository targetRepository = new Repository( "target", targetRepositoryUrl );
+
         copy( sourceRepositoryUrl, targetRepository, version );
     }
 
@@ -93,6 +98,8 @@
 
         String tempdir = System.getProperty( "java.io.tmpdir" );
 
+        logger.debug( "Writing all output to " + tempdir );
+
         // Create the renameScript script
 
         String renameScriptName = groupId + "-" + version + "-rename.sh";
@@ -496,5 +503,10 @@
         {
             throw new RuntimeException( e );
         }
+    }
+
+    public void enableLogging( Logger logger )
+    {
+        this.logger = logger;
     }
 }