incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r537339 - in /incubator/nmaven/branches/SI_XPT: integration-tests/tests/it0028/ integration-tests/tests/it0029/ integration-tests/tests/it0030/ plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/ plugins/maven-deploy-plugin/src...
Date Sat, 12 May 2007 05:30:32 GMT
Author: sisbell
Date: Fri May 11 22:30:30 2007
New Revision: 537339

URL: http://svn.apache.org/viewvc?view=rev&rev=537339
Log:
Moved the deploy plugin into the default lifecycle (no longer requires explicit execution
of goal within the pom.

Modified:
    incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0028/pom.xml
    incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0029/pom.xml
    incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0030/pom.xml
    incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
    incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java

Modified: incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0028/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0028/pom.xml?view=diff&rev=537339&r1=537338&r2=537339
==============================================================================
--- incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0028/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0028/pom.xml Fri May 11 22:30:30
2007
@@ -16,14 +16,6 @@
       <plugin>
         <groupId>org.apache.maven.dotnet.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>deploy</phase>
-            <goals>
-              <goal>deploy-dotnet</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
     </plugins>
   </build>
@@ -37,11 +29,11 @@
   </dependencies>
   <distributionManagement>
     <snapshotRepository>
-        <uniqueVersion>true</uniqueVersion>
-        <id>snapshot repo</id>
-        <name>snapshot repo</name>
-        <url>file://${basedir}/target/remoteSnapshotRepo/snapshots</url>
-        <layout>default</layout>
+      <uniqueVersion>true</uniqueVersion>
+      <id>snapshot repo</id>
+      <name>snapshot repo</name>
+      <url>file://${basedir}/target/remoteSnapshotRepo/snapshots</url>
+      <layout>default</layout>
     </snapshotRepository>
   </distributionManagement>
 </project>

Modified: incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0029/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0029/pom.xml?view=diff&rev=537339&r1=537338&r2=537339
==============================================================================
--- incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0029/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0029/pom.xml Fri May 11 22:30:30
2007
@@ -16,31 +16,23 @@
       <plugin>
         <groupId>org.apache.maven.dotnet.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>deploy</phase>
-            <goals>
-              <goal>deploy-dotnet</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
     </plugins>
   </build>
   <distributionManagement>
     <snapshotRepository>
-        <uniqueVersion>true</uniqueVersion>
-        <id>my fake snapshot</id>
-        <name>Fake Snapshot Repository</name>
-        <url>file://${basedir}/target/remoteSnapshotRepo/snapshots</url>
-        <layout>default</layout>
+      <uniqueVersion>true</uniqueVersion>
+      <id>my fake snapshot</id>
+      <name>Fake Snapshot Repository</name>
+      <url>file://${basedir}/target/remoteSnapshotRepo/snapshots</url>
+      <layout>default</layout>
     </snapshotRepository>
     <repository>
-        <uniqueVersion>false</uniqueVersion>
-        <id>regular repo</id>
-        <name>regular repo</name>
-        <url>file://${basedir}/target/remoteRepo</url>
-        <layout>default</layout>
+      <uniqueVersion>false</uniqueVersion>
+      <id>regular repo</id>
+      <name>regular repo</name>
+      <url>file://${basedir}/target/remoteRepo</url>
+      <layout>default</layout>
     </repository>
   </distributionManagement>
 </project>

Modified: incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0030/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0030/pom.xml?view=diff&rev=537339&r1=537338&r2=537339
==============================================================================
--- incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0030/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/integration-tests/tests/it0030/pom.xml Fri May 11 22:30:30
2007
@@ -16,47 +16,39 @@
       <plugin>
         <groupId>org.apache.maven.dotnet.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>deploy</phase>
-            <goals>
-              <goal>deploy-dotnet</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
     </plugins>
   </build>
 
   <dependencies>
     <dependency>
-        <groupId>org.apache.maven.it</groupId>
-        <artifactId>it0029</artifactId>
-        <version>1.0.0</version>
-        <type>library</type>
+      <groupId>org.apache.maven.it</groupId>
+      <artifactId>it0029</artifactId>
+      <version>1.0.0</version>
+      <type>library</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.maven.it</groupId>
-        <artifactId>it0028</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <type>library</type>
+      <groupId>org.apache.maven.it</groupId>
+      <artifactId>it0028</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <type>library</type>
     </dependency>
   </dependencies>
 
   <repositories>
     <repository>
-        <id>snapshot repo</id>
-        <name>snapshot repo</name>
-        <url>file://${basedir}/../it0028/target/remoteSnapshotRepo/snapshots</url>
-        <!-- Check for new snapshots every X minutes -->
-        <snapshots>
-            <updatePolicy>interval:1</updatePolicy>
-        </snapshots>
+      <id>snapshot repo</id>
+      <name>snapshot repo</name>
+      <url>file://${basedir}/../it0028/target/remoteSnapshotRepo/snapshots</url>
+      <!-- Check for new snapshots every X minutes -->
+      <snapshots>
+        <updatePolicy>interval:1</updatePolicy>
+      </snapshots>
     </repository>
     <repository>
-        <id>regular repo</id>
-        <name>regular repo</name>
-        <url>file://${basedir}/../it0029/target/remoteRepo</url>
+      <id>regular repo</id>
+      <name>regular repo</name>
+      <url>file://${basedir}/../it0029/target/remoteRepo</url>
     </repository>
   </repositories>
 </project>

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=537339&r1=537338&r2=537339
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
Fri May 11 22:30:30 2007
@@ -40,7 +40,10 @@
             org.apache.maven.dotnet.plugins:maven-install-plugin:install
           </install>
           <package>org.apache.maven.dotnet.plugins:maven-webapp-plugin:package</package>
-          <deploy>org.apache.maven.dotnet.plugins:maven-webapp-plugin:deploy</deploy>
+          <deploy>
+            org.apache.maven.dotnet.plugins:maven-webapp-plugin:deploy,
+            org.apache.maven.dotnet.plugins:maven-deploy-plugin:deploy-dotnet
+          </deploy>
         </phases>
       </configuration>
     </component>
@@ -77,6 +80,9 @@
           <install>
             org.apache.maven.dotnet.plugins:maven-install-plugin:install
           </install>
+          <deploy>
+            org.apache.maven.dotnet.plugins:maven-deploy-plugin:deploy-dotnet
+          </deploy>
         </phases>
       </configuration>
     </component>
@@ -116,6 +122,9 @@
             org.apache.maven.dotnet.plugins:maven-install-plugin:install,
             org.apache.maven.dotnet.plugins:maven-install-plugin:gac-install
           </install>
+          <deploy>
+            org.apache.maven.dotnet.plugins:maven-deploy-plugin:deploy-dotnet
+          </deploy>
         </phases>
       </configuration>
     </component>
@@ -154,6 +163,9 @@
           <install>
             org.apache.maven.dotnet.plugins:maven-install-plugin:install,
           </install>
+          <deploy>
+            org.apache.maven.dotnet.plugins:maven-deploy-plugin:deploy-dotnet
+          </deploy>
         </phases>
       </configuration>
     </component>
@@ -194,6 +206,9 @@
             org.apache.maven.dotnet.plugins:maven-install-plugin:install,
             org.apache.maven.dotnet.plugins:maven-install-plugin:gac-install
           </install>
+          <deploy>
+            org.apache.maven.dotnet.plugins:maven-deploy-plugin:deploy-dotnet
+          </deploy>
         </phases>
       </configuration>
     </component>
@@ -232,6 +247,9 @@
           <install>
             org.apache.maven.dotnet.plugins:maven-install-plugin:install
           </install>
+          <deploy>
+            org.apache.maven.dotnet.plugins:maven-deploy-plugin:deploy-dotnet
+          </deploy>
         </phases>
       </configuration>
     </component>
@@ -270,6 +288,9 @@
           <install>
             org.apache.maven.dotnet.plugins:maven-install-plugin:install
           </install>
+          <deploy>
+            org.apache.maven.dotnet.plugins:maven-deploy-plugin:deploy-dotnet
+          </deploy>               
         </phases>
       </configuration>
     </component>

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java?view=diff&rev=537339&r1=537338&r2=537339
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java
(original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java
Fri May 11 22:30:30 2007
@@ -13,14 +13,16 @@
 
 /**
  * Deploy's dlls
- * @goal deploy-dotnet
- * @phase deploy
- * 
+ *
  * @author Evan Worley
  * @author Zak Jacobson
+ * @goal deploy-dotnet
+ * @phase deploy
  */
-public class DeployMojo extends AbstractMojo {
-    
+public class DeployMojo
+    extends AbstractMojo
+{
+
     /**
      * The maven project.
      *
@@ -28,30 +30,35 @@
      * @required
      */
     private MavenProject project;
-    
+
     /**
      * @parameter expression="${localRepository}"
      * @required
      */
     private ArtifactRepository localRepo;
-    
+
     /**
      * @component
      */
     private ArtifactDeployer artifactDeployer;
-    
-    public void execute() throws MojoExecutionException, MojoFailureException {
-        
+
+    public void execute()
+        throws MojoExecutionException, MojoFailureException
+    {
+
         // Is snapshot or regular repo depending on project version
         ArtifactRepository deployRepo = project.getDistributionManagementArtifactRepository();
-        
+
         Artifact artifact = project.getArtifact();
         File sourceFile = project.getFile();
-        
-        try {
-            artifactDeployer.deploy(sourceFile, artifact, deployRepo, localRepo);
-        } catch (ArtifactDeploymentException e) {
-            throw new MojoExecutionException("NMAVEN-DEPLOY: Deploy Failed", e);
+
+        try
+        {
+            artifactDeployer.deploy( sourceFile, artifact, deployRepo, localRepo );
+        }
+        catch ( ArtifactDeploymentException e )
+        {
+            throw new MojoExecutionException( "NMAVEN-DEPLOY: Deploy Failed", e );
         }
     }
 }



Mime
View raw message