X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=maven-argeo-osgi-plugin%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fmaven%2Fplugins%2Fosgi%2FAbstractBundlesPackagerMojo.java;h=ee3cd28a3168dd259ca02586c04a4c4ccf32b838;hb=42944b0571af7212c6d4dd776de100e73faff862;hp=acc894107424a2716f26c101ff28286df1022bd8;hpb=ed281564bf156579dc163bc616db1881fe30b1a6;p=gpl%2Fargeo-slc.git

diff --git a/maven-argeo-osgi-plugin/src/main/java/org/argeo/slc/maven/plugins/osgi/AbstractBundlesPackagerMojo.java b/maven-argeo-osgi-plugin/src/main/java/org/argeo/slc/maven/plugins/osgi/AbstractBundlesPackagerMojo.java
index acc894107..ee3cd28a3 100644
--- a/maven-argeo-osgi-plugin/src/main/java/org/argeo/slc/maven/plugins/osgi/AbstractBundlesPackagerMojo.java
+++ b/maven-argeo-osgi-plugin/src/main/java/org/argeo/slc/maven/plugins/osgi/AbstractBundlesPackagerMojo.java
@@ -3,6 +3,7 @@ package org.argeo.slc.maven.plugins.osgi;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileInputStream;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -14,8 +15,12 @@ import java.util.jar.Manifest;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.metadata.ArtifactMetadata;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.artifact.ProjectArtifactMetadata;
 
 /**
  * @author mbaudier
@@ -56,6 +61,15 @@ public abstract class AbstractBundlesPackagerMojo extends AbstractOsgiMojo {
 	 */
 	protected boolean strictManifestVersion;
 
+	/**
+	 * Whether the manifest should be updated with the release version.
+	 * 
+	 * @parameter expression="${updateManifestWhenReleasing}"
+	 *            default-value="true"
+	 * @required
+	 */
+	protected boolean updateManifestWhenReleasing;
+
 	/**
 	 * Whether should fail if symbolic name does not match artifact id.
 	 * 
@@ -141,7 +155,7 @@ public abstract class AbstractBundlesPackagerMojo extends AbstractOsgiMojo {
 		} else {
 			versionMain = project.getVersion();
 			// buildId = "R_" + sdf.format(new Date());// R for release
-			buildId = "";
+			buildId = "R" + sdf.format(new Date());
 		}
 
 		if (!versionMain.equals(versionMfMain)) {
@@ -162,7 +176,7 @@ public abstract class AbstractBundlesPackagerMojo extends AbstractOsgiMojo {
 			newVersionArt = versionMfMain;
 		}
 
-		//boolean debug = true;
+		// boolean debug = true;
 		boolean debug = getLog().isDebugEnabled();
 		if (debug && willGenerate) {
 			getLog().info("\n## " + artifactId);
@@ -199,6 +213,46 @@ public abstract class AbstractBundlesPackagerMojo extends AbstractOsgiMojo {
 				bundlesPomArtifactId, project.getVersion(), "pom");
 	}
 
+	protected StringBuffer createPomFileHeader(String parentGroupId,
+			String parentArtifactId, String parentBaseVersion, String groupId,
+			String artifactId, String packaging) {
+		StringBuffer pom = new StringBuffer();
+		// not using append() systematically for the sake of clarity
+		pom.append("<project>\n");
+		pom.append("\t<modelVersion>4.0.0</modelVersion>\n");
+		pom.append("\t<parent>\n");
+		pom.append("\t\t<groupId>" + parentGroupId + "</groupId>\n");
+		pom.append("\t\t<artifactId>" + parentArtifactId + "</artifactId>\n");
+		pom.append("\t\t<version>" + parentBaseVersion + "</version>\n");
+		pom.append("\t</parent>\n");
+		pom.append("\t<groupId>" + groupId + "</groupId>\n");
+		pom.append("\t<artifactId>" + artifactId + "</artifactId>\n");
+		pom.append("\t<packaging>" + packaging + "</packaging>\n");
+		return pom;
+
+		// TODO: use the Model object e.g.: (from install plugin)
+		// Model model = new Model();
+		// model.setModelVersion( "4.0.0" );
+		// model.setGroupId( groupId );
+		// model.setArtifactId( artifactId );
+		// model.setVersion( version );
+		// model.setPackaging( packaging );
+		// model.setDescription( "POM was created from install:install-file" );
+		// fw = new FileWriter( tempFile );
+		// tempFile.deleteOnExit();
+		// new MavenXpp3Writer().write( fw, model );
+		// ArtifactMetadata metadata = new ProjectArtifactMetadata( artifact,
+		// tempFile );
+		// artifact.addMetadata( metadata );
+
+	}
+
+	/** Simple close the project tag */
+	protected String closePomFile(StringBuffer pom) {
+		pom.append("</project>\n");
+		return pom.toString();
+	}
+
 	protected static class BundlePackage {
 		private final Artifact artifact;
 		private final File bundleDir;
@@ -229,6 +283,14 @@ public abstract class AbstractBundlesPackagerMojo extends AbstractOsgiMojo {
 		public Manifest getManifest() {
 			return manifest;
 		}
+
+		public File getManifestFile() {
+			return new File(getPackageFile().getPath() + ".MF");
+		}
+
+		public File getPomFile() {
+			return new File(getPackageFile().getPath() + ".pom.xml");
+		}
 	}
 
 	protected Manifest readManifest(File file) throws IOException {