[richfaces-svn-commits] JBoss Rich Faces SVN: r11470 - trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2008-12-01 14:01:50 -0500 (Mon, 01 Dec 2008)
New Revision: 11470

Modified:
   trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java
   trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Taglib.java
Log:
https://jira.jboss.org/jira/browse/RF-5100

Modified: trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java
===================================================================
--- trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java	2008-12-01 19:01:10 UTC (rev 11469)
+++ trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/AbstractCDKMojo.java	2008-12-01 19:01:50 UTC (rev 11470)
@@ -30,7 +30,10 @@
 import java.net.URLClassLoader;
 import java.util.Iterator;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
+import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.project.MavenProject;
@@ -258,6 +261,10 @@
 		if(null == taglib.getTaglib()){
 			taglib.setTaglib(taglib.getShortName());
 		}
+		
+		if (null == taglib.getTlibVersion()) {
+			taglib.setTlibVersion(createTaglibVersionFromProjectVersion());
+		}
 		getLog().debug("Taglib uri is " + taglib.getUri());
 		getLog().debug("Taglib shortname is " + taglib.getShortName());
 		if (null != library.getTaglibs() && library.getTaglibs().length > 0) {
@@ -269,6 +276,17 @@
 		return taglib;
 	}
 
+	private String createTaglibVersionFromProjectVersion() {
+		Artifact artifact = project.getArtifact();
+		String version = artifact.getVersion();
+		Matcher matcher = Pattern.compile("^(\\d+(?:\\.\\d+)*)").matcher(version);
+		if (matcher.find()) {
+			return matcher.group(1);
+		}
+
+		return "1.2";
+	}
+
 	protected void writeParsedTemplate(String templateName, VelocityContext context, File configFile) throws IOException, ResourceNotFoundException, ParseErrorException, MethodInvocationException, Exception {
 		File dir = configFile.getParentFile();
 		if(!dir.exists()){
@@ -333,9 +351,12 @@
 		if(null == taglib.getTaglib()){
 			taglib.setTaglib(taglib.getShortName());
 		}
+		if (null == taglib.getTlibVersion()) {
+			taglib.setTlibVersion(createTaglibVersionFromProjectVersion());
+		}
 		getLog().debug("Taglib uri is " + taglib.getUri());
 		getLog().debug("Taglib shortname is " + taglib.getShortName());
-	
+		getLog().debug("Taglib version is " + taglib.getTlibVersion());
 	}
 
 }

Modified: trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Taglib.java
===================================================================
--- trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Taglib.java	2008-12-01 19:01:10 UTC (rev 11469)
+++ trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/Taglib.java	2008-12-01 19:01:50 UTC (rev 11470)
@@ -39,7 +39,7 @@
 	
 	private String _displayName;
 
-	private String _tlibVersion = "1.2";
+	private String _tlibVersion = null;
 	
 	private String _jspVersion ;