From 11e47bbed65d09b174ef8b0a7be10b6b93a89890 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 11 Dec 2008 16:35:49 +0000
Subject: [PATCH] Version v0.3.1

ASSIGNED - bug 81: Integrate new SpartaUI banding
https://www.spartadn.com/bugzilla/show_bug.cgi?id=81

git-svn-id: https://svn.argeo.org/slc/trunk@2006 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 maven/maven-argeo-pde-plugin/pom.xml          |  2 +-
 .../maven/plugins/pde/PackageProductMojo.java | 38 ++++++++++++++++
 .../resources/META-INF/plexus/components.xml  | 44 +++++++++++++++++++
 .../src/main/scripts/argeo-pde.build.xml      |  2 +-
 .../src/main/scripts/argeo-pde.mojos.xml      | 11 -----
 5 files changed, 84 insertions(+), 13 deletions(-)
 create mode 100644 maven/maven-argeo-pde-plugin/src/main/java/org/argeo/slc/maven/plugins/pde/PackageProductMojo.java

diff --git a/maven/maven-argeo-pde-plugin/pom.xml b/maven/maven-argeo-pde-plugin/pom.xml
index be705bb97..013807ff5 100644
--- a/maven/maven-argeo-pde-plugin/pom.xml
+++ b/maven/maven-argeo-pde-plugin/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.argeo.slc.maven</groupId>
 	<artifactId>maven-argeo-pde-plugin</artifactId>
-	<version>0.3.1-SNAPSHOT</version>
+	<version>0.3.1</version>
 	<packaging>maven-plugin</packaging>
 	<name>Argeo PDE Plugin</name>
 
diff --git a/maven/maven-argeo-pde-plugin/src/main/java/org/argeo/slc/maven/plugins/pde/PackageProductMojo.java b/maven/maven-argeo-pde-plugin/src/main/java/org/argeo/slc/maven/plugins/pde/PackageProductMojo.java
new file mode 100644
index 000000000..94084c78e
--- /dev/null
+++ b/maven/maven-argeo-pde-plugin/src/main/java/org/argeo/slc/maven/plugins/pde/PackageProductMojo.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 a product and adds it as main artifact.
+ * 
+ * @goal packageProduct
+ * @phase package
+ * @execute goal="buildProduct"
+ */
+public class PackageProductMojo extends AbstractMojo {
+	/**
+	 * The Maven project.
+	 * 
+	 * @parameter expression="${project}"
+	 * @required
+	 * @readonly
+	 */
+	private MavenProject project;
+
+	/**
+	 * The build directory.
+	 * 
+	 * @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/maven/maven-argeo-pde-plugin/src/main/resources/META-INF/plexus/components.xml b/maven/maven-argeo-pde-plugin/src/main/resources/META-INF/plexus/components.xml
index fa7d8484b..9b3ee4c9b 100644
--- a/maven/maven-argeo-pde-plugin/src/main/resources/META-INF/plexus/components.xml
+++ b/maven/maven-argeo-pde-plugin/src/main/resources/META-INF/plexus/components.xml
@@ -32,6 +32,35 @@
 				</lifecycles>
 			</configuration>
 		</component>
+		<component>
+			<role>org.apache.maven.lifecycle.mapping.LifecycleMapping
+			</role>
+			<role-hint>eclipseProduct</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:packageProduct
+							</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>
@@ -47,5 +76,20 @@
 				<addedToClasspath>false</addedToClasspath>
 			</configuration>
 		</component>
+		<component>
+			<role>org.apache.maven.artifact.handler.ArtifactHandler
+			</role>
+			<role-hint>eclipseProduct</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/maven/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.build.xml b/maven/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.build.xml
index aec1adfee..6203b7634 100644
--- a/maven/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.build.xml
+++ b/maven/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.build.xml
@@ -141,7 +141,7 @@
 		</copy>
 
 		<!-- Execute -->
-		<eclipseAnt antfile="${productBuildFile}" antargs="-Dbuilder=${buildConfiguration.dir} -DbuildDirectory=${buildDirectory} -DbaseLocation=${eclipseTarget} -Dbase=${base} -DpluginPath=${dependencyDir} -DarchivePrefix=${archivePrefix} -DbuildLabel=${buildLabel} -DbuildId=${buildId} -DcollectingFolder=${collectingFolder} -DskipFetch=${skipFetch} -DskipMaps=${skipMaps} -DrunPackager=${runPackager}" />
+		<eclipseAnt antfile="${productBuildFile}" antargs="-Dbuilder=${buildConfiguration.dir} -DbuildDirectory=${buildDirectory} -DskipBase=true -DbaseLocation=${eclipseTarget} -DpluginPath=${dependencyDir} -DarchivePrefix=${archivePrefix} -DbuildLabel=${buildLabel} -DbuildId=${buildId} -DcollectingFolder=${collectingFolder} -DskipFetch=${skipFetch} -DskipMaps=${skipMaps} -DrunPackager=${runPackager}" />
 
 		<!-- Copy to target dir -->
 		<copy todir="${project.build.directory}">
diff --git a/maven/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.mojos.xml b/maven/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.mojos.xml
index d1223d10a..139fcb8fa 100644
--- a/maven/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.mojos.xml
+++ b/maven/maven-argeo-pde-plugin/src/main/scripts/argeo-pde.mojos.xml
@@ -76,17 +76,6 @@
 
 			<parameters>
 				<!-- Common -->
-				<!-- TODO: remove -->
-				<parameter>
-					<name>eclipseBuildDir</name>
-					<property>eclipseBuildDir</property>
-					<required>true</required>
-					<expression>${eclipseBuildDir}</expression>
-					<type>java.lang.String</type>
-					<description>
-						The Eclipse build dir location
-					</description>
-				</parameter>
 				<parameter>
 					<name>eclipseAntArgs</name>
 					<property>eclipseAntArgs</property>
-- 
2.39.2