You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/04/04 06:55:42 UTC
svn commit: r1088474 - in
/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder:
BuildMetaDataMojo.java ModelParams.java
qdox/CompositeComponentModelBuilder.java
Author: lu4242
Date: Mon Apr 4 04:55:42 2011
New Revision: 1088474
URL: http://svn.apache.org/viewvc?rev=1088474&view=rev
Log:
MYFACES-3032 Include composite component information on documentation generated by myfaces-builder-plugin
Modified:
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/BuildMetaDataMojo.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/ModelParams.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/CompositeComponentModelBuilder.java
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/BuildMetaDataMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/BuildMetaDataMojo.java?rev=1088474&r1=1088473&r2=1088474&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/BuildMetaDataMojo.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/BuildMetaDataMojo.java Mon Apr 4 04:55:42 2011
@@ -295,6 +295,14 @@ public class BuildMetaDataMojo extends A
private Map compositeComponentLibraries;
/**
+ * Indicate the extensions used for composite components, separated by spaces.
+ * By default it is .xhtml
+ *
+ * @parameter
+ */
+ private String compositeComponentFileExtensions;
+
+ /**
* Indicate that metadata is provided in the structure of
* trinidad maven-faces-plugin faces-config.xml files
* and should be feed to build the full metadata
@@ -382,6 +390,8 @@ public class BuildMetaDataMojo extends A
parameters.setCompositeComponentLibraries(compositeComponentLibraries);
+ parameters.setCompositeComponentFileExtensions(compositeComponentFileExtensions);
+
//Trinidad maven faces plugin integration
if (isReadMavenFacesPluginMetadata())
{
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/ModelParams.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/ModelParams.java?rev=1088474&r1=1088473&r2=1088474&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/ModelParams.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/ModelParams.java Mon Apr 4 04:55:42 2011
@@ -35,6 +35,8 @@ public class ModelParams
private Map compositeComponentLibraries;
+ private String compositeComponentFileExtensions;
+
private FacesConfigBean facesConfigBean;
public ModelParams()
@@ -89,4 +91,11 @@ public class ModelParams
{
this.facesConfigBean = facesConfigBean;
}
+ public String getCompositeComponentFileExtensions() {
+ return compositeComponentFileExtensions;
+ }
+ public void setCompositeComponentFileExtensions(
+ String compositeComponentFileExtensions) {
+ this.compositeComponentFileExtensions = compositeComponentFileExtensions;
+ }
}
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/CompositeComponentModelBuilder.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/CompositeComponentModelBuilder.java?rev=1088474&r1=1088473&r2=1088474&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/CompositeComponentModelBuilder.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/qdox/CompositeComponentModelBuilder.java Mon Apr 4 04:55:42 2011
@@ -257,6 +257,7 @@ public class CompositeComponentModelBuil
// Set as class name the assigned by Application.createResource,
// even if not exists.
this.component.setClassName(alias);
+ this.component.setModelId(model.getModelId());
}
//componentType
if (setComponentType)
@@ -299,6 +300,7 @@ public class CompositeComponentModelBuil
if (property == null)
{
property = new PropertyMeta();
+ property.setName(name);
component.addProperty(property);
}
@@ -493,11 +495,21 @@ public class CompositeComponentModelBuil
File dirToScan = new File(dir,libraryName);
if (dirToScan != null && dirToScan.exists() && dirToScan.isDirectory() )
{
+
+ final String[] fileExtensions = parameters.getCompositeComponentFileExtensions() != null ?
+ parameters.getCompositeComponentFileExtensions().split(" ") : new String[]{".xhtml"};
FileFilter fileFilter = new FileFilter()
{
public boolean accept(File file)
{
- return file.getName().endsWith(".xhtml");
+ for (String extension : fileExtensions)
+ {
+ if (file.getName().endsWith(extension))
+ {
+ return true;
+ }
+ }
+ return false;
}
};
File[] files = dirToScan.listFiles(fileFilter);
@@ -505,8 +517,17 @@ public class CompositeComponentModelBuil
{
for (int i = 0; i < files.length; i++)
{
+ String fileExtension = null;
+ for (String extension : fileExtensions)
+ {
+ if (files[i].getName().endsWith(extension))
+ {
+ fileExtension = extension;
+ break;
+ }
+ }
String componentName = files[i].getName().substring(
- 0, files[i].getName().length()-6);
+ 0, files[i].getName().length()-fileExtension.length());
try
{
doParseMetadata(model, files[i].toURL(),