You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by fe...@apache.org on 2007/12/06 00:10:27 UTC
svn commit: r601567 - in /directory/sandbox/felixk: studio-aciitemeditor/
studio-apacheds-configuration/ studio-connection-core/
studio-connection-ui/ studio-jars/ studio-ldapbrowser-common/
studio-ldapbrowser-core/ studio-ldapbrowser-ui/ studio-ldif-p...
Author: felixk
Date: Wed Dec 5 15:10:23 2007
New Revision: 601567
URL: http://svn.apache.org/viewvc?rev=601567&view=rev
Log:
Fix and make use of @phase for execution of a plugin goal
Modified:
directory/sandbox/felixk/studio-aciitemeditor/pom.xml
directory/sandbox/felixk/studio-apacheds-configuration/pom.xml
directory/sandbox/felixk/studio-connection-core/pom.xml
directory/sandbox/felixk/studio-connection-ui/pom.xml
directory/sandbox/felixk/studio-jars/pom.xml
directory/sandbox/felixk/studio-ldapbrowser-common/pom.xml
directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml
directory/sandbox/felixk/studio-ldapbrowser-ui/pom.xml
directory/sandbox/felixk/studio-ldif-parser/pom.xml
directory/sandbox/felixk/studio-ldifeditor/pom.xml
directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioPrepareJarPackageMojo.java
directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java
directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioUnpackPrefixedMojo.java
directory/sandbox/felixk/studio-rcp/pom.xml
directory/sandbox/felixk/studio-schemaeditor/pom.xml
directory/sandbox/felixk/studio-valueeditors/pom.xml
Modified: directory/sandbox/felixk/studio-aciitemeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-aciitemeditor/pom.xml?rev=601567&r1=601566&r2=601567&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-aciitemeditor/pom.xml (original)
+++ directory/sandbox/felixk/studio-aciitemeditor/pom.xml Wed Dec 5 15:10:23 2007
@@ -76,18 +76,16 @@
<plugin>
<groupId>org.apache.directory.studio</groupId>
<artifactId>maven-studio-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
<executions>
<execution>
- <id>prepare-jar-package</id>
- <phase>compile</phase>
<goals>
<goal>prepare-jar-package</goal>
</goals>
</execution>
</executions>
- <configuration>
- <skip>false</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: directory/sandbox/felixk/studio-apacheds-configuration/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-apacheds-configuration/pom.xml?rev=601567&r1=601566&r2=601567&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-apacheds-configuration/pom.xml (original)
+++ directory/sandbox/felixk/studio-apacheds-configuration/pom.xml Wed Dec 5 15:10:23 2007
@@ -74,18 +74,16 @@
<plugin>
<groupId>org.apache.directory.studio</groupId>
<artifactId>maven-studio-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
<executions>
<execution>
- <id>prepare-jar-package</id>
- <phase>compile</phase>
<goals>
<goal>prepare-jar-package</goal>
</goals>
</execution>
</executions>
- <configuration>
- <skip>false</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: directory/sandbox/felixk/studio-connection-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-connection-core/pom.xml?rev=601567&r1=601566&r2=601567&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-connection-core/pom.xml (original)
+++ directory/sandbox/felixk/studio-connection-core/pom.xml Wed Dec 5 15:10:23 2007
@@ -63,18 +63,16 @@
<plugin>
<groupId>org.apache.directory.studio</groupId>
<artifactId>maven-studio-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
<executions>
<execution>
- <id>prepare-jar-package</id>
- <phase>compile</phase>
<goals>
<goal>prepare-jar-package</goal>
</goals>
</execution>
</executions>
- <configuration>
- <skip>false</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: directory/sandbox/felixk/studio-connection-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-connection-ui/pom.xml?rev=601567&r1=601566&r2=601567&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-connection-ui/pom.xml (original)
+++ directory/sandbox/felixk/studio-connection-ui/pom.xml Wed Dec 5 15:10:23 2007
@@ -72,18 +72,16 @@
<plugin>
<groupId>org.apache.directory.studio</groupId>
<artifactId>maven-studio-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
<executions>
<execution>
- <id>prepare-jar-package</id>
- <phase>compile</phase>
<goals>
<goal>prepare-jar-package</goal>
</goals>
</execution>
</executions>
- <configuration>
- <skip>false</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: directory/sandbox/felixk/studio-jars/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-jars/pom.xml?rev=601567&r1=601566&r2=601567&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-jars/pom.xml (original)
+++ directory/sandbox/felixk/studio-jars/pom.xml Wed Dec 5 15:10:23 2007
@@ -54,18 +54,16 @@
<plugin>
<groupId>org.apache.directory.studio</groupId>
<artifactId>maven-studio-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
<executions>
<execution>
- <id>prepare-jar-package</id>
- <phase>compile</phase>
<goals>
<goal>prepare-jar-package</goal>
</goals>
</execution>
</executions>
- <configuration>
- <skip>false</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: directory/sandbox/felixk/studio-ldapbrowser-common/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-common/pom.xml?rev=601567&r1=601566&r2=601567&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-common/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-common/pom.xml Wed Dec 5 15:10:23 2007
@@ -69,18 +69,16 @@
<plugin>
<groupId>org.apache.directory.studio</groupId>
<artifactId>maven-studio-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
<executions>
<execution>
- <id>prepare-jar-package</id>
- <phase>compile</phase>
<goals>
<goal>prepare-jar-package</goal>
</goals>
</execution>
</executions>
- <configuration>
- <skip>false</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml?rev=601567&r1=601566&r2=601567&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml Wed Dec 5 15:10:23 2007
@@ -65,18 +65,16 @@
<plugin>
<groupId>org.apache.directory.studio</groupId>
<artifactId>maven-studio-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
<executions>
<execution>
- <id>prepare-jar-package</id>
- <phase>compile</phase>
<goals>
<goal>prepare-jar-package</goal>
</goals>
</execution>
</executions>
- <configuration>
- <skip>false</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: directory/sandbox/felixk/studio-ldapbrowser-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-ui/pom.xml?rev=601567&r1=601566&r2=601567&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-ui/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-ui/pom.xml Wed Dec 5 15:10:23 2007
@@ -79,18 +79,16 @@
<plugin>
<groupId>org.apache.directory.studio</groupId>
<artifactId>maven-studio-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
<executions>
<execution>
- <id>prepare-jar-package</id>
- <phase>compile</phase>
<goals>
<goal>prepare-jar-package</goal>
</goals>
</execution>
</executions>
- <configuration>
- <skip>false</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: directory/sandbox/felixk/studio-ldif-parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldif-parser/pom.xml?rev=601567&r1=601566&r2=601567&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldif-parser/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldif-parser/pom.xml Wed Dec 5 15:10:23 2007
@@ -59,18 +59,16 @@
<plugin>
<groupId>org.apache.directory.studio</groupId>
<artifactId>maven-studio-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
<executions>
<execution>
- <id>prepare-jar-package</id>
- <phase>compile</phase>
<goals>
<goal>prepare-jar-package</goal>
</goals>
</execution>
</executions>
- <configuration>
- <skip>false</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: directory/sandbox/felixk/studio-ldifeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldifeditor/pom.xml?rev=601567&r1=601566&r2=601567&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldifeditor/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldifeditor/pom.xml Wed Dec 5 15:10:23 2007
@@ -76,18 +76,16 @@
<plugin>
<groupId>org.apache.directory.studio</groupId>
<artifactId>maven-studio-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
<executions>
<execution>
- <id>prepare-jar-package</id>
- <phase>compile</phase>
<goals>
<goal>prepare-jar-package</goal>
</goals>
</execution>
</executions>
- <configuration>
- <skip>false</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
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=601567&r1=601566&r2=601567&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 Wed Dec 5 15:10:23 2007
@@ -35,6 +35,8 @@
* ${project.build.outputDirectory}/libraryPath
*
* @goal prepare-jar-package
+ * @phase process-resources
+ * @aggregate
* @description Prepares for jar: Copy artifacts nonscoped "provided" to
* ${project.build.outputDirectory}/libraryPath
* @requiresProject
Modified: directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java?rev=601567&r1=601566&r2=601567&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java (original)
+++ directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioReplaceFileInJarMojo.java Wed Dec 5 15:10:23 2007
@@ -32,7 +32,6 @@
* @goal replace-file-in-eclipse-artifact
* @description Add/Replace a file within a given eclipse artifact at a specific
* location (zip or jar file)
- * @phase package
* @requiresProject
* @requiresDependencyResolution runtime
*
Modified: directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioUnpackPrefixedMojo.java
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioUnpackPrefixedMojo.java?rev=601567&r1=601566&r2=601567&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioUnpackPrefixedMojo.java (original)
+++ directory/sandbox/felixk/studio-plugin/src/main/java/org/apache/directory/studio/maven/plugins/StudioUnpackPrefixedMojo.java Wed Dec 5 15:10:23 2007
@@ -32,7 +32,6 @@
* @goal unpack-with-artifactid-prefix
* @description Prefixes the unpack of an artifact into a given directory with a
* directory named based on the artifacts final name
- * @phase package
* @requiresProject
* @requiresDependencyResolution runtime
*
Modified: directory/sandbox/felixk/studio-rcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-rcp/pom.xml?rev=601567&r1=601566&r2=601567&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-rcp/pom.xml (original)
+++ directory/sandbox/felixk/studio-rcp/pom.xml Wed Dec 5 15:10:23 2007
@@ -74,18 +74,16 @@
<plugin>
<groupId>org.apache.directory.studio</groupId>
<artifactId>maven-studio-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
<executions>
<execution>
- <id>prepare-jar-package</id>
- <phase>compile</phase>
<goals>
<goal>prepare-jar-package</goal>
</goals>
</execution>
</executions>
- <configuration>
- <skip>false</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: directory/sandbox/felixk/studio-schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-schemaeditor/pom.xml?rev=601567&r1=601566&r2=601567&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-schemaeditor/pom.xml (original)
+++ directory/sandbox/felixk/studio-schemaeditor/pom.xml Wed Dec 5 15:10:23 2007
@@ -72,18 +72,16 @@
<plugin>
<groupId>org.apache.directory.studio</groupId>
<artifactId>maven-studio-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
<executions>
<execution>
- <id>prepare-jar-package</id>
- <phase>compile</phase>
<goals>
<goal>prepare-jar-package</goal>
</goals>
</execution>
</executions>
- <configuration>
- <skip>false</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: directory/sandbox/felixk/studio-valueeditors/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-valueeditors/pom.xml?rev=601567&r1=601566&r2=601567&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-valueeditors/pom.xml (original)
+++ directory/sandbox/felixk/studio-valueeditors/pom.xml Wed Dec 5 15:10:23 2007
@@ -74,18 +74,16 @@
<plugin>
<groupId>org.apache.directory.studio</groupId>
<artifactId>maven-studio-plugin</artifactId>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
<executions>
<execution>
- <id>prepare-jar-package</id>
- <phase>compile</phase>
<goals>
<goal>prepare-jar-package</goal>
</goals>
</execution>
</executions>
- <configuration>
- <skip>false</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>