directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r698654 - in /directory/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins: AbstractStudioMojo.java StudioEclipseMojo.java
Date Wed, 24 Sep 2008 16:59:00 GMT
Author: felixk
Date: Wed Sep 24 09:59:00 2008
New Revision: 698654

URL: http://svn.apache.org/viewvc?rev=698654&view=rev
Log:
- add createManifest property
- move skip property where it belongs to

Modified:
    directory/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/AbstractStudioMojo.java
    directory/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/StudioEclipseMojo.java

Modified: directory/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/AbstractStudioMojo.java
URL: http://svn.apache.org/viewvc/directory/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/AbstractStudioMojo.java?rev=698654&r1=698653&r2=698654&view=diff
==============================================================================
--- directory/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/AbstractStudioMojo.java
(original)
+++ directory/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/AbstractStudioMojo.java
Wed Sep 24 09:59:00 2008
@@ -100,15 +100,6 @@
     protected org.apache.maven.artifact.resolver.ArtifactResolver resolver;
 
     /**
-     * Flag if execution shall be skipped.
-     * 
-     * @parameter expression="${skip}" default-value="true"
-     * @required
-     * @since 1.0
-     */
-    protected boolean skip;
-
-    /**
      * Relativ Path to copy libraries to.
      * 
      * @parameter expression="${libraryPath}" default-value="lib"

Modified: directory/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/StudioEclipseMojo.java
URL: http://svn.apache.org/viewvc/directory/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/StudioEclipseMojo.java?rev=698654&r1=698653&r2=698654&view=diff
==============================================================================
--- directory/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/StudioEclipseMojo.java
(original)
+++ directory/studio-plugin/trunk/src/main/java/org/apache/directory/studio/maven/plugins/StudioEclipseMojo.java
Wed Sep 24 09:59:00 2008
@@ -80,6 +80,22 @@
      */
     public final static String ENTRY_BUNDLE_VERSION = "Bundle-Version:";
 
+    /**
+     * Flag if artifacts shall be copied and eclipse specific files shall be adapted.
+     * 
+     * @parameter expression="${skip}" default-value="true"
+     * @required
+     * @since 1.0
+     */
+    protected boolean skip;
+
+    /**
+     * Flag if manifest file shall be created.
+     * 
+     * @parameter expression="${createManifest}" default-value="false"
+     * @since 1.0.1
+     */
+    protected boolean createManifest;
 
     public void execute() throws MojoExecutionException
     {
@@ -103,21 +119,13 @@
 
                 // copy Artifacts
                 copyArtifacts( artifactList );
-
-                try
-                {
-                    forkMvnGoal( "bundle:manifest" );
-                }
-                catch ( Exception e )
-                {
-                    throw new MojoExecutionException( e.getMessage() );
-                }
-
                 // Update .classpath
                 updateDotClasspath( artifactList );
-
+                // Update .project
                 updateDotProject();
+                // Remove mavenEclipseXml
                 removeMavenEclipseXml();
+                // Remove .externalToolBuilders
                 removeDotExternalToolBuilders();
 
             }
@@ -132,6 +140,17 @@
                 getLog().error( e );
             }
         }
+        if ( createManifest )
+        {
+            try
+            {
+                forkMvnGoal( "bundle:manifest" );
+            }
+            catch ( Exception e )
+            {
+                throw new MojoExecutionException( e.getMessage() );
+            }
+        }
     }
 
 



Mime
View raw message