[richfaces-svn-commits] JBoss Rich Faces SVN: r1922 - in trunk/cdk: maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo and 1 other directory.
Author: nbelaevski
Date: 2007-07-30 09:52:52 -0400 (Mon, 30 Jul 2007)
New Revision: 1922
Modified:
trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/src/main/config/component/_compName.xml
trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateComponentMojo.java
Log:
CDK updated for 3.1.0
Modified:
trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/src/main/config/component/_compName.xml
===================================================================
---
trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/src/main/config/component/_compName.xml 2007-07-30
13:32:06 UTC (rev 1921)
+++
trunk/cdk/maven-archetype-jsf-component/src/main/resources/archetype-resources/src/main/config/component/_compName.xml 2007-07-30
13:52:52 UTC (rev 1922)
@@ -21,7 +21,7 @@
<name>${artifactId}</name>
<classname>${groupId}.taglib.${artifactId}Tag</classname>
<superclass>
- org.ajax4jsf.framework.taglib.HtmlComponentTagBase
+ org.ajax4jsf.webapp.taglib.HtmlComponentTagBase
</superclass>
</tag>
<!--
Modified:
trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateComponentMojo.java
===================================================================
---
trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateComponentMojo.java 2007-07-30
13:32:06 UTC (rev 1921)
+++
trunk/cdk/maven-cdk-plugin/src/main/java/org/ajax4jsf/builder/mojo/CreateComponentMojo.java 2007-07-30
13:52:52 UTC (rev 1922)
@@ -81,10 +81,19 @@
// Search for this plugin in project pom
for (Iterator iter = plugins.iterator(); iter.hasNext();) {
plugin = (Plugin) iter.next();
- if("maven-cdk-plugin".equals(plugin.getArtifactId()) &&
- "org.ajax4jsf.cdk".equals(plugin.getGroupId())){
- found = true;
- break;
+ if("maven-cdk-plugin".equals(plugin.getArtifactId())) {
+
+ String groupId;
+ if ("3.1.0".compareTo(plugin.getVersion()) > 0) {
+ groupId = "org.ajax4jsf.cdk";
+ } else {
+ groupId = "org.richfaces.cdk";
+ }
+
+ if (groupId.equals(plugin.getGroupId())) {
+ found = true;
+ break;
+ }
}
}
if(found){