directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r609584 - in /directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins: StudioCleanMojo.java StudioEclipseMojo.java StudioPrepareJarPackageMojo.java
Date Mon, 07 Jan 2008 12:30:34 GMT
Author: felixk
Date: Mon Jan  7 04:30:32 2008
New Revision: 609584

URL: http://svn.apache.org/viewvc?rev=609584&view=rev
Log:
Resetting project result in NPE.

Modified:
    directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioCleanMojo.java
    directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioEclipseMojo.java
    directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioPrepareJarPackageMojo.java

Modified: directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioCleanMojo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioCleanMojo.java?rev=609584&r1=609583&r2=609584&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioCleanMojo.java
(original)
+++ directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioCleanMojo.java
Mon Jan  7 04:30:32 2008
@@ -23,7 +23,6 @@
 import java.io.File;
 
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
 
 
 /**
@@ -41,15 +40,6 @@
 
     private final String MAVEN_ECLIPSE_XML = "maven-eclipse.xml";
     private final String EXTERNAL_TOOL_BUILDERS_DIR = ".externalToolBuilders";
-    /**
-     * POM
-     * 
-     * @parameter expression="${project}"
-     * @readonly
-     * @required
-     */
-    protected MavenProject project;
-
 
     public void execute() throws MojoExecutionException
     {

Modified: directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioEclipseMojo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioEclipseMojo.java?rev=609584&r1=609583&r2=609584&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioEclipseMojo.java
(original)
+++ directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioEclipseMojo.java
Mon Jan  7 04:30:32 2008
@@ -35,7 +35,6 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.osgi.DefaultMaven2OsgiConverter;
 import org.apache.maven.shared.osgi.Maven2OsgiConverter;
 import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
@@ -70,15 +69,6 @@
 {
 
     /**
-     * POM
-     * 
-     * @parameter expression="${project}"
-     * @readonly
-     * @required
-     */
-    protected MavenProject project;
-
-    /**
      * Constant used for newline.
      */
     private static final String NEWLINE = "\n";
@@ -116,6 +106,9 @@
                 removeMavenEclipseXml();
                 removeDotExternalToolBuilders();
 
+            } catch (FileNotFoundException e)
+            {
+                getLog().error("Please run eclipse:eclipse first to create .classpath, e.g.
mvn eclipse:eclipse studio:eclipse.", e);
             }
             catch ( Exception e )
             {

Modified: directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioPrepareJarPackageMojo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioPrepareJarPackageMojo.java?rev=609584&r1=609583&r2=609584&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioPrepareJarPackageMojo.java
(original)
+++ directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioPrepareJarPackageMojo.java
Mon Jan  7 04:30:32 2008
@@ -27,7 +27,6 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
 
 
 /**



Mime
View raw message