From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 5 Dec 2008 22:40:31 +0000 (+0000)
Subject: Introduce custom lifecycle for type eclipseFeature
X-Git-Tag: svn/tags/maven-plugins-0.3.0@2542~50
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=76839c8e51108b372e776ecc82eae31ec5b90798;p=gpl%2Fargeo-slc.git

Introduce custom lifecycle for type eclipseFeature

git-svn-id: https://svn.argeo.org/slc/trunk/maven@1886 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/plugins/maven-argeo-pde-plugin/pom.xml b/plugins/maven-argeo-pde-plugin/pom.xml
index 83117ef80..ccc005ffb 100644
--- a/plugins/maven-argeo-pde-plugin/pom.xml
+++ b/plugins/maven-argeo-pde-plugin/pom.xml
@@ -1,7 +1,6 @@
 <project>
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.argeo.slc.maven.plugins
-	</groupId>
+	<groupId>org.argeo.slc.maven</groupId>
 	<artifactId>maven-argeo-pde-plugin</artifactId>
 	<version>0.3.1-SNAPSHOT</version>
 	<packaging>maven-plugin</packaging>
@@ -18,6 +17,11 @@
 			<artifactId>maven-script-ant</artifactId>
 			<version>2.0.9</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-project</artifactId>
+			<version>2.0.7</version>
+		</dependency>
 		<dependency>
 			<groupId>ant-contrib</groupId>
 			<artifactId>ant-contrib</artifactId>
diff --git a/plugins/maven-argeo-pde-plugin/src/main/java/org/argeo/slc/maven/plugins/pde/EclipseTargetForkMojo.java b/plugins/maven-argeo-pde-plugin/src/main/java/org/argeo/slc/maven/plugins/pde/EclipseTargetForkMojo.java
deleted file mode 100644
index 2edc8f6fa..000000000
--- a/plugins/maven-argeo-pde-plugin/src/main/java/org/argeo/slc/maven/plugins/pde/EclipseTargetForkMojo.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.argeo.slc.maven.plugins.pde;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-
-/**
- * Forks a eclipseTarget lifecycle.
- * 
- * @goal eclipseTarget-fork
- * @execute lifecycle="eclipseTarget" phase="initialize"
- */
-public class EclipseTargetForkMojo extends AbstractMojo {
-	public void execute() throws MojoExecutionException {
-		getLog().info("doing nothing here");
-	}
-}
diff --git a/plugins/maven-argeo-pde-plugin/src/main/java/org/argeo/slc/maven/plugins/pde/EclipseTargetMojo.java b/plugins/maven-argeo-pde-plugin/src/main/java/org/argeo/slc/maven/plugins/pde/EclipseTargetMojo.java
new file mode 100644
index 000000000..eff431748
--- /dev/null
+++ b/plugins/maven-argeo-pde-plugin/src/main/java/org/argeo/slc/maven/plugins/pde/EclipseTargetMojo.java
@@ -0,0 +1,16 @@
+package org.argeo.slc.maven.plugins.pde;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+
+/**
+ * Forks a eclipseTarget lifecycle.
+ * 
+ * @goal eclipseTarget
+ * @execute lifecycle="eclipseTarget" phase="initialize"
+ */
+public class EclipseTargetMojo extends AbstractMojo {
+	public void execute() throws MojoExecutionException {
+		getLog().info("EclipseTargetMojo done");
+	}
+}
diff --git a/plugins/maven-argeo-pde-plugin/src/main/java/org/argeo/slc/maven/plugins/pde/PackageElementMojo.java b/plugins/maven-argeo-pde-plugin/src/main/java/org/argeo/slc/maven/plugins/pde/PackageElementMojo.java
new file mode 100644
index 000000000..0505c2af1
--- /dev/null
+++ b/plugins/maven-argeo-pde-plugin/src/main/java/org/argeo/slc/maven/plugins/pde/PackageElementMojo.java
@@ -0,0 +1,38 @@
+package org.argeo.slc.maven.plugins.pde;
+
+import java.io.File;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
+
+/**
+ * Builds an element and adds it as main artifact.
+ * 
+ * @goal packageElement
+ * @phase package
+ * @execute goal="buildElement"
+ */
+public class PackageElementMojo extends AbstractMojo {
+	/**
+	 * The Maven project.
+	 * 
+	 * @parameter expression="${project}"
+	 * @required
+	 * @readonly
+	 */
+	private MavenProject project;
+
+	/**
+	 * The directory for the generated JAR.
+	 * 
+	 * @parameter expression="${project.build.directory}"
+	 * @required
+	 */
+	private String buildDirectory;
+
+	public void execute() throws MojoExecutionException {
+		File file = new File(buildDirectory, project.getArtifactId() + ".zip");
+		project.getArtifact().setFile(file);
+	}
+}
diff --git a/plugins/maven-argeo-pde-plugin/src/main/resources/META-INF/maven/lifecycle.xml b/plugins/maven-argeo-pde-plugin/src/main/resources/META-INF/maven/lifecycle.xml
index c3429e936..9cc13514a 100644
--- a/plugins/maven-argeo-pde-plugin/src/main/resources/META-INF/maven/lifecycle.xml
+++ b/plugins/maven-argeo-pde-plugin/src/main/resources/META-INF/maven/lifecycle.xml
@@ -17,7 +17,7 @@
 					</execution>
 					<execution>
 						<goals>
-							<goal>eclipseTarget</goal>
+							<goal>eclipseTarget-collect</goal>
 						</goals>
 					</execution>
 				</executions>
diff --git a/plugins/maven-argeo-pde-plugin/src/main/resources/META-INF/plexus/components.xml b/plugins/maven-argeo-pde-plugin/src/main/resources/META-INF/plexus/components.xml
new file mode 100644
index 000000000..7055dbab5
--- /dev/null
+++ b/plugins/maven-argeo-pde-plugin/src/main/resources/META-INF/plexus/components.xml
@@ -0,0 +1,48 @@
+<component-set>
+	<components>
+		<component>
+			<role>org.apache.maven.lifecycle.mapping.LifecycleMapping
+			</role>
+			<role-hint>eclipseFeature</role-hint>
+			<implementation>
+				org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping
+			</implementation>
+			<configuration>
+				<lifecycles>
+					<lifecycle>
+						<id>default</id>
+						<phases>
+							<initialize>
+								org.argeo.slc.maven:maven-argeo-pde-plugin:eclipseTarget
+							</initialize>
+							<package>
+								org.argeo.slc.maven:maven-argeo-pde-plugin:packageElement
+							</package>
+							<install>
+								org.apache.maven.plugins:maven-install-plugin:install
+							</install>
+							<deploy>
+								org.apache.maven.plugins:maven-deploy-plugin:deploy
+							</deploy>
+						</phases>
+					</lifecycle>
+				</lifecycles>
+			</configuration>
+		</component>
+		<component>
+			<role>org.apache.maven.artifact.handler.ArtifactHandler
+			</role>
+			<role-hint>eclipseFeature</role-hint>
+			<implementation>
+				org.apache.maven.artifact.handler.DefaultArtifactHandler
+			</implementation>
+			<configuration>
+				<type>eclipseFeature</type>
+				<includesDependencies>false</includesDependencies>
+				<language>java</language>
+				<extension>zip</extension>
+				<addedToClasspath>false</addedToClasspath>
+			</configuration>
+		</component>
+	</components>
+</component-set>
diff --git a/plugins/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.build.xml b/plugins/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.build.xml
index c2fe0b17e..4029f6360 100644
--- a/plugins/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.build.xml
+++ b/plugins/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.build.xml
@@ -87,7 +87,7 @@
 			<mergemapper to="${elementId}.zip" />
 		</copy>
 
-		<!-- Update site -->
+		<!-- TODO Update site 
 		<copy tofile="${project.build.directory}/site.xml" file="${siteTemplate}">
 			<filterset begintoken="$${" endtoken="}">
 				<filtersfile file="${buildDirectory}/finalFeaturesVersions.properties" />
@@ -100,6 +100,7 @@
 				<include name="site.xml" />
 			</fileset>
 		</zip>
+		-->
 	</target>
 
 	<!-- 
@@ -151,44 +152,16 @@
 		</copy>
 	</target>
 
-	<!-- 
-		TARGET Clean
-	-->
-	<target name="clean" depends="init,clean.elementBuildScript" description="Cleans the generated resources">
-		<delete dir="${projectDirectory}/workspace" verbose="true" />
-		<delete file="${projectDirectory}/javaCompiler...args" verbose="true" />
-		<delete>
-			<fileset dir="${projectDirectory}/../..">
-				<include name="final*.properties" />
-				<include name="assemble*.xml" />
-				<include name="package*.xml" />
-			</fileset>
-		</delete>
-	</target>
-
-	<target name="clean.elementBuildScript" if="elementBuildScript.exists">
-		<ant antfile="${elementBuildScript}" target="clean" />
-		<delete file="${elementBuildScript}" verbose="true" />
-	</target>
-
 	<!--
-		TARGET eclipseTarget
+		TARGET eclipseTarget-collect
 	-->
-	<target name="eclipseTarget" description="Creates an Eclipse target location based on the dependencies">
+	<target name="eclipseTarget-collect" description="Creates an Eclipse target location based on the dependencies">
 		<taskdef resource="net/sf/antcontrib/antlib.xml" />
 		<for param="dir">
 			<dirset dir="${project.build.directory}/dependency">
 				<include name="*" />
 			</dirset>
 			<sequential>
-				<!--
-				<move todir="@{dir}" failonerror="false">
-					<fileset dir="@{dir}/eclipse">
-						<include name="**" />
-					</fileset>
-				</move>
-				<delete dir="@{dir}/eclipse" failonerror="false" quiet="true" />
-				-->
 				<copy todir="${eclipseTarget}" failonerror="false">
 					<fileset dir="@{dir}">
 						<include name="plugins/**" />
@@ -223,12 +196,6 @@
 		COMMON UTILITIES 
 	-->
 	<target name="init">
-		<!-- Init Base 
-		<property name="base" location="${eclipseBuildDir}" />
-		<property name="baseLocation" location="${base}/eclipse" />
-		<property name="pdeBuilder" location="${eclipseBuildDir}/argeo-slc-pde" />
-		<property name="pluginPathBase" location="${eclipseBuildDir}/pluginPath" />
--->
 		<path id="pdeBuilder.launcher.classpath">
 			<fileset dir="${pdeBuilder}/plugins">
 				<include name="org.eclipse.equinox.launcher_*.jar" />
@@ -240,13 +207,6 @@
 		<echo message="ant.file=${ant.file}" />
 		<echo message="projectDirectory=${projectDirectory}" />
 
-		<!--<echo message="eclipseBuildDir=${eclipseBuildDir}" />
-		<echo message="base=${base}" />
-		<echo message="baseLocation=${baseLocation}" />
-		<echo message="pdeBuilder=${pdeBuilder}" />
-		<echo message="localBuildDir=${localBuildDir}" />
-		<echo message="pluginPathBase=${pluginPathBase}" />
--->
 		<echo message="pdeBuilder=${pdeBuilder}" />
 		<echo message="eclipseTarget=${eclipseTarget}" />
 
@@ -259,8 +219,6 @@
 		<echo message="eclipseAntArgs=${eclipseAntArgs}" />
 
 		<echo message="buildConfiguration.dir=${buildConfiguration.dir}" />
-
-		<available file="${elementBuildScript}" property="elementBuildScript.exists" value="true" />
 	</target>
 	<!--
 	<target name="setPluginPath">
diff --git a/plugins/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.mojos.xml b/plugins/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.mojos.xml
index 39e92bfe3..b10aaacff 100644
--- a/plugins/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.mojos.xml
+++ b/plugins/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.mojos.xml
@@ -163,8 +163,8 @@
 		</mojo>
 
 		<mojo>
-			<goal>eclipseTarget</goal>
-			<call>eclipseTarget</call>
+			<goal>eclipseTarget-collect</goal>
+			<call>eclipseTarget-collect</call>
 			<description>
 				Installs an Eclipse target based on dependencies
 			</description>