X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.repo%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Frepo%2Fmaven%2FMavenConventionsUtils.java;h=4e8d3fb832f54ac6c6f24d905e4c8850682f3209;hb=fa099b50351a61638bdb1e3becc45ace640c15f2;hp=3531515cd9ad4a0cd441b55d96b1c0dbc67b66f6;hpb=85f08be9b08c3938d25c46cae5b56dd0c4543cc7;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/MavenConventionsUtils.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/MavenConventionsUtils.java
index 3531515cd..4e8d3fb83 100644
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/MavenConventionsUtils.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/MavenConventionsUtils.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.slc.repo.maven;
 
 import java.io.File;
@@ -63,6 +78,12 @@ public class MavenConventionsUtils {
 						.getClassifier()) + '.' + artifact.getExtension();
 	}
 
+	/** Absolute path to the file */
+	public static String artifactPath(String artifactBasePath, Artifact artifact) {
+		return artifactParentPath(artifactBasePath, artifact) + '/'
+				+ artifactFileName(artifact);
+	}
+
 	/** Absolute path to the directories where the files will be stored */
 	public static String artifactParentPath(String artifactBasePath,
 			Artifact artifact) {
@@ -70,66 +91,84 @@ public class MavenConventionsUtils {
 				+ artifactParentPath(artifact);
 	}
 
+	/** Absolute path to the directory of this group */
+	public static String groupPath(String artifactBasePath, String groupId) {
+		return artifactBasePath + (artifactBasePath.endsWith("/") ? "" : "/")
+				+ groupId.replace('.', '/');
+	}
+
 	/** Relative path to the directories where the files will be stored */
 	public static String artifactParentPath(Artifact artifact) {
 		return artifact.getGroupId().replace('.', '/') + '/'
-				+ artifact.getArtifactId() + '/' + artifact.getVersion();
+				+ artifact.getArtifactId() + '/' + artifact.getBaseVersion();
 	}
 
 	public static String artifactsAsDependencyPom(Artifact pomArtifact,
-			Set<Artifact> artifacts) {
-		StringBuffer b = new StringBuffer();
+			Set<Artifact> artifacts, Artifact parent) {
+		StringBuffer p = new StringBuffer();
 
 		// XML header
-		b.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-		b.append("<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">\n");
-		b.append("<modelVersion>4.0.0</modelVersion>");
+		p.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+		p.append("<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">\n");
+		p.append("<modelVersion>4.0.0</modelVersion>\n");
 
 		// Artifact
-		b.append("<parent><groupId>org.argeo</groupId><artifactId>parent</artifactId><version>1.2.0</version></parent>\n");
-		b.append("<groupId>").append(pomArtifact.getGroupId())
+		if (parent != null) {
+			p.append("<parent>\n");
+			p.append("<groupId>").append(parent.getGroupId())
+					.append("</groupId>\n");
+			p.append("<artifactId>").append(parent.getArtifactId())
+					.append("</artifactId>\n");
+			p.append("<version>").append(parent.getVersion())
+					.append("</version>\n");
+			p.append("</parent>\n");
+		}
+		p.append("<groupId>").append(pomArtifact.getGroupId())
 				.append("</groupId>\n");
-		b.append("<artifactId>").append(pomArtifact.getArtifactId())
+		p.append("<artifactId>").append(pomArtifact.getArtifactId())
 				.append("</artifactId>\n");
-		b.append("<version>").append(pomArtifact.getVersion())
+		p.append("<version>").append(pomArtifact.getVersion())
 				.append("</version>\n");
-		b.append("<packaging>pom</packaging>\n");
+		p.append("<packaging>pom</packaging>\n");
 
 		// Dependencies
-		b.append("<dependencies>\n");
-		for (Artifact artifact : artifacts) {
-			b.append("\t<dependency>");
-			b.append("<artifactId>").append(artifact.getArtifactId())
+		p.append("<dependencies>\n");
+		for (Artifact a : artifacts) {
+			p.append("\t<dependency>");
+			p.append("<artifactId>").append(a.getArtifactId())
 					.append("</artifactId>");
-			b.append("<groupId>").append(artifact.getGroupId())
-					.append("</groupId>");
-			b.append("</dependency>\n");
+			p.append("<groupId>").append(a.getGroupId()).append("</groupId>");
+			if (!a.getExtension().equals("jar"))
+				p.append("<type>").append(a.getExtension()).append("</type>");
+			p.append("</dependency>\n");
 		}
-		b.append("</dependencies>\n");
+		p.append("</dependencies>\n");
 
 		// Dependency management
-		b.append("<dependencyManagement>\n");
-		b.append("<dependencies>\n");
-		for (Artifact artifact : artifacts) {
-			b.append("\t<dependency>");
-			b.append("<artifactId>").append(artifact.getArtifactId())
+		p.append("<dependencyManagement>\n");
+		p.append("<dependencies>\n");
+		for (Artifact a : artifacts) {
+			p.append("\t<dependency>");
+			p.append("<artifactId>").append(a.getArtifactId())
 					.append("</artifactId>");
-			b.append("<version>").append(artifact.getVersion())
-					.append("</version>");
-			b.append("<groupId>").append(artifact.getGroupId())
-					.append("</groupId>");
-			b.append("</dependency>\n");
+			p.append("<version>").append(a.getVersion()).append("</version>");
+			p.append("<groupId>").append(a.getGroupId()).append("</groupId>");
+			if (a.getExtension().equals("pom")) {
+				p.append("<type>").append(a.getExtension()).append("</type>");
+				p.append("<scope>import</scope>");
+			}
+			p.append("</dependency>\n");
 		}
-		b.append("</dependencies>\n");
-		b.append("</dependencyManagement>\n");
+		p.append("</dependencies>\n");
+		p.append("</dependencyManagement>\n");
 
 		// Repositories
-		b.append("<repositories>\n");
-		b.append("<repository><id>argeo</id><url>http://maven.argeo.org/argeo</url></repository>\n");
-		b.append("</repositories>\n");
+		// p.append("<repositories>\n");
+		// p.append("<repository><id>argeo</id><url>http://maven.argeo.org/argeo</url></repository>\n");
+		// p.append("</repositories>\n");
 
-		b.append("</project>\n");
-		return b.toString();
+		p.append("</project>\n");
+		return p.toString();
 	}
 
 	/**