You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by de...@apache.org on 2018/05/10 04:48:30 UTC

[myfaces-build-tools] 01/01: [maven-release-plugin] copy for tag m2_archetypes_102_release

This is an automated email from the ASF dual-hosted git repository.

deki pushed a commit to tag m2_archetypes_102_release
in repository https://gitbox.apache.org/repos/asf/myfaces-build-tools.git

commit 200b677d98a27a6a96605fb2fe9e343177d8a8cd
Author: Jakob Korherr <ja...@apache.org>
AuthorDate: Mon Sep 6 18:55:39 2010 +0000

    [maven-release-plugin]  copy for tag m2_archetypes_102_release
---
 other/checkstyle-rules/LICENSE.txt => LICENSE.txt  |    0
 .../myfaces-xrts-plugin/NOTICE.txt => NOTICE.txt   |    0
 maven2-archetypes/LICENSE.txt                      |  202 -
 maven2-archetypes/NOTICE.txt                       |   16 -
 .../src/main/resources/META-INF/LICENSE.txt        |  202 -
 .../src/main/resources/META-INF/NOTICE.txt         |   16 -
 .../src/main/resources/META-INF/LICENSE.txt        |  202 -
 .../src/main/resources/META-INF/NOTICE.txt         |   16 -
 .../src/main/resources/META-INF/LICENSE.txt        |  202 -
 .../src/main/resources/META-INF/NOTICE.txt         |   16 -
 .../src/main/resources/META-INF/LICENSE.txt        |  202 -
 .../src/main/resources/META-INF/NOTICE.txt         |   16 -
 .../src/main/resources/META-INF/LICENSE.txt        |  202 -
 .../src/main/resources/META-INF/NOTICE.txt         |   16 -
 .../src/main/resources/META-INF/LICENSE.txt        |  202 -
 .../src/main/resources/META-INF/NOTICE.txt         |   16 -
 .../myfaces-builder-annotations/LICENSE.txt        |  202 -
 .../myfaces-builder-annotations/NOTICE.txt         |   16 -
 maven2-plugins/myfaces-builder-annotations/pom.xml |   70 -
 .../plugin/builder/annotation/JSFBehavior.java     |   43 -
 .../plugin/builder/annotation/JSFComponent.java    |  355 -
 .../plugin/builder/annotation/JSFConverter.java    |   83 -
 .../plugin/builder/annotation/JSFExclude.java      |   49 -
 .../builder/annotation/JSFFaceletAttribute.java    |  118 -
 .../builder/annotation/JSFFaceletAttributes.java   |   50 -
 .../plugin/builder/annotation/JSFFaceletTag.java   |  139 -
 .../plugin/builder/annotation/JSFFaceletTags.java  |   60 -
 .../maven2/plugin/builder/annotation/JSFFacet.java |   49 -
 .../plugin/builder/annotation/JSFJspAttribute.java |  104 -
 .../builder/annotation/JSFJspProperties.java       |   45 -
 .../plugin/builder/annotation/JSFJspProperty.java  |  123 -
 .../plugin/builder/annotation/JSFJspTag.java       |   60 -
 .../plugin/builder/annotation/JSFListener.java     |   54 -
 .../plugin/builder/annotation/JSFProperty.java     |  172 -
 .../plugin/builder/annotation/JSFRenderKit.java    |   42 -
 .../plugin/builder/annotation/JSFRenderer.java     |   58 -
 .../plugin/builder/annotation/JSFRenderers.java    |   45 -
 .../plugin/builder/annotation/JSFValidator.java    |  107 -
 .../builder/annotation/JSFWebConfigParam.java      |   60 -
 maven2-plugins/myfaces-builder-plugin/LICENSE.txt  |  202 -
 maven2-plugins/myfaces-builder-plugin/NOTICE.txt   |   16 -
 maven2-plugins/myfaces-builder-plugin/pom.xml      |  212 -
 .../maven2/plugin/builder/BuildMetaDataMojo.java   |  526 --
 .../maven2/plugin/builder/Flattener.java           |  569 --
 .../buildtools/maven2/plugin/builder/IOUtils.java  |  383 -
 .../maven2/plugin/builder/MakeComponentsMojo.java  |  696 --
 .../maven2/plugin/builder/MakeConfigMojo.java      |  373 -
 .../plugin/builder/MakeConverterTagsMojo.java      |  444 -
 .../maven2/plugin/builder/MakeTagsMojo.java        |  443 -
 .../plugin/builder/MakeValidatorTagsMojo.java      |  444 -
 .../maven2/plugin/builder/MakeValidatorsMojo.java  |  437 -
 .../maven2/plugin/builder/ModelBuilder.java        |   61 -
 .../maven2/plugin/builder/io/PrettyWriter.java     |  178 -
 .../maven2/plugin/builder/io/XmlWriter.java        |  219 -
 .../plugin/builder/model/AttributeHolder.java      |   34 -
 .../maven2/plugin/builder/model/AttributeMeta.java |  298 -
 .../maven2/plugin/builder/model/BehaviorMeta.java  |  223 -
 .../maven2/plugin/builder/model/ClassMeta.java     |  316 -
 .../maven2/plugin/builder/model/ComponentMeta.java |  648 --
 .../maven2/plugin/builder/model/ConverterMeta.java |  295 -
 .../plugin/builder/model/FaceletTagMeta.java       |  295 -
 .../maven2/plugin/builder/model/FacetHolder.java   |   34 -
 .../maven2/plugin/builder/model/FacetMeta.java     |  195 -
 .../plugin/builder/model/ListenerHolder.java       |   38 -
 .../maven2/plugin/builder/model/ListenerMeta.java  |  247 -
 .../plugin/builder/model/MethodSignatureMeta.java  |  124 -
 .../maven2/plugin/builder/model/Model.java         |  535 --
 .../maven2/plugin/builder/model/ModelUtils.java    |  178 -
 .../plugin/builder/model/PropertyHolder.java       |   36 -
 .../maven2/plugin/builder/model/PropertyMeta.java  |  619 --
 .../maven2/plugin/builder/model/RenderKitMeta.java |  182 -
 .../maven2/plugin/builder/model/RendererMeta.java  |  136 -
 .../maven2/plugin/builder/model/TagMeta.java       |  254 -
 .../maven2/plugin/builder/model/ValidatorMeta.java |  336 -
 .../plugin/builder/model/ViewEntityMeta.java       |  197 -
 .../maven2/plugin/builder/model/WebConfigMeta.java |  174 -
 .../plugin/builder/model/WebConfigParamHolder.java |   36 -
 .../plugin/builder/model/WebConfigParamMeta.java   |  227 -
 .../maven2/plugin/builder/qdox/QdoxHelper.java     |  555 --
 .../plugin/builder/qdox/QdoxModelBuilder.java      | 1957 ----
 .../builder/unpack/AbstractDependencyMojo.java     |  416 -
 .../unpack/AbstractFromConfigurationMojo.java      |  434 -
 .../maven2/plugin/builder/unpack/ArtifactItem.java |  361 -
 .../maven2/plugin/builder/unpack/UnpackMojo.java   |  450 -
 .../plugin/builder/utils/BuildException.java       |   41 -
 .../plugin/builder/utils/ConsoleLogSystem.java     |   76 -
 .../builder/utils/MavenPluginConsoleLogSystem.java |   79 -
 .../maven2/plugin/builder/utils/MyfacesUtils.java  |  746 --
 .../utils/RelativeClasspathResourceLoader.java     |  149 -
 .../maven2/plugin/tagdoc/TagdocContentMojo.java    | 1201 ---
 .../maven2/plugin/tagdoc/TagdocIndexReport.java    |  589 --
 .../maven2/plugin/tagdoc/TagdocUtils.java          |  189 -
 .../src/main/resources/META-INF/NOTICE             |   16 -
 .../main/resources/META-INF/componentClass11.vm    |  265 -
 .../main/resources/META-INF/componentClass12.vm    |  256 -
 .../main/resources/META-INF/componentClass20.vm    |  518 --
 .../resources/META-INF/componentClassMacros11.vm   |    4 -
 .../src/main/resources/META-INF/facelets-taglib.vm |  103 -
 .../main/resources/META-INF/facelets-taglib20.vm   |  169 -
 .../src/main/resources/META-INF/faces-config11.vm  |   78 -
 .../src/main/resources/META-INF/faces-config12.vm  |   77 -
 .../src/main/resources/META-INF/faces-config20.vm  |   86 -
 .../src/main/resources/META-INF/myfaces_html.vm    |   52 -
 .../src/main/resources/META-INF/tagClass11.vm      |  170 -
 .../src/main/resources/META-INF/tagClass12.vm      |  179 -
 .../main/resources/META-INF/tagClassMacros11.vm    |    0
 .../resources/META-INF/tld-facelets-tomahawk20.vm  |  377 -
 .../src/main/resources/META-INF/tld-tomahawk20.vm  |  259 -
 .../src/main/resources/META-INF/tomahawk12.vm      |  229 -
 .../resources/META-INF/trinidad-faces-config12.vm  |  176 -
 .../src/main/resources/META-INF/trinidad-tld12.vm  |  249 -
 .../resources/META-INF/trinidadComponentClass12.vm |  210 -
 .../main/resources/META-INF/trinidadTagClass12.vm  |  142 -
 .../main/resources/META-INF/validatorClass11.vm    |  222 -
 .../resources/META-INF/validatorClassMacros11.vm   |    4 -
 .../src/main/resources/META-INF/xdoc-behavior.vm   |  100 -
 .../src/main/resources/META-INF/xdoc-component.vm  |  185 -
 .../src/main/resources/META-INF/xdoc-converter.vm  |  100 -
 .../main/resources/META-INF/xdoc-facelet-tag.vm    |   49 -
 .../src/main/resources/META-INF/xdoc-tag.vm        |   83 -
 .../src/main/resources/META-INF/xdoc-validator.vm  |  100 -
 .../src/main/resources/META-INF/xdoc-web-config.vm |   61 -
 .../src/main/resources/META-INF/xmlMacros.vm       |    0
 .../src/site/apt/attributes.apt                    |  124 -
 .../src/site/apt/components.apt                    |  240 -
 .../src/site/apt/config-files.apt                  |   84 -
 .../src/site/apt/converters.apt                    |   75 -
 .../src/site/apt/doclets-annotations.apt           |   70 -
 .../myfaces-builder-plugin/src/site/apt/howto.apt  |  100 -
 .../myfaces-builder-plugin/src/site/apt/index.apt  |  167 -
 .../src/site/apt/properties.apt                    |  146 -
 .../myfaces-builder-plugin/src/site/apt/setup.apt  |  168 -
 .../myfaces-builder-plugin/src/site/apt/tags.apt   |   82 -
 .../src/site/apt/templates.apt                     |   54 -
 .../src/site/apt/validators.apt                    |   83 -
 .../myfaces-builder-plugin/src/site/site.xml       |   73 -
 .../plugin/builder/BuildMetaDataMojoTest.java      |   55 -
 .../maven2/plugin/builder/FlattenerTest.java       |  160 -
 .../maven2/plugin/builder/IOUtilsTest.java         |  124 -
 .../plugin/builder/MakeComponentsMojoTest.java     |   42 -
 .../plugin/builder/qdox/QdoxModelBuilderTest.java  |  267 -
 .../resources/builder/complex/ComponentBase.java   |   24 -
 .../resources/builder/complex/ComponentChild.java  |   61 -
 .../builder/complex/ComponentInterface.java        |   24 -
 .../test/resources/builder/complex/Converter1.java |   11 -
 .../test/resources/builder/complex/Validator1.java |   11 -
 .../resources/builder/complex/goodfile-flat.xml    |  154 -
 .../test/resources/builder/complex/goodfile.xml    |  127 -
 .../resources/builder/generation/goodfile-flat.xml |  224 -
 .../test/resources/builder/generation/goodfile.xml |  143 -
 .../builder/generation/testpkg/ComponentBase.java  |   26 -
 .../generation/testpkg/ComponentGenSubclass.java   |   15 -
 .../generation/testpkg/ComponentGenTemplate.java   |   63 -
 .../generation/testpkg/ComponentInterface.java     |   26 -
 .../generation/testpkg/ComponentManual.java        |   61 -
 .../src/test/resources/builder/simple/Foo.java     |   30 -
 .../src/test/resources/builder/simple/goodfile.xml |   34 -
 .../src/test/resources/builder/simple15/Foo.java   |   26 -
 .../test/resources/builder/simple15/goodfile.xml   |   34 -
 maven2-plugins/myfaces-faces-plugin/LICENSE.txt    |  202 -
 maven2-plugins/myfaces-faces-plugin/pom.xml        |  125 -
 .../maven2/plugin/faces/AbstractFacesMojo.java     |  679 --
 .../plugin/faces/GenerateComponentsMojo.java       |  343 -
 .../plugin/faces/GenerateFaceletsTaglibsMojo.java  |  433 -
 .../plugin/faces/GenerateFacesConfigMojo.java      |  306 -
 .../plugin/faces/GenerateJspTaglibsMojo.java       | 1147 ---
 .../faces/GenerateMasterFacesConfigMojo.java       |  214 -
 .../plugin/faces/GenerateRendererMapMojo.java      |  136 -
 .../plugin/faces/generator/ClassGenerator.java     |   67 -
 .../plugin/faces/generator/GeneratorHelper.java    |  168 -
 .../component/AbstractComponentGenerator.java      | 1058 ---
 .../generator/component/ComponentGenerator.java    |   81 -
 .../component/MyFacesComponentGenerator.java       |  562 --
 .../component/TrinidadComponentGenerator.java      |  399 -
 .../taglib/AbstractComponentTagGenerator.java      |  297 -
 .../taglib/AbstractConverterTagGenerator.java      |  191 -
 .../generator/taglib/AbstractTagGenerator.java     |  266 -
 .../taglib/AbstractValidatorTagGenerator.java      |  195 -
 .../generator/taglib/ComponentTagGenerator.java    |   62 -
 .../taglib/MyFacesComponentTagGenerator.java       |  636 --
 .../taglib/MyFacesConverterTagGenerator.java       |  167 -
 .../taglib/MyFacesValidatorTagGenerator.java       |  161 -
 .../faces/generator/taglib/TagAttributeFilter.java |   37 -
 .../taglib/TrinidadComponentTagGenerator.java      |  899 --
 .../taglib/TrinidadConverterTagGenerator.java      |  167 -
 .../taglib/TrinidadValidatorTagGenerator.java      |  177 -
 .../maven2/plugin/faces/io/PrettyWriter.java       |  201 -
 .../maven2/plugin/faces/parse/AbstractTagBean.java |  229 -
 .../maven2/plugin/faces/parse/AttributeBean.java   |  225 -
 .../maven2/plugin/faces/parse/ComponentBean.java   | 1128 ---
 .../maven2/plugin/faces/parse/ConverterBean.java   |  160 -
 .../maven2/plugin/faces/parse/EventBean.java       |  143 -
 .../maven2/plugin/faces/parse/EventRefBean.java    |  127 -
 .../maven2/plugin/faces/parse/FacesConfigBean.java |  315 -
 .../plugin/faces/parse/FacesConfigParser.java      |  425 -
 .../maven2/plugin/faces/parse/FacetBean.java       |   93 -
 .../plugin/faces/parse/MethodSignatureBean.java    |   82 -
 .../maven2/plugin/faces/parse/ObjectBean.java      |   80 -
 .../maven2/plugin/faces/parse/PropertyBean.java    |  504 --
 .../maven2/plugin/faces/parse/RenderKitBean.java   |  144 -
 .../maven2/plugin/faces/parse/RendererBean.java    |  443 -
 .../maven2/plugin/faces/parse/ValidatorBean.java   |  159 -
 .../faces/parse/converters/QNameConverter.java     |   53 -
 .../faces/parse/rules/BeanPropertySetterRule.java  |   87 -
 .../maven2/plugin/faces/util/AttributeFilter.java  |   33 -
 .../maven2/plugin/faces/util/ComponentFilter.java  |   33 -
 .../maven2/plugin/faces/util/CompoundIterator.java |   80 -
 .../maven2/plugin/faces/util/ConverterFilter.java  |   33 -
 .../maven2/plugin/faces/util/FacetFilter.java      |   33 -
 .../maven2/plugin/faces/util/Filter.java           |   25 -
 .../maven2/plugin/faces/util/FilteredIterator.java |   73 -
 .../maven2/plugin/faces/util/PropertyFilter.java   |   33 -
 .../maven2/plugin/faces/util/RendererFilter.java   |   33 -
 .../maven2/plugin/faces/util/SortedIterator.java   |   61 -
 .../maven2/plugin/faces/util/SourceTemplate.java   |  164 -
 .../buildtools/maven2/plugin/faces/util/Util.java  |  489 -
 .../maven2/plugin/faces/util/ValidatorFilter.java  |   33 -
 .../maven2/plugin/faces/util/XIncludeFilter.java   |  186 -
 .../maven2/plugin/faces/util/XPointerFilter.java   |  111 -
 .../src/main/resources/META-INF/NOTICE             |   16 -
 .../META-INF/schemas/maven-faces-plugin.xsd        |  132 -
 .../maven2/plugin/faces/resources/faces-config.xml |   23 -
 .../maven2/plugin/faces/resources/transform.xsl    |  940 --
 .../maven2/plugin/faces/resources/transform12.xsl  |  905 --
 .../src/test/conf/META-INF/faces-config.xml        |  181 -
 .../trinidad/component/UIXCommandTemplate.java     |  154 -
 .../maven2/plugin/faces/AbstractMojoTestCase.java  |  134 -
 .../plugin/faces/GenerateComponentsMojoTest.java   |  115 -
 .../plugin/faces/GenerateFacesConfigMojoTest.java  |   75 -
 .../components/javax/faces/Component.xml           |   67 -
 .../components/javax/faces/ComponentBase.xml       |   37 -
 .../components/javax/faces/NamingContainer.xml     |   41 -
 .../components/trinidad/faces/Command.xml          |  143 -
 .../components/trinidad/faces/ComponentBase.xml    |   59 -
 .../components/trinidad/faces/TestInclude.xml      |   41 -
 .../events/javax/faces/Action.xml                  |   38 -
 .../events/trinidad/faces/Launch.xml               |   36 -
 .../events/trinidad/faces/Return.xml               |   36 -
 .../META-INF/maven-faces-plugin/faces-config.xml   |   26 -
 .../META-INF/maven-faces-plugin/testGenerate.lst   |   26 -
 .../META-INF/maven-faces-plugin/testSkipAPI.lst    |    1 -
 maven2-plugins/myfaces-i18n-plugin/LICENSE.txt     |  202 -
 maven2-plugins/myfaces-i18n-plugin/pom.xml         |   84 -
 .../plugin/i18n/GenerateJavascriptLocalesMojo.java |  156 -
 .../plugin/i18n/GenerateLocaleElementsMojo.java    |  139 -
 .../i18n/uixtools/JSLocaleElementsGenerator.java   |  906 --
 .../maven2/plugin/i18n/uixtools/VersionUtils.java  |   35 -
 .../src/main/resources/META-INF/NOTICE             |   16 -
 maven2-plugins/myfaces-javacc-plugin/LICENSE.txt   |  242 -
 maven2-plugins/myfaces-javacc-plugin/NOTICE.txt    |   20 -
 maven2-plugins/myfaces-javacc-plugin/pom.xml       |   79 -
 .../maven2/plugin/javacc/JavaCCMojo.java           |  348 -
 .../src/main/resources/META-INF/NOTICE             |   16 -
 .../myfaces-javacc-plugin/src/site/apt/index.apt   |  115 -
 .../maven2/plugin/javacc/JavaCCMojoTest.java       |   41 -
 .../src/test/resources/SelectorParser.jj           |  578 --
 .../test/resources/validator/ParseException.java   |  210 -
 .../test/resources/validator/SelectorParser.java   | 1181 ---
 .../validator/SelectorParserConstants.java         |   95 -
 .../validator/SelectorParserTokenManager.java      | 1061 ---
 .../test/resources/validator/SimpleCharStream.java |  419 -
 .../src/test/resources/validator/Token.java        |   99 -
 .../test/resources/validator/TokenMgrError.java    |  151 -
 .../myfaces-javascript-plugin/LICENSE.txt          |  202 -
 maven2-plugins/myfaces-javascript-plugin/pom.xml   |  210 -
 .../plugin/javascript/ObfuscateJavascriptMojo.java |  144 -
 .../plugin/javascript/ReduceJavascriptMojo.java    |  165 -
 .../javascript/javascript20parser/ASTAddOp.java    |   41 -
 .../javascript20parser/ASTAdditiveExpression.java  |   41 -
 .../ASTAnnotatableDirective.java                   |   41 -
 .../javascript20parser/ASTArguments.java           |   41 -
 .../javascript20parser/ASTArrayLiteral.java        |   41 -
 .../javascript20parser/ASTAssignementOperator.java |   41 -
 .../ASTAssignmentExpression.java                   |   41 -
 .../ASTAssignmentExpressionNoIN.java               |   41 -
 .../javascript20parser/ASTAttribute.java           |   41 -
 .../javascript20parser/ASTAttributeExpression.java |   41 -
 .../javascript20parser/ASTAttributes.java          |   41 -
 .../ASTBitwiseANDExpression.java                   |   41 -
 .../ASTBitwiseANDExpressionNoIN.java               |   41 -
 .../javascript20parser/ASTBitwiseANDOp.java        |   41 -
 .../javascript20parser/ASTBitwiseORExpression.java |   41 -
 .../ASTBitwiseORExpressionNoIN.java                |   41 -
 .../javascript20parser/ASTBitwiseOROp.java         |   41 -
 .../ASTBitwiseXORExpression.java                   |   41 -
 .../ASTBitwiseXORExpressionNoIN.java               |   41 -
 .../javascript20parser/ASTBitwiseXOROp.java        |   41 -
 .../javascript/javascript20parser/ASTBlock.java    |   41 -
 .../javascript20parser/ASTBreakStatement.java      |   41 -
 .../javascript20parser/ASTCaseElement.java         |   41 -
 .../javascript20parser/ASTCaseElements.java        |   41 -
 .../javascript20parser/ASTCaseLabel.java           |   41 -
 .../javascript20parser/ASTClassDefinition.java     |   41 -
 .../ASTConditionalExpression.java                  |   41 -
 .../ASTConditionalExpressionNoIN.java              |   41 -
 .../javascript20parser/ASTContinueStatement.java   |   41 -
 .../javascript20parser/ASTDirective.java           |   41 -
 .../javascript20parser/ASTDirectives.java          |   41 -
 .../javascript20parser/ASTDoStatement.java         |   41 -
 .../javascript20parser/ASTElementList.java         |   41 -
 .../javascript20parser/ASTEmptyStatement.java      |   41 -
 .../javascript20parser/ASTEolCommentSkipWs.java    |   41 -
 .../javascript/javascript20parser/ASTEqualOp.java  |   41 -
 .../javascript20parser/ASTEqualityExpression.java  |   41 -
 .../ASTEqualityExpressionNoIN.java                 |   41 -
 .../javascript20parser/ASTExportBinding.java       |   41 -
 .../javascript20parser/ASTExportBindingList.java   |   41 -
 .../javascript20parser/ASTExportDefinition.java    |   41 -
 .../ASTExpressionQualifiedIdentifier.java          |   41 -
 .../javascript20parser/ASTExpressionStatement.java |   41 -
 .../javascript20parser/ASTFieldList.java           |   41 -
 .../javascript20parser/ASTFieldName.java           |   41 -
 .../javascript20parser/ASTForInBinding.java        |   41 -
 .../javascript20parser/ASTForInitializer.java      |   41 -
 .../javascript20parser/ASTForStatement.java        |   41 -
 .../javascript20parser/ASTFullNewExpression.java   |   41 -
 .../ASTFullNewSubexpression.java                   |   41 -
 .../ASTFullPostfixExpression.java                  |   41 -
 .../javascript20parser/ASTFunctionCommon.java      |   41 -
 .../javascript20parser/ASTFunctionConstructor.java |   41 -
 .../javascript20parser/ASTFunctionDefinition.java  |   41 -
 .../javascript20parser/ASTFunctionExpression.java  |   41 -
 .../javascript20parser/ASTFunctionName.java        |   41 -
 .../javascript20parser/ASTIdentifier.java          |   41 -
 .../javascript20parser/ASTIfStatement.java         |   41 -
 .../javascript20parser/ASTImportDirective.java     |   41 -
 .../javascript20parser/ASTIncludeDirective.java    |   41 -
 .../javascript20parser/ASTInheritance.java         |   41 -
 .../javascript20parser/ASTInterfaceDefinition.java |   41 -
 .../javascript20parser/ASTLabeledStatement.java    |   41 -
 .../javascript20parser/ASTListExpression.java      |   41 -
 .../javascript20parser/ASTListExpressionNoIN.java  |   41 -
 .../javascript20parser/ASTLiteralElement.java      |   41 -
 .../javascript20parser/ASTLiteralField.java        |   41 -
 .../ASTLogicalANDExpression.java                   |   41 -
 .../ASTLogicalANDExpressionNoIN.java               |   41 -
 .../javascript20parser/ASTLogicalORExpression.java |   41 -
 .../ASTLogicalORExpressionNoIN.java                |   41 -
 .../javascript/javascript20parser/ASTMulOp.java    |   41 -
 .../ASTMultiplicativeExpression.java               |   41 -
 .../javascript20parser/ASTNamespaceDefinition.java |   41 -
 .../ASTNonAssignmentExpression.java                |   41 -
 .../ASTNonAssignmentExpressionNoIN.java            |   41 -
 .../javascript20parser/ASTObjectLiteral.java       |   41 -
 .../javascript20parser/ASTPackageDefinition.java   |   41 -
 .../javascript20parser/ASTPackageIdentifiers.java  |   41 -
 .../javascript20parser/ASTPackageName.java         |   41 -
 .../javascript20parser/ASTParameter.java           |   41 -
 .../javascript20parser/ASTParameterInit.java       |   41 -
 .../javascript20parser/ASTParameters.java          |   41 -
 .../javascript20parser/ASTPostfixExpression.java   |   41 -
 .../javascript20parser/ASTPostfixOp.java           |   41 -
 .../javascript/javascript20parser/ASTPragma.java   |   41 -
 .../javascript20parser/ASTPragmaArgument.java      |   41 -
 .../javascript20parser/ASTPragmaExpr.java          |   41 -
 .../javascript20parser/ASTPragmaItem.java          |   41 -
 .../javascript20parser/ASTPragmaItems.java         |   41 -
 .../javascript20parser/ASTPrimaryExpression.java   |   41 -
 .../javascript/javascript20parser/ASTProgram.java  |   41 -
 .../javascript20parser/ASTPropertyOperator.java    |   41 -
 .../javascript20parser/ASTPropertyOrArguments.java |   41 -
 .../javascript20parser/ASTQualifiedIdentifier.java |   41 -
 .../javascript/javascript20parser/ASTRelOp.java    |   41 -
 .../ASTRelationalExpression.java                   |   41 -
 .../ASTRelationalExpressionNoIN.java               |   41 -
 .../javascript20parser/ASTReservedNamespace.java   |   41 -
 .../javascript20parser/ASTRestParameters.java      |   41 -
 .../javascript/javascript20parser/ASTResult.java   |   41 -
 .../javascript20parser/ASTReturnStatement.java     |   41 -
 .../javascript/javascript20parser/ASTSc.java       |   44 -
 .../javascript20parser/ASTShiftExpression.java     |   41 -
 .../javascript/javascript20parser/ASTShiftOp.java  |   41 -
 .../ASTSimpleQualifiedIdentifier.java              |   41 -
 .../ASTSimpleVariableDefinition.java               |   41 -
 .../javascript20parser/ASTStatement.java           |   41 -
 .../javascript20parser/ASTSubstatement.java        |   41 -
 .../javascript20parser/ASTSubstatements.java       |   41 -
 .../javascript20parser/ASTSuperExpression.java     |   41 -
 .../javascript20parser/ASTSuperStatement.java      |   41 -
 .../javascript20parser/ASTSwitchStatement.java     |   41 -
 .../javascript20parser/ASTThrowStatement.java      |   41 -
 .../javascript20parser/ASTTryStatement.java        |   41 -
 .../javascript20parser/ASTTypeExpression.java      |   41 -
 .../javascript20parser/ASTTypeExpressionList.java  |   41 -
 .../javascript20parser/ASTTypeExpressionNoIN.java  |   41 -
 .../javascript20parser/ASTTypedIdentifier.java     |   41 -
 .../javascript20parser/ASTTypedIdentifierNoIN.java |   41 -
 .../javascript20parser/ASTUnaryExpression.java     |   41 -
 .../ASTUntypedVariableBinding.java                 |   41 -
 .../ASTUntypedVariableBindingList.java             |   41 -
 .../javascript20parser/ASTUseDirective.java        |   41 -
 .../javascript20parser/ASTVariableBinding.java     |   41 -
 .../javascript20parser/ASTVariableBindingList.java |   41 -
 .../ASTVariableBindingListNoIN.java                |   41 -
 .../javascript20parser/ASTVariableBindingNoIN.java |   41 -
 .../javascript20parser/ASTVariableDefinition.java  |   41 -
 .../ASTVariableDefinitionKind.java                 |   41 -
 .../ASTVariableDefinitionNoIN.java                 |   41 -
 .../ASTVariableInitialisation.java                 |   41 -
 .../ASTVariableInitialisationNoIN.java             |   41 -
 .../javascript20parser/ASTVariableInitializer.java |   41 -
 .../ASTVariableInitializerNoIN.java                |   41 -
 .../javascript20parser/ASTWhileStatement.java      |   41 -
 .../javascript20parser/ASTWithStatement.java       |   41 -
 .../javascript20parser/JJTJSParser20State.java     |  170 -
 .../javascript/javascript20parser/JSParser20.java  | 9410 --------------------
 .../javascript20parser/JSParser20Constants.java    |  299 -
 .../javascript20parser/JSParser20TokenManager.java | 2246 -----
 .../JSParser20TreeConstants.java                   |  303 -
 .../javascript20parser/JSParser20Visitor.java      |  163 -
 .../plugin/javascript/javascript20parser/Node.java |   57 -
 .../javascript20parser/ParseException.java         |  292 -
 .../javascript20parser/SimpleCharStream.java       |  559 --
 .../javascript/javascript20parser/SimpleNode.java  |  153 -
 .../javascript/javascript20parser/Token.java       |  105 -
 .../javascript20parser/TokenMgrError.java          |  211 -
 .../plugin/javascript/javascript20parser/js2.0.jj  | 4839 ----------
 .../plugin/javascript/javascript20parser/js2.0.jjt | 1501 ----
 .../javascriptcompiler/DepthFirstTraversal.java    | 1214 ---
 .../javascriptcompiler/JavascriptCompiler.java     |  111 -
 .../javascriptcompiler/JavascriptCompilerMain.java |  123 -
 .../javascript/jmt/AbstractCompressMojo.java       |  436 -
 .../javascript/jmt/AbstractJavascriptMojo.java     |   75 -
 .../javascript/jmt/AttachCompressedMojo.java       |  171 -
 .../maven2/plugin/javascript/jmt/CompileMojo.java  |  264 -
 .../javascript/jmt/DirectoryCompressMojo.java      |   90 -
 .../maven2/plugin/javascript/jmt/InPlaceMojo.java  |  107 -
 .../maven2/plugin/javascript/jmt/PackageMojo.java  |  132 -
 .../plugin/javascript/jmt/WarPackageMojo.java      |   97 -
 .../plugin/javascript/jmt/WebappCompressMojo.java  |   91 -
 .../javascript/jmt/archive/JavascriptArchiver.java |   80 -
 .../jmt/archive/JavascriptArtifactManager.java     |  101 -
 .../jmt/archive/JavascriptUnArchiver.java          |   64 -
 .../plugin/javascript/jmt/archive/Types.java       |   37 -
 .../javascript/jmt/assembler/AssemblerReader.java  |   32 -
 .../jmt/assembler/AssemblerReaderManager.java      |   30 -
 .../jmt/assembler/DefaultAssemblerReader.java      |   66 -
 .../assembler/DefaultAssemblerReaderManager.java   |   78 -
 .../jmt/assembler/JsBuilderAssemblerReader.java    |   97 -
 .../assembler/NoSuchAssemblerReaderException.java  |   43 -
 .../jmt/compress/CompressionException.java         |   62 -
 .../jmt/compress/IsolatedClassLoader.java          |   98 -
 .../javascript/jmt/compress/JSCompressor.java      |   59 -
 .../javascript/jmt/compress/JSCompressorProxy.java |   78 -
 .../javascript/jmt/compress/JSMinCompressor.java   |  317 -
 .../jmt/compress/ShrinksafeCompressor.java         |   98 -
 .../javascript/jmt/compress/YahooUICompressor.java |  110 -
 .../plugin/javascript/obfuscator/InputSource.java  |   74 -
 .../plugin/javascript/obfuscator/Obfuscator.java   |  197 -
 .../obfuscator/configuration/ConfigException.java  |   36 -
 .../obfuscator/configuration/ObfuscatorConfig.java |   63 -
 .../javascript/obfuscator/configuration/config.xml |   38 -
 .../obfuscator/filters/ObfuscatorFilter.java       |   27 -
 .../filters/compression/CommentsHandler.java       |   50 -
 .../filters/compression/CompressionFilter.java     |   85 -
 .../filters/compression/CompressionHandler.java    |   27 -
 .../filters/compression/NewlineHandler.java        |   60 -
 .../filters/compression/WhitespaceHandler.java     |   63 -
 .../filters/keywords/SpecialKeywordsFilter.java    |  100 -
 .../filters/obfuscation/ObfuscationFilter.java     |   44 -
 .../filters/obfuscation/state/FunctionContext.java |   45 -
 .../filters/obfuscation/state/FunctionState.java   |  123 -
 .../obfuscation/state/ObfuscationState.java        |  127 -
 .../filters/obfuscation/state/RootState.java       |   64 -
 .../obfuscation/state/StatementBlockState.java     |   79 -
 .../obfuscator/filters/output/OutputGenerator.java |   78 -
 .../javascript15parser/AnnotatedToken.java         |  181 -
 .../javascript15parser/AnnotationConstants.java    |   32 -
 .../javascript15parser/JSParserTest15.java         |  104 -
 .../javascript15parser/JSParserUtils.java          |  381 -
 .../obfuscator/javascript15parser/NameGen.java     |   33 -
 .../javascript15parser/ProgramContext.java         |   92 -
 .../javascript15parser/ProgramContextStack.java    |   84 -
 .../obfuscator/javascript15parser/Token.java       |   99 -
 .../obfuscator/javascript15parser/js1.5.jj         | 1183 ---
 .../plugin/javascript/uixtools/Detokenizer.java    |  102 -
 .../plugin/javascript/uixtools/FileProcessor.java  |  153 -
 .../maven2/plugin/javascript/uixtools/Filter1.java |   93 -
 .../maven2/plugin/javascript/uixtools/Filter2.java |  322 -
 .../maven2/plugin/javascript/uixtools/Queue.java   |  210 -
 .../maven2/plugin/javascript/uixtools/Reducer.java |  136 -
 .../maven2/plugin/javascript/uixtools/Token.java   |   77 -
 .../plugin/javascript/uixtools/TokenBuffer.java    |   98 -
 .../plugin/javascript/uixtools/TokenException.java |   38 -
 .../plugin/javascript/uixtools/TokenReader.java    |   35 -
 .../plugin/javascript/uixtools/Tokenizer.java      |  423 -
 .../src/main/mdo/assembler.mdo                     |  104 -
 .../src/main/resources/META-INF/NOTICE             |   16 -
 .../main/resources/META-INF/plexus/components.xml  |  113 -
 .../plugin/javascript/jmt/CompileMojoTest.java     |   58 -
 .../plugin/javascript/jmt/CompressMojoTest.java    |  110 -
 .../plugin/javascript/jmt/StripDebugsMojoTest.java |   52 -
 .../plugin/javascript/jmt/WarPackageMojoTest.java  |   42 -
 .../assembler/JsBuilderAssemblerReaderTest.java    |   42 -
 .../jmt/compress/IsolatedClassLoaderTest.java      |   72 -
 .../jmt/compress/YahooUICompressorTest.java        |   49 -
 .../plugin/javascript/jmt/stub/ArtifactStub.java   |   39 -
 .../javascript/jmt/stub/MavenProjectStub.java      |   57 -
 .../src/test/resources/assembler.jsb               |   22 -
 .../src/test/resources/assembler.xml               |   16 -
 .../src/test/resources/attach-compressed.pom       |   30 -
 .../src/test/resources/compile.pom                 |   16 -
 .../src/test/resources/compress-zero-length.pom    |   16 -
 .../src/test/resources/compress.pom                |   17 -
 .../src/test/resources/jsunit/assertionTests.js    |    6 -
 .../resources/jsunit/jsUnitAssertionTests.html     |   67 -
 .../resources/jsunit/jsunit-testRunner-2.1.jsar    |  Bin 29190 -> 0 bytes
 .../src/test/resources/prototype-1.5.1.1.jar       |  Bin 21370 -> 0 bytes
 .../src/test/resources/scripts/builder.js          |  119 -
 .../src/test/resources/scripts/controls.js         |  833 --
 .../src/test/resources/scripts/dragdrop.js         |  970 --
 .../src/test/resources/scripts/effects.js          |  977 --
 .../src/test/resources/scripts/global.js           |  342 -
 .../src/test/resources/scripts/scriptaculous.js    |   51 -
 .../src/test/resources/scripts/slider.js           |  294 -
 .../src/test/resources/scripts/unittest.js         |  564 --
 .../src/test/resources/strip-debugs.pom            |   17 -
 .../src/test/resources/test.js                     |    1 -
 .../src/test/resources/test1.js                    |    1 -
 .../src/test/resources/test2.js                    |    1 -
 .../src/test/resources/test3.js                    |    1 -
 .../src/test/resources/war-package.pom             |   20 -
 .../src/test/resources/with-debug/debugs.js        |   22 -
 .../src/test/resources/zero-length/zero-length.js  |    0
 maven2-plugins/myfaces-jdev-plugin/pom.xml         |   75 -
 .../maven2/plugin/jdeveloper/JDeveloperMojo.java   | 1827 ----
 .../plugin/jdeveloper/TldContentHandler.java       |  187 -
 .../src/main/resources/META-INF/NOTICE             |   16 -
 .../plugin/jdeveloper/10.1.3.0.2/project.xml       |   80 -
 .../plugin/jdeveloper/10.1.3.0.2/workspace.xml     |   22 -
 .../plugin/jdeveloper/10.1.3.0.3/project.xml       |   91 -
 .../plugin/jdeveloper/10.1.3.0.3/workspace.xml     |   22 -
 .../plugin/jdeveloper/10.1.3.0.4/project.xml       |  127 -
 .../plugin/jdeveloper/10.1.3.0.4/workspace.xml     |   23 -
 .../plugin/jdeveloper/11.1.1.0.0/project.xml       |  203 -
 .../plugin/jdeveloper/11.1.1.0.0/workspace.xml     |   30 -
 maven2-plugins/myfaces-plugin-parent/pom.xml       |  162 -
 .../myfaces-plugin-parent/src/site/apt/index.apt   |   77 -
 .../myfaces-plugin-parent/src/site/site.xml        |   76 -
 maven2-plugins/myfaces-tagdoc-plugin/pom.xml       |  152 -
 .../maven2/plugin/tagdoc/TagdocReport.java         | 1441 ---
 .../src/main/resources/META-INF/NOTICE             |   16 -
 maven2-plugins/myfaces-wagon-plugin/NOTICE.txt     |   10 -
 maven2-plugins/myfaces-wagon-plugin/pom.xml        |  152 -
 .../buildtools/maven2/plugin/wagon/WagonMojo.java  |  158 -
 .../src/main/resources/META-INF/LICENSE.txt        |  174 -
 .../src/main/resources/META-INF/NOTICE.txt         |    9 -
 .../myfaces-wagon-plugin/src/site/apt/usage.apt    |   41 -
 maven2-plugins/myfaces-xrts-plugin/pom.xml         |   89 -
 .../plugin/xrts/AbstractGenerateSourcesMojo.java   |  220 -
 .../maven2/plugin/xrts/GenerateSourcesMojo.java    |   98 -
 .../plugin/xrts/GenerateTestSourcesMojo.java       |   98 -
 .../maven2/plugin/xrts/ListRTSWriter.java          |  186 -
 .../buildtools/maven2/plugin/xrts/RTSWriter.java   |   82 -
 .../maven2/plugin/xrts/UnicodeEscapes.java         |  106 -
 .../maven2/plugin/xrts/XRTSGenerator.java          |   61 -
 .../buildtools/maven2/plugin/xrts/XRTSParser.java  |  208 -
 .../src/main/resources/META-INF/NOTICE             |   16 -
 maven2-plugins/pom.xml                             |   70 -
 maven2-plugins/tobago-theme-plugin/pom.xml         |   73 -
 .../tobago/maven/plugin/AbstractThemeMojo.java     |   53 -
 .../myfaces/tobago/maven/plugin/PackThemeMojo.java |  197 -
 .../tobago/maven/plugin/UnPackThemeMojo.java       |  165 -
 .../src/main/resources/META-INF/NOTICE.txt         |    9 -
 .../pom.xml                                        |    0
 .../src/main/resources/META-INF/LICENSE.txt        |    0
 .../src/main/resources/META-INF}/NOTICE.txt        |    0
 .../META-INF/maven/archetype-metadata.xml          |    0
 .../src/main/resources/archetype-resources/pom.xml |    0
 .../src/main/java/HelloWorldBacking.java           |    0
 .../src/main/log4j/log4j.properties                |    0
 .../src/main/webapp/WEB-INF/examples-config.xml    |    0
 .../src/main/webapp/WEB-INF/web.xml                |    0
 .../src/main/webapp/helloWorld.xhtml               |    0
 .../archetype-resources/src/main/webapp/index.jsp  |    0
 .../src/main/webapp/page2.xhtml                    |    0
 .../src/main/webapp/template.xhtml                 |    0
 .../src/site/apt/index.apt                         |    0
 .../pom.xml                                        |    0
 .../src/main/resources/META-INF}/LICENSE.txt       |    0
 .../src/main/resources/META-INF}/NOTICE.txt        |    0
 .../META-INF/maven/archetype-metadata.xml          |    0
 .../src/main/resources/archetype-resources/pom.xml |    0
 .../src/main/java/NameBean.java                    |    0
 .../src/main/log4j/log4j.properties                |    0
 .../src/main/webapp/WEB-INF/faces-config.xml       |    0
 .../webapp/WEB-INF/jetty-pluto-web-default.xml     |    0
 .../src/main/webapp/WEB-INF/portlet.xml            |    0
 .../src/main/webapp/WEB-INF/web.xml                |    0
 .../archetype-resources/src/main/webapp/edit.jsp   |    0
 .../src/main/webapp/helloworld/hello.jsp           |    0
 .../src/main/webapp/helloworld/index.jsp           |    0
 .../archetype-resources/src/main/webapp/help.jsp   |    0
 .../archetype-resources/src/main/webapp/index.jsp  |    0
 .../src/site/apt/index.apt                         |    0
 .../pom.xml                                        |    0
 .../src/main/resources/META-INF}/LICENSE.txt       |    0
 .../src/main/resources/META-INF}/NOTICE.txt        |    0
 .../META-INF/maven/archetype-metadata.xml          |    0
 .../src/main/resources/archetype-resources/pom.xml |    0
 .../src/main/java/HelloWorldController.java        |    0
 .../src/main/log4j/log4j.properties                |    0
 .../src/main/webapp/WEB-INF/faces-config.xml       |    0
 .../src/main/webapp/WEB-INF/web.xml                |    0
 .../src/main/webapp/helloWorld.jsp                 |    0
 .../archetype-resources/src/main/webapp/index.jsp  |    0
 .../archetype-resources/src/main/webapp/page2.jsp  |    0
 .../src/site/apt/index.apt                         |    0
 .../pom.xml                                        |    0
 .../src/main/resources/META-INF}/LICENSE.txt       |    0
 .../src/main/resources/META-INF}/NOTICE.txt        |    0
 .../META-INF/maven/archetype-metadata.xml          |    0
 .../src/main/resources/archetype-resources/pom.xml |    0
 .../src/main/java/GreetingService.java             |    0
 .../src/main/java/HelloWorldController.java        |    0
 .../src/main/resources/META-INF/beans.xml          |    0
 .../src/main/webapp/WEB-INF/faces-config.xml       |    0
 .../src/main/webapp/WEB-INF/web.xml                |    0
 .../src/main/webapp/helloWorld.xhtml               |    0
 .../archetype-resources/src/main/webapp/index.html |    0
 .../src/main/webapp/page2.xhtml                    |    0
 .../src/main/webapp/resources/css/style.css        |    0
 .../src/site/apt/index.apt                         |    0
 .../pom.xml                                        |    0
 .../src/main/resources/META-INF}/LICENSE.txt       |    0
 .../src/main/resources/META-INF}/NOTICE.txt        |    0
 .../META-INF/maven/archetype-metadata.xml          |    0
 .../src/main/resources/archetype-resources/pom.xml |    0
 .../src/main/java/HelloWorldController.java        |    0
 .../src/main/webapp/WEB-INF/faces-config.xml       |    0
 .../src/main/webapp/WEB-INF/web.xml                |    0
 .../src/main/webapp/helloWorld.xhtml               |    0
 .../archetype-resources/src/main/webapp/index.html |    0
 .../src/main/webapp/page2.xhtml                    |    0
 .../src/main/webapp/resources/css/style.css        |    0
 .../src/site/apt/index.apt                         |    0
 .../pom.xml                                        |    0
 .../src/main/resources/META-INF}/LICENSE.txt       |    0
 .../src/main/resources/META-INF}/NOTICE.txt        |    0
 .../META-INF/maven/archetype-metadata.xml          |    0
 .../resources/archetype-resources/core/pom.xml     |    0
 .../component/sayhello/AbstractSayHello.java       |    0
 .../component/sayhello/SayHelloRenderer.java       |    0
 .../org/myorganization/converter/PhoneNumber.java  |    0
 .../converter/PhoneNumberConverter.java            |    0
 .../validator/AbstractOddNumberValidator.java      |    0
 .../main/resources/META-INF/componentClass12.vm    |    0
 .../resources/META-INF/mycomponents.taglib.xml     |    0
 .../main/resources/META-INF/mycomponents.tld.vm    |    0
 .../core/src/main/resources/META-INF/tagClass12.vm |    0
 .../main/resources/META-INF/tagConverterClass12.vm |    0
 .../main/resources/META-INF/tagValidatorClass12.vm |    0
 .../main/resources/META-INF/validatorClass12.vm    |    0
 .../component/sayhello/SayHelloRendererTest.java   |    0
 .../converter/PhoneNumberConverterTest.java        |    0
 .../validator/OddNumberValidatorTest.java          |    0
 .../resources/archetype-resources/examples/pom.xml |    0
 .../component/example/SayHelloBean.java            |    0
 .../examples}/src/main/log4j/log4j.properties      |    0
 .../component/example/build.properties             |    0
 .../src/main/webapp/WEB-INF/examples-config.xml    |    0
 .../examples/src/main/webapp/WEB-INF/web.xml       |    0
 .../examples/src/main/webapp/converterDemo.jsp     |    0
 .../src/main/webapp/converterDemoResult.jsp        |    0
 .../examples/src/main/webapp/home.jsp              |    0
 .../examples/src/main/webapp/index.jsp             |    0
 .../examples/src/main/webapp/sayhello.jsp          |    0
 .../examples/src/main/webapp/validatorDemo.jsp     |    0
 .../src/main/webapp/validatorDemoResult.jsp        |    0
 .../src/main/resources/archetype-resources/pom.xml |    0
 .../src/site/apt/index.apt                         |    0
 .../pom.xml                                        |    0
 .../src/main/resources/META-INF/LICENSE            |    0
 .../src/main/resources/META-INF/NOTICE             |    0
 .../META-INF/maven/archetype-metadata.xml          |    0
 .../src/main/resources/archetype-resources/pom.xml |    0
 .../src/main/java/HelloWorldBacking.java           |    0
 .../src/main/log4j/log4j.properties                |    0
 .../src/main/webapp/WEB-INF/faces-config.xml       |    0
 .../src/main/webapp/WEB-INF/web.xml                |    0
 .../archetype-resources/src/main/webapp/index.jsp  |    0
 .../archetype-resources/src/main/webapp/index.jspx |    0
 .../archetype-resources/src/main/webapp/page2.jspx |    0
 .../src/site/apt/index.apt                         |    0
 .../pom.xml                                        |    0
 .../src/main/resources/META-INF/LICENSE            |    0
 .../src/main/resources/META-INF/NOTICE             |    0
 .../META-INF/maven/archetype-metadata.xml          |    0
 .../src/main/resources/archetype-resources/pom.xml |    0
 .../src/main/java/HelloWorldBacking.java           |    0
 .../src/main/webapp/WEB-INF/faces-config.xml       |    0
 .../src/main/webapp/WEB-INF/web.xml                |    0
 .../archetype-resources/src/main/webapp/index.jsp  |    0
 .../archetype-resources/src/main/webapp/index.jspx |    0
 .../archetype-resources/src/main/webapp/page2.jspx |    0
 .../src/site/apt/index.apt                         |    0
 other/checkstyle-rules/NOTICE.txt                  |    7 -
 other/checkstyle-rules/pom.xml                     |   59 -
 .../resources/default/myfaces-checks-minimal.xml   |   53 -
 .../resources/default/myfaces-checks-standard.xml  |  174 -
 .../resources/default/myfaces-checks-strict.xml    |  174 -
 .../default/myfaces-codestyle-eclipse.txt          |  264 -
 .../resources/default/myfaces-codestyle-idea.xml   |   28 -
 .../resources/default/myfaces-header-regexp.txt    |   18 -
 .../resources/default/myfaces-header-spaces.txt    |   18 -
 .../src/main/resources/default/myfaces-header.txt  |   18 -
 .../main/resources/tobago/checkstyle-header.txt    |   19 -
 .../main/resources/tobago/checkstyle-strict.xml    |  245 -
 .../src/main/resources/tobago/checkstyle.xml       |  252 -
 other/normalizer/README.txt                        |   18 -
 other/normalizer/norm                              |    1 -
 other/normalizer/pom.xml                           |   36 -
 .../myfaces/buildtools/normalizer/Attribute.java   |   30 -
 .../myfaces/buildtools/normalizer/Element.java     |  206 -
 .../myfaces/buildtools/normalizer/Normalizer.java  |  118 -
 .../buildtools/normalizer/NullInputSource.java     |   10 -
 .../myfaces/buildtools/normalizer/Utils.java       |   16 -
 .../buildtools/normalizer/NormalizerTest.java      |   18 -
 other/scripts/README.txt                           |    1 -
 other/scripts/detab.sh                             |   10 -
 maven2-archetypes/pom.xml => pom.xml               |    0
 {maven2-archetypes/src => src}/site/apt/index.apt  |    0
 {maven2-archetypes/src => src}/site/site.xml       |    0
 723 files changed, 104190 deletions(-)

diff --git a/other/checkstyle-rules/LICENSE.txt b/LICENSE.txt
similarity index 100%
rename from other/checkstyle-rules/LICENSE.txt
rename to LICENSE.txt
diff --git a/maven2-plugins/myfaces-xrts-plugin/NOTICE.txt b/NOTICE.txt
similarity index 100%
rename from maven2-plugins/myfaces-xrts-plugin/NOTICE.txt
rename to NOTICE.txt
diff --git a/maven2-archetypes/LICENSE.txt b/maven2-archetypes/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
diff --git a/maven2-archetypes/NOTICE.txt b/maven2-archetypes/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces Maven Plugins     ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/LICENSE.txt b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/NOTICE.txt b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces Maven Plugins     ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/LICENSE.txt b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/NOTICE.txt b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces Maven Plugins     ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/LICENSE.txt b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/NOTICE.txt b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces Maven Plugins     ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/LICENSE.txt b/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/NOTICE.txt b/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces Maven Plugins     ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/LICENSE.txt b/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/NOTICE.txt b/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces Maven Plugins     ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/LICENSE.txt b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/NOTICE.txt b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces Maven Plugins     ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
diff --git a/maven2-plugins/myfaces-builder-annotations/LICENSE.txt b/maven2-plugins/myfaces-builder-annotations/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-plugins/myfaces-builder-annotations/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
diff --git a/maven2-plugins/myfaces-builder-annotations/NOTICE.txt b/maven2-plugins/myfaces-builder-annotations/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-plugins/myfaces-builder-annotations/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces Maven Plugins     ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
diff --git a/maven2-plugins/myfaces-builder-annotations/pom.xml b/maven2-plugins/myfaces-builder-annotations/pom.xml
deleted file mode 100644
index b175f3d..0000000
--- a/maven2-plugins/myfaces-builder-annotations/pom.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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.
--->
-<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"> 
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-plugin-parent</artifactId>
-    <version>1.0.4-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.myfaces.buildtools</groupId>
-  <artifactId>myfaces-builder-annotations</artifactId> 
-  <version>1.0.7-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <name>Apache MyFaces Buildtools Maven2 Builder Annotations</name>
-
-  <description>
-    A set of Java 1.5 Annotation classes that can be applied to classes that are
-    intended to be JSF components, validators, etc. The maven-builder-plugin will
-    recognise these annotations and process the class appropriately.
-  </description>
-  
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-annotations</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-annotations</developerConnection>
-    <url>http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-annotations</url>
-  </scm>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <inherited>true</inherited>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.3</version>
-      </plugin>
-    </plugins>
-  </reporting>
-</project>
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFBehavior.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFBehavior.java
deleted file mode 100644
index f5f7c13..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFBehavior.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-public @interface JSFBehavior
-{
-    /**
-     * Indicate the behaviorId which identifies this class. If not defined, it
-     * tries to get the value of the field BEHAVIOR_ID.
-     */
-    String id() default "";
-    
-    /**
-     * The name of the component in a page (ex: x:mycomp).
-     */
-    String name() default "";
-    
-    /**
-     * Indicate if the element accept inner elements or not.
-     */
-    String bodyContent() default "";
-
-    /**
-     * Short description
-     */
-    String desc() default "";
-}
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFComponent.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFComponent.java
deleted file mode 100644
index f6b8a3c..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFComponent.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation identifies a class as being a JSF component, an ancestor of
- * one, or a template for one.
- * <p>
- * A JSF component is a concrete class that is a subclass of UIComponent, and
- * is registered in a faces-config.xml file. It always implements the StateHolder
- * interface, and typically has several properties that can be defined from a
- * view file (jsp, facelets or other similar technology).
- * <p>
- * The myfaces-builder-plugin uses this annotation information to generate the
- * correct faces-config.xml declarations, thus ensuring that the config declarations
- * are consistent with the code. The plugin can also optionally use this information
- * to generate JSP tag classes, and concrete UIComponent implementations.
- * <p>
- * This tag can be used in several ways:
- * <ul>
- * <li>To mark an interface as one that declares component properties.
- * <li>To mark a class that will be used as a base class by other hand-written
- * classes.
- * <li>To mark a class as an actual concrete JSF Component class which should be
- * registered as a component in faces-config etc.
- * <li>To mark a class as a base class for which a concrete component subclass should
- * be created using code generation.
- * <li>To mark a class as a "template" from which a concrete component class should
- * be created using code generation.
- * </ul>
- * Any class or interface marked with this annotation will also have its "metadata"
- * stored in the metadata file that the builder plugin creates and stores in the
- * META-INF directory of the processed project.
- * <p>
- * Note that a JSPProperty annotation (on a method) is not processed unless the class
- * is marked with this JSPComponent annotation. 
- * 
- * <h2>Annotating an Interface</h2>
- * 
- * When an interface is marked with this annotation, then classes which implement that
- * interface and are themselves marked with this annotation inherit the JSFProperty
- * settings declared on the methods in the interface.
- * <p>
- * This allows common groups of JSF properties to be defined as an interface, and each
- * JSF component class that is expected to provide those properties simply declares that
- * it implements that interface. The normal java compilation rules ensure that the concrete
- * JSF component class implements all of the methods on the interface, and the builder
- * plugin ensures that the inherited JSFProperty settings are used.
- * 
- * <h2>Annotating an Abstract Base Class</h2>
- * 
- * When an abstract class is marked with this annotation, and the name attribute is
- * not set, then this is a base class that concrete components can extend. Any
- * JSFProperty settings defined on this class are inherited by subclasses.
- * 
- * <h2>Annotating a Concrete Component Class</h2>
- * 
- * When a non-abstract class is marked with this annotation, and the name attribute
- * is defined then an entry will be created in the generated faces-config.xml file
- * marking this class as a component. 
- * <p>
- * In addition, a JSP TagHandler class will be created using code-generation and an
- * entry will be created in the generated .tld file so that the tag class can be
- * used from JSP applications.
- * 
- * <h2>Annotating a Class for Subclass Generation</h2>
- * 
- * When an abstract class is marked with this annotation, the name attribute is
- * defined, and the "clazz" attribute is defined then code-generation will be
- * used to create a concrete UIComponent class which is a subclass of this class.
- * The subclass will be registered in the generated faces-config.xml file, a
- * JSP TagHandler class will be created and registered in the .tld file, etc.
- * <p>
- * Using code-generation to create a subclass allows automatic generation of
- * the "boilerplate code" that is commonly needed for implementing component
- * property getter/setter methods and the saveState/restoreState methods.
- * <p>
- * Any abstract property getter/setter methods on the annotated class will have
- * the appropriate implementation automatically written for it in the new
- * subclass. However the parent class can override this for any particular
- * method simply by providing a concrete implementation of the method.
- * 
- * <h2>Annotating a Class as a Component Template</h2>
- * 
- * When an abstract class is marked with this annotation, the name attribute
- * is set, the clazz attribute is set, and attribute template is set to "true"
- * then code-generation will be used to create a new class that is a "copy" of
- * the source code here. As for "subclass generation", any abstract methods will
- * have an appropriate implementation generated.
- * <p>
- * This approach allows a component "template" to be written as a normal class
- * (with the usual support tools provided by IDEs etc) while allowing the
- * actual UIComponent classes to have a hierarchy that is completely under
- * the control of the annotations. In particular, this is useful for generating
- * components for a JSF specification implementation, which is very specific
- * about the inheritance hierarchy of the standard component classes.
- * <p>
- * When using this "template" approach, the annotated class itself can (and
- * probably should be) package-scoped.
- * 
- * @author Leonardo Uribe (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFComponent
-{
-    /**
-     * The name of the component in a page. This is the name by which the
-     * component will be referenced by the used (the name used to register
-     * JSP TagHandlers for example). For example: "mycomp".
-     * <p>
-     * When a project is generating components that live in more than one
-     * namespace, then the name can optionally include a namespace prefix,
-     * for example "x:mycomp".
-     * <p>
-     * If a class is marked with the JSFComponent annotation, but does not
-     * define the name attribute then it is a "base class" that other
-     * UIComponent classes can extend (and therefore inherit any JSFProperty
-     * definitions from the base class), but is not a component that can be
-     * instantiated.
-     * <p>
-     * This property should never be set for an interface.
-     * <p>
-     * This property should only be set for an abstract class when code
-     * generation is expected to automatically create a component based on
-     * this one (ie when clazz and perhaps template are set).
-     * <p>
-     * This attribute is not inheritable.
-     */
-    String name() default "";
-
-    /**
-     * The fully-qualified-name of a concrete component class.
-     * <p>
-     * This attribute is only relevant when "name" is also set, ie the
-     * annotation is indicating that a component is really being declared.
-     * <p>
-     * When this attribute is not defined then it is assumed that this
-     * annotated class is the actual component class.
-     * <p>
-     * When this attribute is set to something other than the name of the
-     * annotated class then the specified class is the one that the JSF
-     * component registration in faces-config.xml will refer to. And if that
-     * class does not exist in the classpath (which will normally be the
-     * case) then code-generation will be triggered to create it.
-     * <p>
-     * This attribute is not inheritable.
-     * <p>
-     * The doclet-annotation equivalent of this attribute is named "class".
-     */
-    String clazz() default "";
-    
-    /**
-     * The JSF Component Family that this component belongs to.
-     * <p>
-     * A UIComponent instance's "family" setting is used together with a "renderer-type" to
-     * find a renderer for the component (see method UIComponent.getRenderer). Each
-     * Renderer implementation is registered in a faces-config.xml file using a
-     * (component-family, renderer-type) pair.
-     * <p>
-     * If this attribute is not set then the builder plugin will look for a
-     * constant on the class with name COMPONENT_FAMILY. It is an error if a
-     * concrete component has no such setting (but the value can be inherited from an
-     * ancestor class).
-     */
-    String family() default "";
-    
-    /**
-     * The type string used to create new instances of this component.
-     * <p>
-     * Components are registered in faces-config.xml using this type value, and
-     * new instances are created via Application.createComponent(type).
-     * <p>
-     * If this attribute is not set, then the builder plugin will look for a
-     * constant on the class with name COMPONENT_TYPE. It is an error if a
-     * component has no such setting.
-     * <p>
-     * This should only be set on concrete component classes (or classes for which
-     * code generation creates a concrete component class). The attribute is
-     * not inheritable.
-     */
-    String type() default "";
-    
-    /**
-     * Define the renderer-type attribute that (together with "family") is used to
-     * look up a renderer for instances of a component.
-     * <p>
-     * See attribute "family" for more details.
-     * <p>
-     * If this attribute is not defined, the builder plugin looks for a constant
-     * on the class with name DEFAULT_RENDERER_TYPE. It is an error if a
-     * concrete component has no such setting (but the value can be inherited from an
-     * ancestor class).
-     * <p>
-     * This attribute is inheritable.
-     */
-    String defaultRendererType() default "";
-    
-    /**
-     * Indicate if the component is allowed to have other UIComponent instances
-     * as children (ie "nested within it" in a page).
-     * <p>
-     * This information can be inserted into .tld files and similar to present
-     * users with an error message if an attempt is made to define child
-     * components for a component that does not support them.
-     * <p>
-     * Code generation might also use this information to ensure that an exception
-     * is thrown if an attempt to add child components occurs at runtime.
-     * <p>
-     * Note that this is related to, but not quite the same as, the "bodyContent"
-     * attribute. That attribute prevents anything being nested inside the component
-     * in the page, while this prevents UIComponents being nested.
-     * 
-     * ?? TODO: but in JSF1.2, isn't static text a transient child??
-     * <p>
-     * This attribute is inheritable.
-     */
-    boolean canHaveChildren() default false;
-    
-    /**
-     * TODO: this is hopefully unused, and can be deleted.
-     * <p>
-     * Indicate that this component should not be defined on faces-config.xml.
-     * Anyway, if this is true or false does not have any significative impact. 
-     */
-    boolean configExcluded() default false;
-    
-    /**
-     * The name of the JSP Tag class that should be generated for this component.
-     * <p>
-     * It is an error to set this attribute if the annotated class is not a
-     * concrete JSF component.
-     * <p>
-     * TODO: ? WHat happens if a class is a concrete component but this is not
-     * set? Is a tagClass name automatically created? Or is no tag class created?
-     */
-    String tagClass() default "";
-     
-    /**
-     * Tag super class that the generated tag class extends.
-     * <p>
-     * The generated tag class for this component may need to be a subclass of
-     * different tag base classes depending upon the type of this component.
-     * For example, the JSF standard provides the following tag classes:
-     * <ul>
-     * <li>UIComponentTag (the default tag base class)
-     * <li>UIComponentBodyTag, for tags that "need to process their tag bodies".
-     * Examples from the JSF standard are h:panelGrid, h:panelGroup, h:dataTable,
-     * h:column.
-     * </ul>
-     * <p>
-     * This is optional; when not defined, the standard UIComponentTag class is
-     * used. This is appropriate for most JSF components.
-     */
-    String tagSuperclass() default "";
-    
-    /**
-     * Indicate tag handler class used for this component on facelets.
-     * 
-     */
-    String tagHandler() default "";
-    
-    /**
-     * Indicate if the element accept inner elements (JSP) or not (empty).
-     */
-    String bodyContent() default "";
-    
-    /**
-     * A Short description of the purpose of this UIComponent.
-     * <p>
-     * This information is output into the .tld and faces-config.xml files as help
-     * for users of this component, and may be displayed by IDEs and similar tools.
-     * <p>
-     * If not set, then the javadoc "summary" sentence for the class will be
-     * used. If there is no javadoc for the class then the description will be
-     * an empty string (but that will never happen, right?).
-     * <p>
-     * Note that tld or faces-config files also have a "long description" field.
-     * That value is always the complete javadoc for the component class.
-     * <p>
-     * This attribute is not inheritable.
-     */
-    String desc() default "";
-    
-    /**
-     * Serial UID to be put on class when generated.
-     * <p>
-     * This should be set only for "component template" code generation, ie
-     * where the superClass attribute is set. In this case, the generated
-     * class will have a serialVersionUID constant defined which is set to
-     * this value.
-     * <p>
-     * TODO: is this valid? Why can't the code-generation just add a
-     * serialUid value based upon what version of the template was used?
-     * Maybe because the template generates different stuff based upon
-     * what attributes are defined here?
-     */
-    String serialuid() default "";
-    
-    /**
-     * Interfaces that generated classes should implement.
-     * <p>
-     * Used only when "component template" code generation is used. When
-     * defined, then the generated class will implement the listed
-     * interfaces in addition to the interfaces that this annotated class
-     * implements.
-     */
-    String implementz() default "";
-    
-    /**
-     * Indicate if the pattern used to generate component class code is
-     * template (true) or subclass (false).
-     */
-    boolean template() default false;
-    
-    /**
-     * The name of the default client event to be return on method
-     * ClientBehaviorHolder.getDefaultEventName(). This property is
-     * JSF 2.0 specific, and the component must implement 
-     * javax.faces.component.behavior.ClientBehaviorHolder interface.  
-     * 
-     * @since 1.0.4
-     */
-    String defaultEventName() default "";
-
-    /**
-     * 
-     * @since 1.0.5
-     */
-    boolean composite() default false;
-}
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFConverter.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFConverter.java
deleted file mode 100644
index 915707b..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFConverter.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Used to define a jsf converter.
- * 
- * @author Leonardo Uribe (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFConverter
-{
-    /**
-     * Indicate the converterId which identifies this class. If not defined,
-     * it tries to get the value of the field CONVERTER_ID. 
-     */
-    String id() default "";
-
-    /**
-     * The name of the component in a page (ex: x:mycomp).
-     */
-    String name() default "";
-
-    /**
-     * The tag class used for this converter, if applies.
-     */
-    String tagClass() default "";
-    
-    /**
-     * Tag super class that inherits the tag class
-     */
-    String tagSuperclass() default "";
-
-    /**
-     * Indicate that this component should not be defined on faces-config.xml.
-     * Anyway, if this is true or false does not have any significative impact. 
-     * 
-     * @return
-     */
-    boolean configExcluded() default false;
-    
-    /**
-     * Indicate if the element accept inner elements or not.
-     */
-    String bodyContent() default "";
-    
-    /**
-     * Short description
-     */
-    String desc() default "";
-    
-    /**
-     * Serial uid that should be added on generated tag class
-     * 
-     * @since 1.0.3
-     */
-    String serialuidtag() default "";
-}
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFExclude.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFExclude.java
deleted file mode 100644
index 1c7cc9f..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFExclude.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicate that this code must be excluded from copying when generation using a 
- * template package scoped class is used. 
- * 
- * THIS ONLY SHOULD BE USED IN VERY SPECIAL CASES 
- * 
- * (Use abstract pattern to add custom code on component class instead).
- * 
- * @author Leonardo Uribe (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-@Documented
-@Target(value={
-        ElementType.TYPE,
-        ElementType.METHOD,
-        ElementType.LOCAL_VARIABLE,
-        ElementType.FIELD,
-        ElementType.CONSTRUCTOR})
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFExclude
-{
-
-}
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFFaceletAttribute.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFFaceletAttribute.java
deleted file mode 100644
index f2d5549..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFFaceletAttribute.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 
- * Define a facelet tag attribute. This doclet should be used inside a @JSFFaceletTag class, 
- * to define individual tag classes used in JSF
- * 
- * This annotation should only be used in jsf 2.0 libraries.
- * 
- * @since 1.0.4
- * @author Leonardo Uribe (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-@Documented
-@Target(value={
-        ElementType.TYPE,
-        ElementType.METHOD,
-        ElementType.LOCAL_VARIABLE,
-        ElementType.FIELD
-        })
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFFaceletAttribute
-{
-    /**
-     * The name of the attribute. This is the name on the tld
-     * 
-     * @since 1.0.4
-     */
-    String name() default "";
-    
-    /**
-     * The class or type the component must refer on the tag class. 
-     * On 1.1 is java.lang.String always and on 1.2 is 
-     * javax.el.ValueExpression or javax.el.MethodExpression.
-     * 
-     * @since 1.0.4
-     */
-    String className() default "";
-    
-    /**
-     * Long description. By default, it takes what is inside comment area.
-     * 
-     * @since 1.0.4
-     */
-    String longDescription() default "";
-    
-    /**
-     * (true|false) Define if the property is required or not. Default:false
-     * 
-     * @since 1.0.4
-     */
-    boolean required() default false;
-    
-    /**
-     * (true|false) This value is put on the tld when applies 
-     * and className is not javax.el.ValueExpression or 
-     * javax.el.MethodExpression.
-     * 
-     * @since 1.0.4
-     */
-    boolean rtexprvalue() default false;
-    
-    /**
-     * Short description
-     * 
-     * @since 1.0.4
-     */
-    String desc() default "";
-
-    /**
-     * Indicate the type that values should be
-     * cast on tld. It is supposed that the className is
-     * javax.el.ValueExpression to apply it. 
-     *
-     * @since 1.0.4
-     */
-    String deferredValueType() default "";
-
-    /**
-     * Indicate the method signature that values should be
-     * cast on tld. It is supposed that the className is
-     * javax.el.MethodExpression to apply it. 
-     *
-     * @since 1.0.4
-     */
-    String deferredMethodSignature() default "";
-    
-    /**
-     * Mark this property to not be included on the tld.
-     * 
-     * @since 1.0.4
-     */
-    boolean exclude() default false;
-}
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFFaceletAttributes.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFFaceletAttributes.java
deleted file mode 100644
index 2652bac..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFFaceletAttributes.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Define a set of properties used to group several definitions
- * of JSFFaceletAttribute annotations.
- * 
- * This annotation should only be used in jsf 2.0 libraries.
- * 
- * @since 1.0.4
- * @author Leonardo Uribe (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFFaceletAttributes
-{
-
-    /**
-     * Array of JSFFaceletAttribute to be defined.
-     * 
-     * @since 1.0.4
-     */
-    JSFFaceletAttribute [] attributes();
-    
-}
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFFaceletTag.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFFaceletTag.java
deleted file mode 100644
index ebd483d..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFFaceletTag.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Used to define a jsf facelet tag handler. 
- * <p>
- * The intention of this annotation is use its information to generate a
- * facelet taglib xml file(optional), and create a specific 
- * facelet documentation (generate alternate .tld files and use 
- * maven-taglib-plugin on these files).
- * In order to do that, this annotation has multiple use cases:
- * </p>
- * <ul>
- * <li>Define a component only available on facelets.</li>
- * <li>When a component has additional properties only available on facelets.
- * In this case, we set componentClass/converterClass/validatorClass/tagClass attribute.
- * The effect is that all properties and descriptions are flattened to this class. In other
- * words, when the documentation of the annotated facelet tag handler is generated, 
- * this information precedes the one pointed by the annotation. This only happens when
- * name attribute match.</li>
- * <li>When a component does not have an specific tag handler, so we can create
- * a dummy tag handler, annotate it and set configExcluded=true, so we can 
- * document it instead put this information on the base tld used to generate.
- * This is the case of h:outputScript or h:outputStylesheet</li>
- * </ul>
- * 
- * This annotation should only be used in jsf 2.0 libraries.
- * 
- * @since 1.0.4
- * @author Leonardo Uribe (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFFaceletTag
-{
-    /**
-     * Indicate if the element accept inner elements or not. (JSP or empty)
-     * 
-     * @since 1.0.4
-     */
-    String bodyContent() default "";
-    
-    /**
-     * Short description
-     * 
-     * @since 1.0.4
-     */
-    String desc() default "";
-    
-    /**
-     * Long description. By default, it takes what is inside comment area.
-     * 
-     * @since 1.0.4
-     */
-    String longDescription() default "";    
-    
-    /**
-     * The name of the component in a page (ex: x:mycomp).
-     * 
-     * @since 1.0.4
-     */
-    String name() default "";
-    
-    /**
-     * Indicate that this facelet tag handler should not be defined 
-     * on facelets taglib xml file.
-     * Note that for some libraries a xml file is not generated 
-     * (like in core 2.0), instead a library class is defined, 
-     * so in those cases set this value has no effect.
-     * 
-     * @since 1.0.4
-     */
-    boolean configExcluded() default false;
-    
-    /**
-     * The name of the most near jsp tag class where all
-     * attributes should be inherited from this class
-     * 
-     * @since 1.0.4
-     */
-    String tagClass() default "";
-    
-    /**
-     * The name of the most near component class where all
-     * attributes should be inherited from this class
-     * 
-     * @since 1.0.4
-     */
-    String componentClass() default "";
-    
-    /**
-     * The name of the most near converter class where all
-     * attributes should be inherited from this class
-     * 
-     * @since 1.0.4
-     */
-    String converterClass() default "";
-    
-    /**
-     * The name of the most near validator class where all
-     * attributes should be inherited from this class
-     * 
-     * @since 1.0.4
-     */
-    String validatorClass() default "";
-    
-    /**
-     * The name of the most near behavior class where all
-     * attributes should be inherited from this class
-     * 
-     * @since 1.0.5
-     */
-    String behaviorClass() default "";
-}
\ No newline at end of file
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFFaceletTags.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFFaceletTags.java
deleted file mode 100644
index b46f8f6..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFFaceletTags.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Define a set of tags that uses the tag handler class annotated.
- * <p>
- * In jsp, each tag (read it as component/converter/validator/tag)
- * has one specific tag file that only works for. But in facelets,
- * one tag handler could take care of multiple tags. 
- * </p>
- * <p>
- * This tag is used to group several JSFFaceletTag definitions and
- * indicate that the tag handler annotated by this annotations handle
- * the selected tags.
- * </p>
- * <p>
- * This annotation should only be used in jsf 2.0 libraries.
- * </p>
- * 
- * @since 1.0.4
- * @author Leonardo Uribe (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFFaceletTags
-{
-
-    /**
-     * Array of JSFFaceletTags to be defined.
-     * 
-     * @since 1.0.4
-     */
-    JSFFaceletTag [] tags();
-    
-}
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFFacet.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFFacet.java
deleted file mode 100644
index 0c5f472..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFFacet.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicate that this method is a facet method.
- * 
- * @author Leonardo Uribe (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-@Documented
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFFacet
-{
-
-    /**
-     * (true|false) Define if the property is required or not. Default:false
-     */
-    boolean required() default false;
-    
-    /**
-     * Short description
-     */
-    String desc() default "";
-
-}
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFJspAttribute.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFJspAttribute.java
deleted file mode 100644
index 97ddea6..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFJspAttribute.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 
- * Define a tag attribute. This doclet should be used inside a @JSFJspTag class, 
- * to define individual tag classes used in JSF, like f:verbatim or f:actionListener
- * 
- * @author Leonardo Uribe (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-@Documented
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFJspAttribute
-{
-    /**
-     * The name of the attribute. This is the name on the tld
-     */
-    String name() default "";
-    
-    /**
-     * The class or type the component must refer on the tag class. 
-     * On 1.1 is java.lang.String always and on 1.2 is 
-     * javax.el.ValueExpression or javax.el.MethodExpression.
-     */
-    String className() default "";
-    
-    /**
-     * Long description. By default, it takes what is inside comment area.
-     */
-    String longDescription() default "";
-    
-    /**
-     * (true|false) Define if the property is required or not. Default:false
-     */
-    boolean required() default false;
-    
-    /**
-     * (true|false) This value is put on the tld when applies 
-     * and className is not javax.el.ValueExpression or 
-     * javax.el.MethodExpression.
-     */
-    boolean rtexprvalue() default false;
-    
-    /**
-     * Short description
-     */
-    String desc() default "";
-
-    /**
-     * Indicate the type that values should be
-     * cast on tld. It is supposed that the className is
-     * javax.el.ValueExpression to apply it. 
-     *
-     * @since 1.0.3
-     */
-    String deferredValueType() default "";
-
-    /**
-     * Indicate the method signature that values should be
-     * cast on tld. It is supposed that the className is
-     * javax.el.MethodExpression to apply it. 
-     *
-     * @since 1.0.3
-     */
-    String deferredMethodSignature() default "";
-    
-    /**
-     * Mark this property to not be included on the tld.
-     * 
-     * @since 1.0.3
-     */
-    boolean exclude() default false;
-    
-    /**
-     * 
-     * @since 1.0.5
-     */
-    boolean faceletsOnly() default false;
-}
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFJspProperties.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFJspProperties.java
deleted file mode 100644
index 3bc066f..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFJspProperties.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Define a set of properties used to group several definitions
- * of JSFJspProperty annotations.
- * 
- * @author Leonardo Uribe (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFJspProperties
-{
-
-    /**
-     * Array of JSFJspProperties to be defined.
-     */
-    JSFJspProperty [] properties();
-    
-}
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFJspProperty.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFJspProperty.java
deleted file mode 100644
index 32606ef..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFJspProperty.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Defines a logical property of a component that is accessed via the
- * component's Attributes map, rather than javaBean getter/setter methods.
- * <p>
- * These logical properties are accessible from views (eg available as
- * JSP tag attributes) just like properties declared with the JSFProperty
- * annotation.
- * <p>
- * A class or interface that defines just one logical property may use this
- * annotation directly; to declare more than one logical property should
- * use the JSFJspProperties annotation to group a set of these. Classes that
- * implement interfaces with this annotation, or subclass a base class that
- * has this annotation, will inherit the declared attributes.
- * <p>
- * This annotation should only be applied to classes that also have the JSFComponent
- * and JSFValidator annotation.
- * 
- * @author Leonardo Uribe (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFJspProperty
-{
-
-    /**
-     * The name that identifies this attribute.
-     * <p>
-     * This String is the key used to look up the attribute in the component's
-     * Attributes map.
-     * <p>
-     * Examples: border, id, value
-     */
-    String name() default "";
-    
-    /**
-     * The type of this attribute.
-     * <p>
-     * This must be a fully-qualified class name of a java type.
-     * <p>
-     * TODO: doesn't the JSF spec also allow short-cuts for common types here?
-     */
-    String returnType() default "";
-    
-    /**
-     * Define whether this attribute is mandatory for the associated component,
-     * ie whether it is an error to create an instance of the component and
-     * not to provide a value for this attribute.
-     */
-    boolean required() default false;
-    
-    /**
-     * Define if this tag is excluded from tld.
-     * <p>
-     * This is very ugly feature, and should be used as little as possible. It
-     * allows a parent class (or interface) to declare logical properties, then
-     * a subclass to "undeclare" them. This is completely broken OO design,
-     * but is required in a few rare cases by the JSF specification. 
-     */
-    boolean tagExcluded() default false;
-    
-    /**
-     * A long description of the purpose of this attribute.
-     * <p>
-     * This is commonly shown as help in IDEs.
-     */
-    String longDesc() default "";
-    
-    /**
-     * A short description of the purpose of this attribute.
-     * <p>
-     * This is commonly shown as a "tool tip" or popup-help in IDEs.
-     */
-    String desc() default "";
-    
-    /**
-     * Indicate if this property is inherited from a parent tag class or not.
-     * 
-     * @since 1.0.6
-     */
-    boolean inheritedTag() default false;
-
-    /**
-     * Use saveAttachedXXX and restoreAttachedXXX to save and restore state
-     * 
-     * @since 1.0.6
-     */
-    boolean stateHolder() default false;
-    
-    /**
-     * Indicate that the getter and setter does not evaluate EL or ValueBinding expressions.
-     * 
-     * @since 1.0.6
-     */
-    boolean literalOnly() default false;
-}
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFJspTag.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFJspTag.java
deleted file mode 100644
index fb77814..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFJspTag.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Used to define a jsf tag that does not fall in a category like converter, validator
- * or component. Examples are f:verbatim or f:actionListener
- * 
- * @author Leonardo Uribe (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFJspTag
-{
-    
-    /**
-     * Indicate if the element accept inner elements or not.
-     */
-    String bodyContent() default "";
-    
-    /**
-     * Short description
-     */
-    String desc() default "";
-    
-    /**
-     * The name of the component in a page (ex: x:mycomp).
-     */
-    String name() default "";
-    
-    /**
-     * Indicate tag handler class used for this component on facelets.
-     * 
-     */
-    String tagHandler() default "";
-}
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFListener.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFListener.java
deleted file mode 100644
index 8879fee..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFListener.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @since 1.0.4 
- * @author Leonardo Uribe (latest modification by $Author: lu4242 $)
- * @version $Revision: 796607 $ $Date: 2009-07-21 22:00:30 -0500 (mar, 21 jul 2009) $
- */
-@Documented
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFListener
-{   
-    String name() default "";
-    
-    String event() default "";
-    
-    /**
-     * (true|false) Define if the property is required or not. Default:false
-     */
-    boolean required() default false;
-    
-    /**
-     * Short description
-     */
-    String desc() default "";
-
-    String clazz() default "";
-    
-    String phases() default "";
-}
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFProperty.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFProperty.java
deleted file mode 100644
index 5a01322..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFProperty.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Define that this getter or setter method define a property.
- * 
- * @author Leonardo Uribe (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-@Documented
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFProperty
-{
-
-    /**
-     * (true|false) Define if the property is required or not. Default:false
-     */
-    boolean required() default false;
-    
-    /**
-     * Indicate if the property is not saved and restored its state.
-     */
-    boolean istransient() default false;
-    
-    /**
-     * Use saveAttachedXXX and restoreAttachedXXX to save and restore state
-     */
-    boolean stateHolder() default false;
-    
-    /**
-     * Indicate that the getter and setter does not evaluate EL or ValueBinding expressions.
-     */
-    boolean literalOnly() default false;
-    
-    /**
-     * Define if this tag is excluded from tld.
-     */
-    boolean tagExcluded() default false;
-    
-    /**
-     * Indicate if it should be generated a method like
-     * getLocalXXX to retrieve the local value of the property
-     * directly (without evaluate ValueBinding or ValueExpression).
-     * 
-     * If there is no generation of component class this property
-     * has any effect.
-     * 
-     */
-    boolean localMethod() default false;
-    
-    /**
-     * Define the scope to be used when generating the method getLocalXXX.
-     * 
-     * The default to be applied is "protected".
-     * 
-     */
-    String localMethodScope() default "";
-    
-    /**
-     * Indicate if it should be generated a method like
-     * isSetXXX, used when it is necessary to check if a boolean type
-     * property was set programatically (using setXXX method) or not. 
-     * 
-     * If there is no generation of component class this property
-     * has any effect.
-     */
-    boolean setMethod() default false;
-    
-    /**
-     * Define the scope to be used when generating the method isSetXXX.
-     * 
-     * The default to be applied is "protected".
-     * 
-     */
-    String setMethodScope() default "";
-    
-    /**
-     * The name used in jsp pages to make reference to this
-     * property (used on tld).
-     */
-    String jspName() default "";
-    
-    /**
-     * (true|false) This value is put on the tld when applies.
-     */
-    boolean rtexprvalue() default false;
-    
-    /**
-     * Short description
-     */
-    String desc() default "";
-    
-    /**
-     * Indicate if this property is inherited from a parent tag class or not.
-     * 
-     * @return
-     */
-    boolean inheritedTag() default false;
-    
-    /**
-     * The full name of the return type for MethodBinding or MethodExpression it uses
-     */
-    String returnSignature() default "";
-
-    /**
-     * CSV full names of the types that are params for methods using this MethodBinding or MethodExpression param
-     */
-    String methodSignature() default "";
-    
-    /**
-     * The default value to set if this property is generated.
-     */
-    String defaultValue() default "";
-
-    /**
-     * Indicate the type that values should be cast on tld. 
-     * This param only applies on jsf 1.2 (it is supposed that 
-     * the className is javax.el.ValueExpression to apply it),
-     * because in jsf 1.1, values on tag class are considered 
-     * to be String. 
-     *
-     * @since 1.0.3
-     */
-    String deferredValueType() default "";
-    
-    /**
-     * Indicate if this property is a client event that should
-     * be returned by ClientBehaviorHolder.getEventNames(). This
-     * property is by default "", it is JSF 2.0 specific, and 
-     * the component holding it must implement 
-     * javax.faces.component.behavior.ClientBehaviorHolder interface.
-     * 
-     * @since 1.0.4
-     */
-    String clientEvent() default "";
-    
-    /**
-     * 
-     * @since 1.0.5
-     */
-    boolean partialStateHolder() default false;
-    
-    /**
-     * 
-     * @since 1.0.5
-     */
-    boolean faceletsOnly() default false;
-}
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFRenderKit.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFRenderKit.java
deleted file mode 100644
index 642bc3f..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFRenderKit.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * The renderKitId that identifies this RenderKit. This is registered on faces-config.xml.
- * 
- * @author Leonardo Uribe (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFRenderKit
-{
-    /**
-     * The renderKitId related to this class 
-     */
-    String renderKitId() default "";
-}
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFRenderer.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFRenderer.java
deleted file mode 100644
index e2eaceb..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFRenderer.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicate that this class is a Renderer. This is registered on faces-config.xml.
- * 
- * @author Leonardo Uribe (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFRenderer
-{
-    /**
-     * The renderKitId that belongs this renderer. If no custom renderkit defined you should use HTML_BASIC.
-     */
-    String renderKitId() default "";
-    
-    /**
-     * The component family that this renderer should be applied.
-     */
-    String family() default "";
-    
-    /**
-     * The renderer type that is applied this renderer.
-     */
-    String type() default "";
-    
-    /**
-     * Short description
-     */
-    String desc() default "";
-
-}
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFRenderers.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFRenderers.java
deleted file mode 100644
index 4cf067f..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFRenderers.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Define a set of renderers used to group several definitions
- * of JSFRenderer annotations.
- * 
- * @author Leonardo Uribe (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFRenderers
-{
-
-    /**
-     * Array of JSFRenderer to be defined.
-     */
-    JSFRenderer [] renderers();
-    
-}
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFValidator.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFValidator.java
deleted file mode 100644
index 60d43ed..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFValidator.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Used to define a jsf validator.
- * 
- * @author Leonardo Uribe (latest modification by $Author$)
- * @version $Revision$ $Date$
- */
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFValidator
-{
-    
-    /**
-     * Indicate the validatorId which identifies this class. If not defined, it
-     * tries to get the value of the field VALIDATOR_ID.
-     */
-    String id() default "";
-    
-    /**
-     * The name of the component in a page (ex: x:mycomp).
-     */
-    String name() default "";
-
-    /**
-     * The tag class used for this validator, if applies.
-     */
-    String tagClass() default "";
-    
-    /**
-     * Tag super class that inherits the tag class
-     */
-    String tagSuperclass() default "";
-
-    /**
-     * Indicate that this component should not be defined on faces-config.xml.
-     * Anyway, if this is true or false does not have any significative impact. 
-     * 
-     * @return
-     */
-    boolean configExcluded() default false;
-        
-    /**
-     * Indicate if the element accept inner elements or not.
-     */
-    String bodyContent() default "";
-    
-    /**
-     * Short description
-     */
-    String desc() default "";
-    
-    /**
-     * Serial uid that should be added on generated tag class
-     * 
-     * @since 1.0.3
-     */
-    String serialuidtag() default "";
-    
-    /**
-     * The fully-qualified-name of a concrete validator class.
-     * <p>
-     * This attribute is only relevant when "name" is also set, ie the
-     * annotation is indicating that a validator is really being declared.
-     * <p>
-     * When this attribute is not defined then it is assumed that this
-     * annotated class is the actual validator class.
-     * <p>
-     * When this attribute is set to something other than the name of the
-     * annotated class then the specified class is the one that the JSF
-     * validator registration in faces-config.xml will refer to. And if that
-     * class does not exist in the classpath (which will normally be the
-     * case) then code-generation will be triggered to create it.
-     * <p>
-     * This attribute is not inheritable.
-     * <p>
-     * The doclet-annotation equivalent of this attribute is named "class".
-     * 
-     * @since 1.0.3
-     */
-    String clazz() default "";
-}
diff --git a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFWebConfigParam.java b/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFWebConfigParam.java
deleted file mode 100644
index ba0e7bf..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFWebConfigParam.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.annotation;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Used to define a param configured in web.xml file.
- * 
- * @since 1.0.4
- * @author Leonardo Uribe (latest modification by $Author: lu4242 $)
- * @version $Revision: 758513 $ $Date: 2009-03-25 23:02:16 -0500 (mié, 25 mar 2009) $
- */
-@Documented
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFWebConfigParam
-{
-    String name() default "";
-    
-    /**
-     * Short description
-     */
-    String desc() default "";
-    
-    /**
-     * 
-     */
-    String defaultValue() default "";
-    
-    /**
-     * 
-     */
-    String expectedValues() default "";
-    
-    /**
-     * 
-     */
-    String since() default "";
-}
diff --git a/maven2-plugins/myfaces-builder-plugin/LICENSE.txt b/maven2-plugins/myfaces-builder-plugin/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-plugins/myfaces-builder-plugin/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
diff --git a/maven2-plugins/myfaces-builder-plugin/NOTICE.txt b/maven2-plugins/myfaces-builder-plugin/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-plugins/myfaces-builder-plugin/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces Maven Plugins     ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
diff --git a/maven2-plugins/myfaces-builder-plugin/pom.xml b/maven2-plugins/myfaces-builder-plugin/pom.xml
deleted file mode 100644
index 1cbbee6..0000000
--- a/maven2-plugins/myfaces-builder-plugin/pom.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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.
--->
-<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"> 
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-plugin-parent</artifactId>
-    <version>1.0.4-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.myfaces.buildtools</groupId>
-  <artifactId>myfaces-builder-plugin</artifactId> 
-  <version>1.0.8-SNAPSHOT</version>
-  <packaging>maven-plugin</packaging>
-  <name>Apache MyFaces Buildtools Maven2 Builder Plugin</name>
-  <description>
-    A maven plugin that uses annotations (java15 or doclet style) to generate the necessary JSF configuration
-    files (.tld, faces-config.xml, etc) and optionally Tag, Validator and Component classes.
-  </description>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin</developerConnection>
-    <url>http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-builder-plugin</url>
-  </scm>
-
-  <build>
-    <plugins>
-      <!-- required for plexus, but we are not using this right now
-      <plugin>
-        <artifactId>maven-plugin-plugin</artifactId>
-        <configuration>
-          <goalPrefix>myfaces-builder</goalPrefix>
-        </configuration>
-      </plugin>
-       -->
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
-        <inherited>true</inherited>
-        <configuration>
-          <source>1.4</source>
-          <target>1.4</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.2</version>
-      </plugin>
-    </plugins>
-  </build>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-plugin-plugin</artifactId>
-        <version>2.2</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
-  
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>2.0</version>
-    </dependency>
-    
-    <dependency>    
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-dependency-plugin</artifactId>
-      <version>2.0</version>
-    </dependency>   
-
-    <dependency>
-      <groupId>com.thoughtworks.qdox</groupId>
-      <artifactId>qdox</artifactId>
-      <version>1.12</version>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-digester</groupId>
-      <artifactId>commons-digester</artifactId>
-      <version>1.8</version>
-    </dependency>
-
-    <!--
-    <dependency>
-    	<groupId>xml-apis</groupId>
-    	<artifactId>xml-apis</artifactId>
-    	<version>1.0.b2</version>
-    	<scope>runtime</scope>
-    </dependency>
-    -->
-
-    <dependency>
-      <groupId>saxon</groupId>
-      <artifactId>saxon</artifactId>
-      <version>6.5.3</version>
-      <scope>runtime</scope>
-    </dependency>
-    
-    <!--
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.6.2</version>
-      <scope>runtime</scope>
-    </dependency>
-    -->
-
-    <dependency>
-    	<groupId>stax</groupId>
-    	<artifactId>stax-api</artifactId>
-    	<version>1.0.1</version>
-    	<!-- <scope>compile</scope>  -->
-    </dependency>
-
-    <dependency>
-    	<groupId>stax</groupId>
-    	<artifactId>stax</artifactId>
-    	<version>1.2.0</version>
-    	<!-- <scope>runtime</scope>  -->
-    </dependency>
-
-    <dependency>
-      <groupId>velocity</groupId>
-      <artifactId>velocity</artifactId>
-      <version>1.5</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>logkit</groupId>
-      <artifactId>logkit</artifactId>
-      <version>2.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.1</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.1</version>
-    </dependency>
-    <!--     
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-velocity</artifactId>
-      <version>1.1.7</version>
-    </dependency>
-     -->
-    
-    <!-- Reporting required API-->   
-    <dependency>
-      <groupId>org.apache.maven.reporting</groupId>
-      <artifactId>maven-reporting-impl</artifactId>
-      <version>2.0</version>
-    </dependency>
-        
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-core</artifactId>
-      <version>1.0-alpha-7</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-site-renderer</artifactId>
-      <version>1.0-alpha-7</version>
-    </dependency>
-    <!-- End Reporting required API -->
-
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.13</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/BuildMetaDataMojo.java b/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/BuildMetaDataMojo.java
deleted file mode 100644
index 9a3fdec..0000000
--- a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/BuildMetaDataMojo.java
+++ /dev/null
@@ -1,526 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.maven.model.Resource;
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentMeta;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.Model;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.qdox.QdoxModelBuilder;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.BuildException;
-import org.codehaus.plexus.util.StringUtils;
-
-/**
- * Maven goal which runs one or more ModelBuilder objects to gather metadata
- * about JSF artifacts into a Model object, then save that model object as an
- * xml file for use by other goals of this plugin.
- * <p>
- * By default, the generated file is named "META-INF/myfaces-metadata.xml".
- * This file will be included in the final artifact for this project. Having
- * that metadata file embedded in the generated jarfile is useful for two
- * purposes:
- * <ul>
- * <li>It is needed if other projects then use the myfaces-builder-plugin to
- * create subclasses of the jsf classes in this project.</li>
- * <li>It is good documentation (more precise than the tld and faces-config.xml
- * files).</li>
- * </ul>
- * </p>
- * <p>
- * Note that the generated file contains all the metadata needed by this
- * project, including a copy of all the metadata from other projects that
- * this one depends on. All other goals of this plugin can execute with
- * just the generated metadata as input, without needing to load other
- * projects. Each entry in the metadata is labelled with a "modelId"
- * property that indicates where it originally came from.
- * </p>
- * 
- * @requiresDependencyResolution compile
- * @goal build-metadata
- * @phase generate-sources
- */
-public class BuildMetaDataMojo extends AbstractMojo
-{
-    /**
-     * Injected Maven project object.
-     * 
-     * @parameter expression="${project}"
-     * @readonly
-     */
-    private MavenProject project;
-
-    /**
-     * Build directory for all generated stuff.
-     * <p>
-     * This mojo registers the specified directory with Maven as a resource dir. The
-     * maven-resources-plugin will then read the files from this dir and copy them
-     * into the "central" target directory from which the jarfile is built. 
-     * </p>
-     * 
-     * @parameter expression="${project.build.directory}/myfaces-builder-plugin/main/resources"
-     */
-    private File targetDirectory;
-
-    /**
-     * Name of the metadata file to generate, relative to targetDirectory.
-     * 
-     * @parameter
-     */
-    private String outputFile = "META-INF/myfaces-metadata.xml";
-
-    /**
-     * The modelId to associate with all model items discovered in the
-     * source directories of this project.
-     * <p>
-     * This value <i>must</i> be unique for each project. If not specified,
-     * then it defaults to the artifactId of the current maven project.
-     * </p>
-     * <p>
-     * In later phases, goals are passed the complete metadata model which
-     * mixes items discovered here with items imported from metadata in 
-     * other projects. The modelId is used to figure out which of the
-     * items should be processed (ie which ones are associated with this
-     * project) and which should be ignored.
-     * </p>
-     *
-     * @parameter expression="${project.artifactId}"
-     */
-    private String modelId;
-    
-    /**
-     * Replace the package prefix.
-     * <p>
-     * This allows a project that inherits metadata from some other project to force
-     * copies of the Tag classes to be created in a namespace of its own choosing.
-     * </p>
-     * <p>
-     * This is used in particular to create copies of the Tag classes in myfaces-impl
-     * within other projects so that they can be used as base classes for other tags
-     * within that project. The original tag present in the myfaces-impl.jar cannot
-     * be used as a base because that would prevent the derived project from running
-     * with other JSF implementations.
-     * </p>
-     * <p>
-     * The child project first defines this (and replacePackagePrefixTagTo); as the
-     * inherited metadata is merged the tagClass attribute is modified. Then during
-     * the tag class generation goal, the modelId of the inherited project is included
-     * in the list of modelIds to process. That causes the tag classes to be generated
-     * again - but this time in a different package.
-     * </p>
-     * 
-     * @parameter
-     */
-    private String replacePackagePrefixTagFrom;
-
-    /**
-     * Replace the package prefix
-     * <p>
-     * See replacePackagePrefixTagTo.
-     * </p>
-     * 
-     * @parameter
-     */
-    private String replacePackagePrefixTagTo;
-    
-    /**
-     * Specify the order in which models are to be merged (not usually needed).
-     * <p>
-     * When two different models define exactly the same item (ie the "class" attribute
-     * for two items is the same) then the one from the model that is merged first is
-     * used, and the later one is ignored.
-     * </p>
-     * <p>
-     * This property allows the order of merging to be controlled; models are merged in
-     * the order specified in this list. Any models whose ids are not in this list are
-     * then merged in an undefined order at the end.
-     * </p>
-     * <p>
-     * Setting this property is not normally necessary; typically models inherited from
-     * dependencies define different model items (ie have no overlap). However consider
-     * the situation where project A defines a model, project B extends A, then project C
-     * extends B. In this case, both A and B are in the dependencies, but the metadata in
-     * project B contains a complete copy of all the data from A. However B's metadata is
-     * from <i>the version of A that it was compiled against</i> which might not be the
-     * version of A that is in the dependencies. For safety in this case, it is better to
-     * ensure that project B's metadata is loaded first; this can possibly hide any new
-     * features (or bugfixes) from the new release of A, but also ensures that classes
-     * in C which extend classes in B do not declare features that B does not support.
-     * </p>
-     * <p>
-     * This property is only needed in rare situations; normally it can be omitted.
-     * </p>
-     * 
-     * @parameter
-     */
-    private List orderModelIds;
-    
-    /**
-     * An optional list of models to import from dependency jars.
-     * <p>
-     * The default behaviour is to scan all jar dependencies for metadata files, and
-     * merge all the data into the model for this project. If this property is set,
-     * then metadata found in dependencies is only merged if the modelId matches one
-     * in this list.
-     * </p>
-     * <p>
-     * Note that by default, a project's modelId is the same as the artifactId.
-     * </p>
-     * 
-     * @parameter
-     */
-    private List dependencyModelIds;
-    
-    /**
-     * The name of a metadata file to merge into the model for the current project.
-     * <p>
-     * This file is always loaded first, before any metadata from dependencies is
-     * loaded, and before scanning of the source directories for the current
-     * project is done.
-     * </p>
-     * <p>
-     * The specified filename is relative to the current working directory.
-     * </p>
-     * <p>
-     * Normally, this option is not used and any models that this project extends
-     * are simply automatically detected via scanning of the maven dependencies and
-     * loaded from the dependency jarfile. However there are a couple of situations
-     * where it is useful to specify an explicit metadata file to load instead.  
-     * </p>
-     * <p> 
-     * One example is when a project extends components in a project which was not
-     * built with the myfaces-builder-plugin (or where myfaces-builder-plugin
-     * support is only in a not-yet-released version). In this case, a metadata file
-     * can be created by hand (or generated from the unreleased trunk version) and
-     * explicitly loaded via this property.
-     * </p>
-     * <p>
-     * A second example is when it is necessary to add some custom model definitions to
-     * the model to be built, eg to override buggy or missing metadata in a project
-     * that this project extends. Of course this is hopefully not needed; it would be
-     * better to get a bugfix release of the parent project out instead!
-     * </p>
-     * 
-     * @parameter
-     */
-    private File inputFile;
-    
-    /**
-     * A comma separated list of file patterns to include when building the
-     * model.  i.e.  **\/*.java
-     * 
-     * @parameter
-     */
-    private String includes;
-    
-    /**
-     *  A comma separated list of file patterns to exclude when building the
-     *  model.  i.e.  **\/*.java
-     * @parameter
-     */
-    private String excludes;
-    
-    /**
-     * This param is used to search in this folder if some file to
-     * be generated exists and avoid generation and duplicate exception.
-     * 
-     * @since 1.0.4
-     * @parameter
-     */    
-    private List sourceDirectories;
-        
-    /**
-     * Create a metadata file containing information imported from other projects
-     * plus data extracted from annotated classes in this project.
-     */
-    public void execute() throws MojoExecutionException
-    {
-        try
-        {
-            // Tell Maven to add this directory to its "resources" path. 
-            // The maven-resources-plugin will then copy all the files
-            // from this directory to its own target directory, which is
-            // where the final jar artifact is built from.
-            addResourceRoot(project, targetDirectory.getCanonicalPath());
-        }
-        catch(IOException e)
-        {
-            throw new MojoExecutionException("Error during generation", e);
-        }
-        
-        List models = IOUtils.getModelsFromArtifacts(project); 
-        models = sortModels(models);
-
-        Model model = new Model();
-
-        if (inputFile != null)
-        {
-            // An explicitly-specified input model takes precedence
-            Model fileModel = IOUtils.loadModel(inputFile);
-            model.merge(fileModel);
-        }
-        
-        
-        for (Iterator it = models.iterator(); it.hasNext();)
-        {
-            Model artifactModel = (Model) it.next();
-            
-            if ((dependencyModelIds == null) || dependencyModelIds.contains(artifactModel.getModelId()))
-            {
-                model.merge(artifactModel);
-            }
-        }
-
-        if (sourceDirectories == null)
-        {
-            buildModel(model, project);
-        }
-        else
-        {
-            buildModel(model, sourceDirectories);
-        }
-        resolveReplacePackage(model);
-        
-        IOUtils.saveModel(model, new File(targetDirectory, outputFile));
-        
-        validateComponents(model);
-    }
-    
-    /**
-     * Order the models as specified by the modelIdOrder property.
-     * <p>
-     * Tomahawk sandbox depends from myfaces-api and tomahawk core, so
-     * the myfaces-metadata.xml of tomahawk core must be merged first
-     * and then myfaces-api.
-     * <p>
-     * In some cases, the same metadata can be imported multiple times.
-     * For example, Project A has metadata. Project B extends A, and
-     * Project C extends B. 
-     * 
-     * @param models
-     * @return
-     */
-    private List sortModels(List models)
-    {
-        if (orderModelIds == null)
-        {
-            //No changes
-            return models;
-        }
-        
-        Map modelsMap = new HashMap();
-        List modelsSorted = new ArrayList();
-
-        // First, put all models into a map keyed by modelId.
-        for (Iterator it = models.iterator(); it.hasNext();)
-        {
-            Model artifactModel = (Model) it.next();
-            modelsMap.put(artifactModel.getModelId(), artifactModel);
-        }
-
-        // now pull them out of the map in the order specified by orderModelIds.
-        for (Iterator it = orderModelIds.iterator(); it.hasNext();)
-        {
-            String modelId = (String) it.next();
-            
-            Model artifactModel = (Model) modelsMap.get(modelId);
-            if (artifactModel != null)
-            {
-                modelsMap.remove(modelId);
-                modelsSorted.add(artifactModel);
-            }
-        }
-
-        // and any of the ones that remain in the map (ie had no order specified)
-        // now get added to the end of the list.
-        modelsSorted.addAll(modelsMap.values());
-        
-        return modelsSorted;
-    }
-    
-    private void resolveReplacePackage(Model model)
-    {
-        if (replacePackagePrefixTagFrom == null ||
-                replacePackagePrefixTagTo == null)
-        {
-            return;
-        }
-        
-        List components = model.getComponents();
-        for (Iterator i = components.iterator(); i.hasNext();)
-        {
-            ComponentMeta comp = (ComponentMeta) i.next();
-            
-            if (comp.getTagClass() == null)
-            {
-                continue;
-            }
-            if (comp.getTagClass().startsWith(replacePackagePrefixTagFrom))
-            {
-                comp.setTagClass(StringUtils.replaceOnce(
-                        comp.getTagClass(), replacePackagePrefixTagFrom, replacePackagePrefixTagTo));
-            }
-        }
-    }
-    
-
-    /**
-     * Execute ModelBuilder classes to create the Model data-structure.
-     */
-    private Model buildModel(Model model, MavenProject project)
-            throws MojoExecutionException
-    {
-        try
-        {
-            QdoxModelBuilder builder = new QdoxModelBuilder();
-            model.setModelId(modelId);
-            builder.buildModel(model, project,includes,excludes);            
-            return model;
-        }
-        catch (BuildException e)
-        {
-            throw new MojoExecutionException("Unable to build metadata", e);
-        }
-    }
-    
-    private Model buildModel(Model model, List dirs)
-        throws MojoExecutionException
-    {
-        try
-        {
-            QdoxModelBuilder builder = new QdoxModelBuilder();
-            model.setModelId(modelId);
-            if (StringUtils.isNotEmpty(includes) || 
-                    StringUtils.isNotEmpty(excludes))
-            {
-                builder.buildModel(model, dirs, includes, excludes);
-            }
-            else
-            {
-                builder.buildModel(model, dirs);
-            }
-            return model;
-        }
-        catch (BuildException e)
-        {
-            throw new MojoExecutionException("Unable to build metadata", e);
-        }
-    }
-    
-    protected void addResourceRoot(MavenProject project, String resourceRoot)
-    {
-        List resources = project.getBuild().getResources();
-        Resource resource = new Resource();
-        resource.setDirectory(resourceRoot);
-        resources.add(resource);
-    }
-    
-    /**
-     * Check that each component is valid (has all mandatory properties etc).
-     * <p>
-     * Most sanity checks are best done after the myfaces-metadata.xml file
-     * is created, so that if an error occurs the file is available for the
-     * user to inspect. In particular, problems due to missing properties
-     * which are permitted to be inherited can be tricky to track down if
-     * the metadata file is not available.
-     * <p>
-     * TODO: make this gather up all the errors, then report them at once
-     * rather than stopping on the first error found.
-     */
-    private void validateComponents(Model model) throws MojoExecutionException
-    {
-        for(Iterator i = model.components(); i.hasNext(); )
-        {
-            ComponentMeta component = (ComponentMeta) i.next();
-            validateComponent(model, component);
-        }
-    }
-    
-    private void validateComponent(Model model, ComponentMeta component)
-    throws MojoExecutionException
-    {
-        if (component.getName() != null)
-        {
-            if (component.getDescription() == null)
-            {
-                throw new MojoExecutionException(
-                        "Missing mandatory property on component " + component.getClassName()
-                        + " [sourceClass=" + component.getSourceClassName() + "]: description");
-            }
-
-            if (component.getType() == null)
-            {
-                throw new MojoExecutionException(
-                        "Missing mandatory property on component " + component.getClassName()
-                        + " [sourceClass=" + component.getSourceClassName() + "]: type");
-            }
-            
-            // this is a concrete component, so it must have a family property
-            validateComponentFamily(model, component);
-        }
-    }
-    
-    private void validateComponentFamily(Model model, ComponentMeta component)
-    throws MojoExecutionException
-    {
-        // TODO: clean this code up, it is pretty ugly
-        boolean familyDefined = false;
-        ComponentMeta curr = component;
-        while ((curr != null) && !familyDefined)
-        {
-            if (curr.getFamily() != null)
-            {
-                familyDefined = true;
-            }
-            else
-            {
-                String parentName = curr.getParentClassName();
-                if (parentName == null)
-                {
-                    curr = null;
-                }
-                else
-                {
-                    curr = model.findComponentByClassName(parentName);
-                    if (curr == null)
-                    {
-                        throw new MojoExecutionException(
-                                "Parent class not found for component " + component.getClassName()
-                                + " [sourceClass=" + component.getSourceClassName() + "]");
-                    }
-                }
-            }
-        }
-        if (!familyDefined)
-        {
-            throw new MojoExecutionException(
-                "Missing mandatory property on component " + component.getClassName()
-                + " [sourceClass=" + component.getSourceClassName() + "]: family");
-        }
-    }
-}
diff --git a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/Flattener.java b/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/Flattener.java
deleted file mode 100644
index e622f15..0000000
--- a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/Flattener.java
+++ /dev/null
@@ -1,569 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.AttributeHolder;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.AttributeMeta;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.BehaviorMeta;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentMeta;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ConverterMeta;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.FaceletTagMeta;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.MethodSignatureMeta;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.Model;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ModelUtils;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.PropertyHolder;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.PropertyMeta;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.TagMeta;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ValidatorMeta;
-
-/**
- */
-public class Flattener
-{
-    private final Log log = LogFactory.getLog(Flattener.class);
-
-    private Model model;
-    private Set flattened = new HashSet();
-
-    public Flattener(Model model)
-    {
-        this.model = model;
-    }
-
-    /**
-     * Flatten the specified model.
-     * <p>
-     * In the flattened representation, each model object directly contains the
-     * data that it inherits from its parents, so that the getter methods return
-     * all available metadata, not just the data that was defined directly on
-     * that item.
-     */
-    public void flatten()
-    {
-        flattenComponentProperties();
-        flattenValidatorProperties();
-        flattenConverterProperties();
-        flattenBehaviorProperties();
-        flattenTagAttributes();
-        flattenFaceletTagAttributes();
-    }
-
-    private void flattenComponentProperties()
-    {
-        List components = model.getComponents();
-        for (Iterator i = components.iterator(); i.hasNext();)
-        {
-            ComponentMeta comp = (ComponentMeta) i.next();
-            flattenComponent(comp);
-        }
-    }
-
-    private void flattenComponent(ComponentMeta component)
-    {
-        if (flattened.contains(component))
-        {
-            // already done
-            return;
-        }
-        String parentClassName = component.getParentClassName();
-        if (parentClassName != null)
-        {
-            ComponentMeta parent = model
-                    .findComponentByClassName(parentClassName);
-            if (parent != null)
-            {
-                flattenComponent(parent);
-                component.merge(parent);
-            }
-            else
-            {
-                //How to manage a component that its
-                //parent class is not a real component?
-                //Use UIComponent instead and log a warn
-                //so if needed we can fix this.
-                log.warn("Component:"+component.getClassName()+
-                        " without a parent defined as component, using " +
-                        "UIComponent");
-                parent = model
-                    .findComponentByClassName("javax.faces.component.UIComponent");
-                flattenComponent(parent);
-                component.merge(parent);                
-            }
-        }
-
-        List interfaceClassNames = component.getInterfaceClassNames();
-        for (Iterator i = interfaceClassNames.iterator(); i.hasNext();)
-        {
-            String ifaceClassName = (String) i.next();
-            ComponentMeta iface = model
-                    .findComponentByClassName(ifaceClassName);
-            flattenComponent(iface);
-            component.merge(iface);
-        }
-
-        flattened.add(component);
-    }
-    
-    private void flattenValidatorProperties()
-    {
-        List validator = model.getValidators();
-        for (Iterator i = validator.iterator(); i.hasNext();)
-        {
-            ValidatorMeta val = (ValidatorMeta) i.next();
-            flattenValidator(val);
-        }
-    }
-    
-    private void flattenValidator(ValidatorMeta validator)
-    {
-        if (flattened.contains(validator))
-        {
-            // already done
-            return;
-        }
-        String parentClassName = validator.getParentClassName();
-        if (parentClassName != null)
-        {
-            ValidatorMeta parent = model
-                    .findValidatorByClassName(parentClassName);
-            if (parent != null)
-            {
-                flattenValidator(parent);
-                validator.merge(parent);
-            }
-            else
-            {
-                //How to manage a validator that its
-                //parent class is not a real validator?
-                //Ans: no problem, do nothing.
-            }
-        }
-
-        flattened.add(validator);
-    }
-
-    private void flattenConverterProperties()
-    {
-        List converter = model.getConverters();
-        for (Iterator i = converter.iterator(); i.hasNext();)
-        {
-            ConverterMeta val = (ConverterMeta) i.next();
-            flattenConverter(val);
-        }
-    }
-    
-    private void flattenConverter(ConverterMeta converter)
-    {
-        if (flattened.contains(converter))
-        {
-            // already done
-            return;
-        }
-        String parentClassName = converter.getParentClassName();
-        if (parentClassName != null)
-        {
-            ConverterMeta parent = model
-                    .findConverterByClassName(parentClassName);
-            if (parent != null)
-            {
-                flattenConverter(parent);
-                converter.merge(parent);
-            }
-            else
-            {
-                //How to manage a validator that its
-                //parent class is not a real validator?
-                //Ans: no problem, do nothing.
-            }
-        }
-
-        flattened.add(converter);
-    }
-    
-    private void flattenTagAttributes()
-    {
-        List tags = model.getTags();
-        for (Iterator i = tags.iterator(); i.hasNext();)
-        {
-            TagMeta val = (TagMeta) i.next();
-            flattenTag(val);
-        }
-    }
-    
-    /**
-     * This method allows component tag classes to be
-     * used with tags, so it is possible to inherit attribute
-     * for component tags. But tags cannot inherit
-     * attributes from other tags. 
-     *  
-     */
-    private void flattenTag(TagMeta tag)
-    {
-        if (flattened.contains(tag))
-        {
-            // already done
-            return;
-        }
-        
-        if (tag.getSourceClassParentClassName() == null)
-        {
-            //No need to scan
-            return;
-        }
-        ComponentMeta component = model.findComponentByTagClassName(
-                tag.getSourceClassParentClassName());
-        
-        if (null != component)
-        {
-            Collection propertyList = component.getPropertyList();
-            for (Iterator it = propertyList.iterator(); it.hasNext();)
-            {
-                PropertyMeta property = (PropertyMeta) it.next();
-                
-                //Just add all non tag excluded properties. 
-                if (!property.isTagExcluded().booleanValue())
-                {
-                    AttributeMeta attribute = new AttributeMeta();
-                    if (property.isMethodExpression())
-                    {
-                        attribute.setClassName("javax.el.MethodExpression");
-                        MethodSignatureMeta sig = property.getMethodBindingSignature();
-                        attribute.setDeferredMethodSignature(
-                                sig.getReturnType()+" myMethod("+sig.getParameterTypesAsString()+")");
-                    }
-                    else if (null == property.isRtexprvalue() || !property.isRtexprvalue().booleanValue())
-                    {
-                        attribute.setDeferredValueType(property.getClassName());
-                        attribute.setClassName("javax.el.ValueExpression");
-                    }
-                    else
-                    {
-                        //rtexprvalue = true, set className as expected
-                        attribute.setClassName(property.getClassName());
-                    }
-                    attribute.setRtexprvalue(property.isRtexprvalue());
-                    
-                    attribute.setDescription(property.getDescription());
-                    attribute.setLongDescription(property.getLongDescription());
-                    attribute.setName(property.getJspName());
-                    attribute.setRequired(property.isRequired());
-
-                    //just add attribute to tag
-                    AttributeMeta attributeInTag = tag.getAttribute(attribute.getName());
-                    
-                    if (attributeInTag != null)
-                    {
-                        //attributeInTag takes precedence, so 
-                        //we have to merge and copy
-                        attribute.merge(attributeInTag);
-                        attributeInTag.copy(attribute);
-                    }
-                    else
-                    {
-                        //Add it to tag
-                        tag.addAttribute(attribute);
-                    }
-                }
-            }
-        }
-        
-        flattened.add(tag);
-    }
-    
-    /**
-      * @since 1.0.4
-      **/
-    private void flattenFaceletTagAttributes()
-    {
-        List faceletTags = model.getFaceletTags();
-        for (Iterator i = faceletTags.iterator(); i.hasNext();)
-        {
-            FaceletTagMeta val = (FaceletTagMeta) i.next();
-            flattenFaceletTag(val);
-        }
-    }
-
-    /**
-     * @since 1.0.6
-     **/
-    private void flattenBehaviorProperties()
-    {
-        List behavior = model.getBehaviors();
-        for (Iterator i = behavior.iterator(); i.hasNext();)
-        {
-            BehaviorMeta val = (BehaviorMeta) i.next();
-            flattenBehavior(val);
-        }
-    }
-    
-    /**
-     * @since 1.0.6
-     **/
-    private void flattenBehavior(BehaviorMeta behavior)
-    {
-        if (flattened.contains(behavior))
-        {
-            // already done
-            return;
-        }
-        String parentClassName = behavior.getParentClassName();
-        if (parentClassName != null)
-        {
-            BehaviorMeta parent = model
-                    .findBehaviorByClassName(parentClassName);
-            if (parent != null)
-            {
-                flattenBehavior(parent);
-                behavior.merge(parent);
-            }
-            else
-            {
-                //How to manage a validator that its
-                //parent class is not a real validator?
-                //Ans: no problem, do nothing.
-            }
-        }
-
-        flattened.add(behavior);
-    }
-    
-    /**
-     * This method allows component facelet tag classes to be
-     * used with component and jsp tags, so it is possible to 
-     * inherit attribute for component. But facelet tags can inherit
-     * attributes from other facelet tags. 
-     * 
-     * @since 1.0.4
-     * 
-     */
-    private void flattenFaceletTag(FaceletTagMeta faceletTag)
-    {
-        if (flattened.contains(faceletTag))
-        {
-            // already done
-            return;
-        }
-          
-        if (faceletTag.getSourceClassParentClassName() == null)
-        {
-            //No need to scan
-            return;
-        }
-        
-        // In order of precedence
-        // 1. Merge base parent tag handler
-        String parentClassName = faceletTag.getParentClassName();
-        if (parentClassName != null)
-        {
-            FaceletTagMeta parent = model
-                    .findFaceletTagByClassName(parentClassName);
-            if (parent != null)
-            {
-                flattenFaceletTag(parent);
-                faceletTag.merge(parent);
-            }
-            else
-            {
-                //do nothing.
-            }
-        }
-        
-        //1.1 Mark all attributes on the facelets tag hierarchy as faceletsOnly
-        for (Iterator it = faceletTag.attributes(); it.hasNext();)
-        {
-            AttributeMeta a = (AttributeMeta) it.next();
-            a.setFaceletsOnly(Boolean.TRUE);
-        }
-
-        // 2. Merge from tag class
-        if (faceletTag.getTagClass() != null)
-        {
-            TagMeta tag = model.findTagByClassName(faceletTag.getTagClass());
-            
-            if (null != tag)
-            {
-                if (tag.getLongDescription() != null)
-                {
-                    faceletTag.setLongDescription(
-                            tag.getLongDescription()+"<p>"+faceletTag.getLongDescription()+"</p>");
-                }
-                if (tag.getDescription() != null)
-                {
-                    faceletTag.setDescription(
-                            tag.getDescription()+" "+faceletTag.getDescription());
-                }
-                ModelUtils.mergeAttributes(faceletTag, tag);
-            }
-        }
-
-        // 3. Merge from converter/validator/component class
-
-        if (faceletTag.getConverterClass() != null)
-        {
-            ConverterMeta converter = model.findConverterByClassName(
-                        faceletTag.getConverterClass());        
-            
-            if (null != converter)
-            {
-                if (converter.getLongDescription() != null)
-                {
-                    faceletTag.setLongDescription(
-                            converter.getLongDescription()+"<p>"+faceletTag.getLongDescription()+"</p>");
-                }
-                if (converter.getDescription() != null)
-                {
-                    faceletTag.setDescription(
-                            converter.getDescription()+" "+faceletTag.getDescription());
-                }
-                addOrMergePropertiesToAttributeHolder(faceletTag, converter);
-            }
-        }
-
-        if (faceletTag.getValidatorClass() != null)
-        {
-            ValidatorMeta validator = model.findValidatorByClassName(
-                        faceletTag.getValidatorClass());        
-            
-            if (null != validator)
-            {
-                if (validator.getLongDescription() != null)
-                {
-                    faceletTag.setLongDescription(
-                            validator.getLongDescription()+"<p>"+faceletTag.getLongDescription()+"</p>");
-                }
-                if (validator.getDescription() != null)
-                {
-                    faceletTag.setDescription(
-                            validator.getDescription()+" "+faceletTag.getDescription());
-                }
-                addOrMergePropertiesToAttributeHolder(faceletTag, validator);
-            }
-        }
-        
-        if (faceletTag.getBehaviorClass() != null)
-        {
-            BehaviorMeta behavior = model.findBehaviorByClassName(
-                        faceletTag.getBehaviorClass());
-            
-            if (null != behavior)
-            {
-                if (behavior.getLongDescription() != null)
-                {
-                    faceletTag.setLongDescription(
-                            behavior.getLongDescription()+"<p>"+faceletTag.getLongDescription()+"</p>");
-                }
-                if (behavior.getDescription() != null)
-                {
-                    faceletTag.setDescription(
-                            behavior.getDescription()+" "+faceletTag.getDescription());
-                }
-                addOrMergePropertiesToAttributeHolder(faceletTag, behavior);
-            }
-        }
-
-        if (faceletTag.getComponentClass() != null)
-        {
-            ComponentMeta component = model.findComponentByClassName(
-                        faceletTag.getComponentClass());        
-            
-            if (null != component)
-            {
-                if (component.getLongDescription() != null)
-                {
-                    faceletTag.setLongDescription(
-                            component.getLongDescription()+"<p>"+faceletTag.getLongDescription()+"</p>");
-                }
-                if (component.getDescription() != null)
-                {
-                    faceletTag.setDescription(
-                            component.getDescription()+" "+faceletTag.getDescription());
-                }
-                addOrMergePropertiesToAttributeHolder(faceletTag, component);
-            }
-        }
-                
-        flattened.add(faceletTag);
-    }
-    
-    /**
-      * @since 1.0.4
-      **/
-    private void addOrMergePropertiesToAttributeHolder(AttributeHolder attributeHolder, PropertyHolder propertyHolder)
-    {
-        Collection propertyList = propertyHolder.getProperties().values();
-        for (Iterator it = propertyList.iterator(); it.hasNext();)
-        {
-            PropertyMeta property = (PropertyMeta) it.next();
-            
-            //Just add all non tag excluded properties. 
-            if (!property.isTagExcluded().booleanValue())
-            {
-                AttributeMeta attribute = new AttributeMeta();
-                if (property.isMethodExpression())
-                {
-                    attribute.setClassName("javax.el.MethodExpression");
-                    MethodSignatureMeta sig = property.getMethodBindingSignature();
-                    attribute.setDeferredMethodSignature(
-                            sig.getReturnType()+" myMethod("+sig.getParameterTypesAsString()+")");
-                }
-                else if (null == property.isRtexprvalue() || !property.isRtexprvalue().booleanValue())
-                {
-                    attribute.setDeferredValueType(property.getClassName());
-                    attribute.setClassName("javax.el.ValueExpression");
-                }
-                else
-                {
-                    //rtexprvalue = true, set className as expected
-                    attribute.setClassName(property.getClassName());
-                }
-                attribute.setRtexprvalue(property.isRtexprvalue());
-                
-                attribute.setDescription(property.getDescription());
-                attribute.setLongDescription(property.getLongDescription());
-                attribute.setName(property.getJspName());
-                attribute.setRequired(property.isRequired());
-                attribute.setFaceletsOnly(property.isFaceletsOnly());
-
-                //just add attribute to tag
-                AttributeMeta attributeInTag = attributeHolder.getAttribute(attribute.getName());
-                
-                if (attributeInTag != null)
-                {
-                    //attributeInTag takes precedence, so 
-                    //we have to merge and copy
-                    attribute.merge(attributeInTag);
-                    attributeInTag.copy(attribute);
-                }
-                else
-                {
-                    //Add it to tag
-                    attributeHolder.addAttribute(attribute);
-                }
-            }
-        }       
-    }
-}
diff --git a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/IOUtils.java b/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/IOUtils.java
deleted file mode 100644
index 9c6e31c..0000000
--- a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/IOUtils.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.Writer;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.commons.digester.Digester;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.io.XmlWriter;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.Model;
-import org.xml.sax.SAXException;
-
-/**
- * Utilities to write a Model as xml, and read a Model in from xml.
- */
-public class IOUtils
-{
-    
-    private final static String MYFACES_METADATA = "META-INF/myfaces-metadata.xml";
-    
-    /**
-     * Write the contents of the model to an xml file.
-     */
-    public static void saveModel(Model model, File outfile)
-            throws MojoExecutionException
-    {
-        FileWriter writer = null;
-
-        try
-        {
-            outfile.getParentFile().mkdirs();
-
-            writer = new FileWriter(outfile);
-            writeModel(model, writer);
-        }
-        catch (IOException e)
-        {
-            throw new MojoExecutionException("Unable to save data", e);
-        }
-        finally
-        {
-            try
-            {
-                if (writer != null)
-                {
-                    writer.close();
-                }
-            }
-            catch (IOException e)
-            {
-                // ignore
-            }
-        }
-    }
-
-    /**
-     * Write the contents of the model to a provided Writer object.
-     */
-    public static void writeModel(Model model, Writer writer)
-            throws MojoExecutionException
-    {
-        try
-        {
-            writer.write("<?xml version='1.0' ?>\n");
-            PrintWriter pw = new PrintWriter(writer);
-            XmlWriter xmlWriter = new XmlWriter(pw);
-            Model.writeXml(xmlWriter, model);
-        }
-        catch (IOException e)
-        {
-            throw new MojoExecutionException("Unable to save data", e);
-        }
-    }
-
-    /**
-     * Read the contents of the model from an xml file.
-     */
-    public static Model loadModel(File infile) throws MojoExecutionException
-    {
-        FileReader reader = null;
-        try
-        {
-            reader = new FileReader(infile);
-            return readModel(reader);
-        }
-        catch (FileNotFoundException e)
-        {
-            throw new MojoExecutionException("No metadata file:" + infile);
-        }
-        finally
-        {
-            if (reader != null)
-            {
-                try
-                {
-                    reader.close();
-                }
-                catch (IOException e)
-                {
-                    // ignore
-                }
-            }
-        }
-    }
-    
-    public static boolean existsSourceFile(String filename, List sourceDirs)
-    {
-        boolean existsFile = false;            
-        for (int i = 0; i < sourceDirs.size(); i++)
-        {
-            String srcDir = (String) sourceDirs.get(i);
-            
-            //This directory that contains target/myfaces-builder-plugin/main
-            //is banned, all here is generated
-            //so we don't take a look at this directory
-            if (srcDir.matches(".*\\W+target\\W+myfaces-builder-plugin\\W+main\\W+.*"))
-            {
-                continue;
-            }                        
-            
-            File f = new File(srcDir,filename);
-            if (f.exists())
-            {
-                existsFile=true;
-                break;
-            }
-        }
-        return existsFile;
-    }
-    
-    public static Model getModelFromArtifact(Artifact artifact) 
-        throws MojoExecutionException
-    {
-        Model model = null;
-        File jarFile = artifact.getFile();
-
-        URLClassLoader archetypeJarLoader;
-
-        InputStream is = null;
-        try
-        {
-            URL[] urls = new URL[1];
-            urls[0] = jarFile.toURI().toURL();
-            archetypeJarLoader = new URLClassLoader(urls);
-
-            is = getStream(MYFACES_METADATA, archetypeJarLoader);
-
-            if (is != null)
-            {
-                Reader r = null;
-                try
-                {
-                    r = new InputStreamReader(is);
-                    model = readModel(r);
-                    r.close();
-                }
-                catch (IOException e)
-                {
-                    throw new MojoExecutionException(
-                            "Error reading myfaces-metadata.xml form "
-                                    + artifact.getFile().getName(), e);
-                }
-                finally
-                {
-                    if (r != null)
-                    {
-                        try
-                        {
-                            r.close();
-                        }
-                        catch (IOException e)
-                        {
-                            //ignore
-                        }
-                    }
-                }
-
-                System.out.println("Artifact: "
-                        + artifact.getFile().getName()
-                        + " have META-INF/myfaces-metadata.xml");
-            }
-        }
-        catch (IOException e)
-        {
-            throw new MojoExecutionException(
-                    "Error reading myfaces-metadata.xml form "
-                            + artifact.getFile().getName(), e);
-        }
-        finally
-        {
-            if (is != null)
-            {
-                try
-                {
-                    is.close();
-                }
-                catch (IOException ex)
-                {
-                    //ignore
-                }
-            }
-        }
-
-        return model;
-    }
-
-    /**
-     * Scan every jarfile that this maven project has a dependency on, looking for metadata files.
-     * <p>
-     * Each file found is loaded into memory as a Model object and added to the list.
-     */
-    public static List getModelsFromArtifacts(MavenProject project)
-            throws MojoExecutionException
-    {
-        List models = new ArrayList();
-        
-        for (Iterator it = project.getArtifacts().iterator(); it.hasNext();)
-        {
-
-            Artifact artifact = (Artifact) it.next();
-            
-            if ("compile".equals(artifact.getScope())
-                    || "provided".equals(artifact.getScope())
-                    || "system".equals(artifact.getScope()))
-            {
-                //This is safe since we have all depencencies on the
-                //pom, so they are downloaded first by maven.
-                File jarFile = artifact.getFile();
-
-                URLClassLoader archetypeJarLoader;
-
-                InputStream is = null;
-                try
-                {
-                    URL[] urls = new URL[1];
-                    urls[0] = jarFile.toURL();
-                    archetypeJarLoader = new URLClassLoader(urls);
-
-                    is = getStream(MYFACES_METADATA, archetypeJarLoader);
-
-                    if (is != null)
-                    {
-                        Reader r = null;
-                        try
-                        {
-                            r = new InputStreamReader(is);
-                            Model m = readModel(r);
-                            models.add(m);
-                            r.close();
-                        }
-                        catch (IOException e)
-                        {
-                            throw new MojoExecutionException(
-                                    "Error reading myfaces-metadata.xml form "
-                                            + artifact.getFile().getName(), e);
-                        }
-                        finally
-                        {
-                            if (r != null)
-                            {
-                                try
-                                {
-                                    r.close();
-                                }
-                                catch (IOException e)
-                                {
-                                    //ignore
-                                }
-                            }
-                        }
-
-                        System.out.println("Artifact: "
-                                + artifact.getFile().getName()
-                                + " have META-INF/myfaces-metadata.xml");
-                    }
-                }
-                catch (IOException e)
-                {
-                    throw new MojoExecutionException(
-                            "Error reading myfaces-metadata.xml form "
-                                    + artifact.getFile().getName(), e);
-                }
-                finally
-                {
-                    if (is != null)
-                    {
-                        try
-                        {
-                            is.close();
-                        }
-                        catch (IOException ex)
-                        {
-                            //ignore
-                        }
-                    }
-                }
-            }
-        }
-        return models;
-    }
-        
-    private static InputStream getStream( String name,
-            ClassLoader loader )
-    {
-        if ( loader == null )
-        {
-            return Thread.currentThread().getContextClassLoader().getResourceAsStream( name );
-        }
-        return loader.getResourceAsStream( name );
-    }
-    
-    /**
-     * Read the contents of the model from a provided Reader object.
-     */
-    public static Model readModel(Reader reader) throws MojoExecutionException
-    {
-        try
-        {
-            //Digester d = new Digester();
-            SAXParserFactory spf = SAXParserFactory.newInstance();
-            spf.setNamespaceAware(true);
-            // requires JAXP 1.3, in JavaSE 5.0
-            // spf.setXIncludeAware(true);
-            Digester d = new Digester(spf.newSAXParser());
-            d.setNamespaceAware(true);            
-
-            Model.addXmlRules(d);
-
-            d.parse(reader);
-
-            Model model = (Model) d.getRoot();
-            return model;
-        }
-        catch (IOException e)
-        {
-            throw new MojoExecutionException("Unable to load metadata", e);
-        }
-        catch (SAXException e)
-        {
-            throw new MojoExecutionException("Unable to load metadata", e);
-        }
-        catch (ParserConfigurationException e)
-        {
-            // TODO Auto-generated catch block
-            throw new MojoExecutionException("Unable to load parser", e);
-        }
-    }
-}
diff --git a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java b/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java
deleted file mode 100644
index c6588c5..0000000
--- a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java
+++ /dev/null
@@ -1,696 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentMeta;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.Model;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.BuildException;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.MavenPluginConsoleLogSystem;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.MyfacesUtils;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.context.Context;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.StringUtils;
-
-import com.thoughtworks.qdox.JavaDocBuilder;
-import com.thoughtworks.qdox.model.AbstractJavaEntity;
-import com.thoughtworks.qdox.model.Annotation;
-import com.thoughtworks.qdox.model.DocletTag;
-import com.thoughtworks.qdox.model.JavaClass;
-import com.thoughtworks.qdox.model.JavaField;
-import com.thoughtworks.qdox.model.JavaMethod;
-
-/**
- * Maven goal to generate java source code for Component classes.
- * 
- * <p>It uses velocity to generate templates, and has the option to define custom templates.</p>
- * <p>The executed template has the following variables available to it:</p>
- * <ul>
- *  <li>utils : Returns an instance of 
- *  org.apache.myfaces.buildtools.maven2.plugin.builder.utils.MyfacesUtils, 
- *  it contains some useful methods.</li>
- *  <li>component : Returns the current instance of
- *   org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentMeta</li>
- *  <li>innersource : code to be injected from the template class when template
- *  mode is used</li>  
- * </ul>
- * 
- * @version $Id$
- * @requiresDependencyResolution compile
- * @goal make-components
- * @phase generate-sources
- */
-public class MakeComponentsMojo extends AbstractMojo
-{
-    /**
-     * Injected Maven project.
-     * 
-     * @parameter expression="${project}"
-     * @readonly
-     */
-    private MavenProject project;
-
-    /**
-     * Defines the directory where the metadata file (META-INF/myfaces-metadata.xml) is loaded.
-     * 
-     * @parameter expression="${project.build.directory}/myfaces-builder-plugin/main/resources"
-     * @readonly
-     */
-    private File buildDirectory;
-
-    /**
-     * Injected name of file generated by earlier run of BuildMetaDataMojo goal.
-     * 
-     * @parameter
-     */
-    private String metadataFile = "META-INF/myfaces-metadata.xml";
-
-    /**
-     * The directory used to load templates into velocity environment.
-     * 
-     * @parameter expression="src/main/resources/META-INF"
-     */
-    private File templateSourceDirectory;
-
-    /**
-     * The directory where all generated files are created. This directory is added as a
-     * compile source root automatically like src/main/java is. 
-     * 
-     * @parameter expression="${project.build.directory}/myfaces-builder-plugin/main/java"
-     */
-    private File generatedSourceDirectory;
-
-    /**
-     * Generate only component classes that starts with the specified package prefix. 
-     * 
-     * @parameter
-     */
-    private String packageContains;
-
-    /**
-     * Generate only component classes that starts with the specified component type prefix. 
-     * 
-     * @parameter
-     */
-    private String typePrefix;
-
-    /**
-     *  Log and continue execution when generating component classes.
-     *  <p>
-     *  If this property is set to false (default), errors when a component class is generated stops
-     *  execution immediately.
-     *  </p>
-     * 
-     * @parameter
-     */
-    private boolean force;
-
-    /**
-     * Defines the jsf version (1.1 or 1.2), used to take the default templates for each version.
-     * <p> 
-     * If version is 1.1, the default templateComponentName is 'componentClass11.vm', if version
-     * is 1.2 the default templateComponentName is 'componentClass12.vm', if version is 2.0 the
-     * default templateComponentName is 'componentClass20.vm'
-     * </p>
-     * 
-     * @parameter
-     */
-    private String jsfVersion;
-    
-    /**
-     * Define the models that should be included when generate component classes. If not set, the
-     * current model identified by the artifactId is used.
-     * <p>
-     * Each model built by build-metadata goal has a modelId, that by default is the artifactId of
-     * the project. Setting this property defines which objects tied in a specified modelId should
-     * be taken into account.  
-     * </p>
-     * <p>In this case, limit component generation only to the components defined in the models 
-     * identified by the modelId defined. </p>
-     * <p>This is useful when you need to generate files that take information defined on other
-     * projects</p>
-     * <p>Example:</p>
-     * <pre>
-     *    &lt;modelIds&gt;
-     *        &lt;modelId>model1&lt;/modelId&gt;
-     *        &lt;modelId>model2&lt;/modelId&gt;
-     *    &lt;/modelIds&gt;
-     * </pre>
-     * 
-     * @parameter
-     */
-    private List modelIds;
-
-    /**
-     * The name of the template used to generate component classes. According to the value on 
-     * jsfVersion property the default if this property is not set could be componentClass11.vm (1.1) or
-     * componentClass12.vm (1.2)
-     * 
-     * @parameter 
-     */
-    private String templateComponentName;
-    
-    /**
-     * This param is used to search in this folder if some file to
-     * be generated exists and avoid generation and duplicate exception.
-     * 
-     * @parameter expression="src/main/java"
-     */    
-    private File mainSourceDirectory;
-    
-    /**
-     * This param is used to search in this folder if some file to
-     * be generated exists and avoid generation and duplicate exception.
-     * 
-     * @parameter
-     */        
-    private File mainSourceDirectory2;
-
-    /**
-     * Execute the Mojo.
-     */
-    public void execute() throws MojoExecutionException
-    {
-        // This command makes Maven compile the generated source:
-        // getProject().addCompileSourceRoot( absoluteGeneratedPath.getPath() );
-        
-        try
-        {
-            project.addCompileSourceRoot( generatedSourceDirectory.getCanonicalPath() );
-            
-            if (modelIds == null)
-            {
-                modelIds = new ArrayList();
-                modelIds.add(project.getArtifactId());
-            }
-            Model model = IOUtils.loadModel(new File(buildDirectory,
-                    metadataFile));
-            new Flattener(model).flatten();
-            generateComponents(model);
-        }
-        catch (IOException e)
-        {
-            throw new MojoExecutionException("Error generating components", e);
-        }
-        catch (BuildException e)
-        {
-            throw new MojoExecutionException("Error generating components", e);
-        }
-    }
-    
-    
-    private VelocityEngine initVelocity() throws MojoExecutionException
-    {
-        File template = new File(templateSourceDirectory, _getTemplateName());
-        
-        if (template.exists())
-        {
-            getLog().info("Using template from file loader: "+template.getPath());
-        }
-        else
-        {
-            getLog().info("Using template from class loader: META-INF/"+_getTemplateName());
-        }
-                
-        VelocityEngine velocityEngine = null;
-        try
-        {
-            velocityEngine = new VelocityEngine();
-            velocityEngine.setProperty( "resource.loader", "file, class" );
-            velocityEngine.setProperty( "file.resource.loader.class",
-                    "org.apache.velocity.runtime.resource.loader.FileResourceLoader");
-            velocityEngine.setProperty( "file.resource.loader.path", templateSourceDirectory.getPath());
-            velocityEngine.setProperty( "class.resource.loader.class",
-                    "org.apache.myfaces.buildtools.maven2.plugin.builder.utils.RelativeClasspathResourceLoader" );
-            velocityEngine.setProperty( "class.resource.loader.path", "META-INF");            
-            velocityEngine.setProperty( "velocimacro.library", "componentClassMacros11.vm");
-            velocityEngine.setProperty( "velocimacro.permissions.allow.inline","true");
-            velocityEngine.setProperty( "velocimacro.permissions.allow.inline.local.scope", "true");
-            velocityEngine.setProperty( "directive.foreach.counter.initial.value","0");
-            //velocityEngine.setProperty( RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
-            //    "org.apache.myfaces.buildtools.maven2.plugin.builder.utils.ConsoleLogSystem" );
-            
-            velocityEngine.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM,
-                    new MavenPluginConsoleLogSystem(this.getLog()));
-            velocityEngine.init();
-        }
-        catch (Exception e)
-        {
-            throw new MojoExecutionException("Error creating VelocityEngine", e);
-        }
-        
-        return velocityEngine;
-    }
-    
-
-    /**
-     * Generates parsed components.
-     */
-    private void generateComponents(Model model) throws IOException,
-            MojoExecutionException
-    {
-        // Make sure generated source directory 
-        // is added to compilation source path 
-        //project.addCompileSourceRoot(generatedSourceDirectory.getCanonicalPath());
-        
-        //Init Qdox for extract code 
-        JavaDocBuilder builder = new JavaDocBuilder();
-        
-        List sourceDirs = project.getCompileSourceRoots();
-        
-        // need a File object representing the original source tree
-        for (Iterator i = sourceDirs.iterator(); i.hasNext();)
-        {
-            String srcDir = (String) i.next();
-            builder.addSourceTree(new File(srcDir));
-        }        
-        
-        //Init velocity
-        VelocityEngine velocityEngine = initVelocity();
-
-        VelocityContext baseContext = new VelocityContext();
-        baseContext.put("utils", new MyfacesUtils());
-        
-        for (Iterator it = model.getComponents().iterator(); it.hasNext();)
-        {
-            ComponentMeta component = (ComponentMeta) it.next();
-            
-            if (component.getClassName() != null)
-            {
-                File f = new File(mainSourceDirectory, StringUtils.replace(
-                    component.getClassName(), ".", "/")+".java");
-                                
-                if (!f.exists() && canGenerateComponent(component))
-                {
-                    if (mainSourceDirectory2 != null)
-                    {
-                        File f2 = new File(mainSourceDirectory2, StringUtils.replace(
-                                component.getClassName(), ".", "/")+".java");
-                        if (f2.exists())
-                        {
-                            //Skip
-                            continue;
-                        }
-                    }
-                    getLog().info("Generating component class:"+component.getClassName());
-                    
-                    try 
-                    {
-                        _generateComponent(velocityEngine, builder,component,baseContext);
-                    }
-                    catch(MojoExecutionException e)
-                    {
-                        if (force)
-                        {
-                            getLog().error(e.getMessage());
-                        }
-                        else
-                        {
-                            //Stop execution throwing exception
-                            throw e;
-                        }
-                    }
-                }
-            }
-        }        
-    }
-    
-    public boolean canGenerateComponent(ComponentMeta component)
-    {
-        if ( modelIds.contains(component.getModelId())
-                && includePackage(component)
-                && includeType(component))
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    
-    public boolean includePackage(ComponentMeta component)
-    {
-        if (packageContains != null)
-        {
-            if (MyfacesUtils.getPackageFromFullClass(component.getClassName()).startsWith(packageContains))
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-        else
-        {
-            return true;
-        }        
-    }
-
-    public boolean includeType(ComponentMeta component)
-    {
-        if (typePrefix != null)
-        {
-            if (component.getType().startsWith(typePrefix))
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-        else
-        {
-            return true;
-        }        
-    }
-    
-    
-    /**
-     * Generates a parsed component.
-     * 
-     * @param component
-     *            the parsed component metadata
-     */
-    private void _generateComponent(VelocityEngine velocityEngine,
-            JavaDocBuilder builder,
-            ComponentMeta component, VelocityContext baseContext)
-            throws MojoExecutionException
-    {
-        Context context = new VelocityContext(baseContext);
-        context.put("component", component);
-
-        if (Boolean.TRUE.equals(component.isTemplate()))
-        {
-            String source = this.getInnerSourceCode(builder, component);
-            
-            if (source != null && !"".equals(source))
-            {
-                context.put("innersource", source);
-            }
-        }        
-        
-        Writer writer = null;
-        File outFile = null;
-
-        try
-        {
-            outFile = new File(generatedSourceDirectory, StringUtils.replace(
-                    component.getClassName(), ".", "/")+".java");
-
-            if ( !outFile.getParentFile().exists() )
-            {
-                outFile.getParentFile().mkdirs();
-            }
-
-            writer = new OutputStreamWriter(new FileOutputStream(outFile));
-
-            Template template = velocityEngine.getTemplate(_getTemplateName());
-                        
-            template.merge(context, writer);
-
-            writer.flush();
-        }
-        catch (Exception e)
-        {
-            throw new MojoExecutionException(
-                    "Error merging velocity templates: " + e.getMessage(), e);
-        }
-        finally
-        {
-            IOUtil.close(writer);
-            writer = null;
-        }
-    }
-        
-    /**
-     * This method extract from component scanned sourceClass, the parts
-     * which we need to move to generated class as a single String using Qdox.
-     * 
-     * Ignore code that has a \@JSFExclude or \@JSFProperty Doclet or Annotation
-     * 
-     * @param component
-     * @return
-     */
-    private String getInnerSourceCode(JavaDocBuilder builder, ComponentMeta component)
-    {   
-        StringWriter writer = new StringWriter();
-        
-        JavaClass sourceClass = builder.getClassByName(component.getSourceClassName());
-        
-        JavaField [] fields = sourceClass.getFields();
-
-        //Include the fields defined
-        for (int i = 0; i < fields.length; i++)
-        {            
-            JavaField field = fields[i];
-            
-            DocletTag tag = field.getTagByName("JSFExclude");
-            Annotation anno = getAnnotation(field, "JSFExclude");
-            
-            if (!(tag == null && anno == null))
-            {
-                continue;
-            }
-                        
-            if (!isExcludedField(field.getName()))
-            {
-                writer.write("    ");
-                writer.write(field.getDeclarationSignature(true));
-                String initExpr = field.getInitializationExpression();
-                initExpr = cleanInitializationExpression(initExpr);
-                if (initExpr != null)
-                {
-                    writer.write(" = ");
-                    writer.write(initExpr);
-                }                
-                writer.write(';');
-                writer.write('\n');
-            }
-        }
-        
-        JavaMethod [] methods = sourceClass.getMethods();
-        for (int i = 0; i < methods.length; i++)
-        {
-            JavaMethod method = methods[i];
-
-            DocletTag tag = method.getTagByName("JSFExclude");
-            Annotation anno = getAnnotation(method, "JSFExclude");
-            
-            if (!(tag == null && anno == null))
-            {
-                continue;
-            }
-            
-            tag = method.getTagByName("JSFProperty", false);
-            anno = getAnnotation(method, "JSFProperty");
-            
-            if ( (tag == null && anno == null) || !method.isAbstract())
-            {              
-                //Get declaration signature in a way that we don't need
-                //to declare imports.
-                String declaration = method.getDeclarationSignature(true);
-                                
-                writer.write("    ");
-                writer.write(declaration);
-                String sourceCode = method.getSourceCode();
-                if(sourceCode != null && sourceCode.length() > 0)
-                {
-                    writer.write('\n');
-                    writer.write("    ");
-                    writer.write('{');
-                    writer.write(method.getSourceCode());
-                    writer.write('}');
-                    writer.write('\n');
-                    writer.write('\n');
-                }
-                else
-                {
-                    writer.write(';');
-                    writer.write('\n');
-                }
-            }
-            
-        }
-                
-        return writer.toString();
-    }
-    
-    private boolean isExcludedField(String name)
-    {
-        return (name.equals("COMPONENT_TYPE") || 
-                name.equals("DEFAULT_RENDERER_TYPE") ||
-                name.equals("COMPONENT_FAMILY") );
-    }
-
-    /**
-     * Clean up a field initialisation expression returned by qdox.
-     * <p>
-     * When a class has "int foo = 1;" then the initialisation expression
-     * is the bit after the equals sign. Unfortunately qdox tends to return
-     * a lot of garbage stuff in there. In particular, if there is no
-     * initialisation expression, then qdox can return a string with
-     * whitespace (not a null or empty string). 
-     * <p>
-     * In addition, if there are comments *before* a field declaration,
-     * they appear inside the initialisation text (this is just broken
-     * behaviour in qdox). Ideally we would move them to above the field
-     * declaration where they belong. However that is complicated and
-     * fragile, so we just discard them here.
-     */
-    static String cleanInitializationExpression(String expr)
-    {
-        expr = StringUtils.trim(expr);
-        if (StringUtils.isEmpty(expr))
-        {
-            return null;
-        }
-        
-        // split on linefeeds
-        // trim each separately
-        // remove any comment chars
-        
-        if (expr.indexOf("\n") > -1)
-        {
-            StringBuffer buf = new StringBuffer(100);
-            String[] lines = StringUtils.split(expr, "\n");
-            for(int i=0; i<lines.length; ++i)
-            {
-                String line = lines[i];
-                line = StringUtils.trim(line);
-                if (!line.startsWith("//") && !StringUtils.isEmpty(line))
-                {
-                    if (buf.length()> 0)
-                    {
-                        buf.append(" ");
-                    }
-                    buf.append(line);
-                }
-            }
-            
-            expr = buf.toString();
-        }
-        
-        if (expr.startsWith("//"))
-        {
-            return null;
-        }
-
-        if (StringUtils.isEmpty(expr))
-        {
-            return null;
-        }
-
-        return expr;
-    }
-
-    /**
-     * TODO: Copied from QdoxModelBuilder!
-     * 
-     * @param entity
-     * @param annoName
-     * @return
-     */
-    private Annotation getAnnotation(AbstractJavaEntity entity, String annoName)
-    {
-        Annotation[] annos = entity.getAnnotations();
-        if (annos == null)
-        {
-            return null;
-        }
-        // String wanted = ANNOTATION_BASE + "." + annoName;
-        for (int i = 0; i < annos.length; ++i)
-        {
-            Annotation thisAnno = annos[i];
-            // Ideally, here we would check whether the fully-qualified name of
-            // the annotation
-            // class matches ANNOTATION_BASE + "." + annoName. However it
-            // appears that qdox 1.6.3
-            // does not correctly expand @Foo using the class import statements;
-            // method
-            // Annotation.getType.getJavaClass.getFullyQualifiedName still just
-            // returns the short
-            // class name. So for now, just check for the short name.
-            String thisAnnoName = thisAnno.getType().getJavaClass().getName();
-            
-            //Make short name for recognizing, if returns long
-            int containsPoint = thisAnnoName.lastIndexOf('.');
-            if (containsPoint != -1)
-            {
-                thisAnnoName = thisAnnoName.substring(containsPoint+1);
-            }
-            if (thisAnnoName.equals(annoName))
-            {
-                return thisAnno;
-            }
-        }
-        return null;
-    }    
-
-    private String _getTemplateName()
-    {
-        if (templateComponentName == null)
-        {
-            if (_is20())
-            {
-                return "componentClass20.vm";
-            }
-            else if (_is12())
-            {
-                return "componentClass12.vm";
-            }
-            else
-            {
-                return "componentClass11.vm";
-            }
-        }
-        else
-        {
-            return templateComponentName;
-        }
-    }
-    
-    private boolean _is12()
-    {
-        return "1.2".equals(jsfVersion) || "12".equals(jsfVersion);
-    }
-    
-    private boolean _is20()
-    {
-        return "2.0".equals(jsfVersion) || "20".equals(jsfVersion);
-    }
-}
diff --git a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConfigMojo.java b/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConfigMojo.java
deleted file mode 100644
index bb28480..0000000
--- a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConfigMojo.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.Model;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.BuildException;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.MavenPluginConsoleLogSystem;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.MyfacesUtils;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.exception.ParseErrorException;
-import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
-import org.codehaus.plexus.util.xml.Xpp3DomWriter;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-
-/**
- * Creates taglib (tld) and faces-config files.
- * <p>
- * This Mojo actually provides a generic goal that will run a configurable
- * velocity template file and generate a single output file. The template is
- * passed the full metadata model object, and can select from the model whatever
- * data it wants.
- * </p>
- * <p>
- * The execution can be configured with:
- * <ul>
- * <li>The name of the input template to be executed</li>
- * <li>The name of the output file to be created</li>
- * <li>Any number of variables which are accessable from the template
- * (string values only)</li>
- * </ul>
- * </p>
- * <p>
- * The executed template has the following variables available to it:
- * <ul>
- * <li>model: the full metadata model for this project</li>
- * <li>modelIds: specifies which items from the model should be processed</li>
- * <li>baseContent: the full text of the contents of the "xmlBaseFile" (if any)</li>
- * <li>utils: an instance of MyfacesUtils that provides static helper methods</li>
- * <li>and whatever (name,value) pairs were configured via the "params" property
- * of this mojo.</li>
- * </ul>
- * </p>
- * 
- * @requiresDependencyResolution compile
- * @goal make-config
- * @phase generate-sources
- */
-public class MakeConfigMojo extends AbstractMojo
-{
-    /**
-     * The current maven project (auto-injected by Maven).
-     * 
-     * @parameter expression="${project}"
-     * @readonly
-     */
-    private MavenProject project;
-
-    /**
-     * Defines the directory where the metadata file (META-INF/myfaces-metadata.xml) is loaded,
-     * and the generated file named by xmlFile parameter is created. 
-     * 
-     * @parameter expression="${project.build.directory}/myfaces-builder-plugin/main/resources"
-     * @readonly
-     */
-    private File buildDirectory;
-
-    /**
-     * Defines the directory where the resource will be output. 
-     * 
-     * @since 1.0.4
-     * @parameter expression="${project.build.directory}/myfaces-builder-plugin/main/resources"
-     */
-    private File outputDirectory;
-    
-    /**
-     * Name of the file from which the metadata model passed to the
-     * template will be read. This file is typically generated by an earlier
-     * execution of the BuildMetaDataMojo goal for the same maven project.
-     * 
-     * @parameter
-     */
-    private String metadataFile = "META-INF/myfaces-metadata.xml";
-
-    /**
-     * Specifies the name of the output file to be created.
-     * 
-     * @parameter
-     */
-    private String xmlFile = "META-INF/faces-config.xml";
-    
-    /**
-     * A list of metadata model ids.
-     * <p>
-     * If not defined, then this defaults to a list containing just one string whose
-     * value is the same as the current maven project's artifactId.
-     * </p>
-     * <p>
-     * The complete metadata model is passed to the velocity template. This contains 
-     * data about not just the model items defined in the calling project, but also
-     * about items imported from other projects. Each item in the model is
-     * labelled with a "model id" indicating which project it was defined by.
-     * </p>
-     * <p>
-     * This list of model ids is also passed to the template. The template can
-     * then use that data to select the relevant items from the full model.
-     * </p>
-     * 
-     * @parameter
-     */
-    private List modelIds;
-            
-    /**
-     * The base directory used when resolving references to external files from
-     * velocity #include and #parse commands within the executed template.
-     * 
-     * @parameter expression="src/main/resources/META-INF"
-     */
-    private File templateSourceDirectory;
-    
-    /**
-     * When defined, specifies an xml file whose top-level elements are to be copied
-     * directly into the created file.
-     * <p>
-     * This allows a hand-written file to be created containing data that cannot be
-     * automatically generated. All content beneath the root element of the specified
-     * file (but not the root element itself) is placed into a Velocity variable
-     * named "baseContent" that the template can reference.
-     * </p>
-     * <p>
-     * The template can do whatever it wants with this variable, but it is expected
-     * that the template will simply output this immediately after writing the
-     * root element of the output xml file.
-     * file.
-     * </p>
-     * <p>
-     * Note that any attributes or namespaces defined on the root element of the
-     * xmlBaseFile are ignored.
-     * </p>
-     * 
-     * @parameter expression="src/main/conf/META-INF/faces-config-base.xml"
-     */    
-    private File xmlBaseFile;
-
-    /**
-     * Specifies the Velocity template file to be executed.
-     * 
-     * @parameter expression="faces-config11.vm"
-     */
-    private String templateFile;
-    
-    /**
-     * A map of (name, value) pairs to be made available as Velocity variables
-     * for the executed template to access.
-     * 
-     * @parameter
-     */
-    private Map params;
-        
-    /**
-     * Execute the Mojo.
-     * <p>
-     * The metadata model is loaded, and the specified template is executed with
-     * any template output being written to the specified output file.
-     * </p>
-     */
-    public void execute() throws MojoExecutionException
-    {
-        try
-        {
-            if (modelIds == null)
-            {
-                modelIds = new ArrayList();
-                modelIds.add(project.getArtifactId());
-            }
-
-            // Load the metadata file from an xml file (presumably generated
-            // by an earlier execution of the build-metadata goal.
-            Model model = IOUtils.loadModel(new File(buildDirectory,
-                    metadataFile));
-
-            // Flatten the model so that the template can access every property
-            // of each model item directly, even when the property is actually
-            // defined on an ancestor class or interface.
-            new Flattener(model).flatten();
-
-            generateConfigFromVelocity(model);
-        }
-        catch (IOException e)
-        {
-            throw new MojoExecutionException("Error during config generation", e);
-        }
-        catch (BuildException e)
-        {
-            throw new MojoExecutionException("Error during config generation", e);
-        }
-    }
-    
-    private void generateConfigFromVelocity(Model model) throws IOException,
-        MojoExecutionException
-    {    
-        VelocityEngine velocityEngine = initVelocity();
-
-        VelocityContext baseContext = new VelocityContext();
-        baseContext.put("utils", new MyfacesUtils());
-        
-        String baseContent = "";
-        
-        if (xmlBaseFile != null && xmlBaseFile.exists())
-        {
-            getLog().info("using base content file: "+xmlBaseFile.getPath());
-            
-            Reader reader = null;
-            try
-            {
-                reader = new FileReader(xmlBaseFile);
-                Xpp3Dom root = Xpp3DomBuilder.build(reader);
-                
-                StringWriter writer = new StringWriter();
-                
-                Xpp3Dom [] children = root.getChildren();
-                
-                for (int i = 0; i< children.length; i++)
-                {
-                    Xpp3Dom dom = children[i];
-                    Xpp3DomWriter.write(writer, dom);
-                    writer.write('\n');
-                }
-                baseContent = writer.toString();
-                writer.close();
-            }
-            catch (XmlPullParserException e)
-            {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-            finally
-            {
-                reader.close();
-            }
-        }
-        
-        baseContext.put("baseContent", baseContent);
-        
-        baseContext.put("model", model);
-        
-        baseContext.put("modelIds", modelIds);
-        
-        if (params != null)
-        {
-            //Load all parameters to the context, so the template can
-            //load it. This allow to generate any config file we want
-            //(faces-config, tld, facelet,....)
-            for (Iterator it = params.keySet().iterator(); it.hasNext();)
-            {
-                String key = (String) it.next();
-                baseContext.put(key,params.get(key));
-            }
-        }
-        
-        Writer writer = null;
-        File outFile = null;
-        
-        try
-        {
-            outFile = new File(outputDirectory, xmlFile);
-            
-            if ( !outFile.getParentFile().exists() )
-            {
-                outFile.getParentFile().mkdirs();
-            }
-            
-            writer = new OutputStreamWriter(new FileOutputStream(outFile));
-            
-            Template template = velocityEngine.getTemplate(templateFile);
-            
-            template.merge(baseContext, writer);
-
-            writer.flush();
-        }
-        catch (ResourceNotFoundException e)
-        {
-            throw new MojoExecutionException(
-                    "Error merging velocity templates: " + e.getMessage(), e);
-        }
-        catch (ParseErrorException e)
-        {
-            throw new MojoExecutionException(
-                    "Error merging velocity templates: " + e.getMessage(), e);
-        }
-        catch (Exception e)
-        {
-            throw new MojoExecutionException(
-                    "Error merging velocity templates: " + e.getMessage(), e);
-        }
-        finally
-        {
-            IOUtil.close(writer);
-            writer = null;
-        }        
-    }
-
-    private VelocityEngine initVelocity() throws MojoExecutionException
-    {
-        VelocityEngine velocityEngine = new VelocityEngine();
-                
-        try
-        {
-            velocityEngine.setProperty( "resource.loader", "file, class" );
-            velocityEngine.setProperty( "file.resource.loader.class",
-                    "org.apache.velocity.runtime.resource.loader.FileResourceLoader");
-            velocityEngine.setProperty( "file.resource.loader.path", templateSourceDirectory.getPath());
-            velocityEngine.setProperty( "class.resource.loader.class",
-                    "org.apache.myfaces.buildtools.maven2.plugin.builder.utils.RelativeClasspathResourceLoader" );
-            velocityEngine.setProperty( "class.resource.loader.path", "META-INF");            
-            velocityEngine.setProperty( "velocimacro.library", "xmlMacros.vm");
-            velocityEngine.setProperty( "velocimacro.permissions.allow.inline","true");
-            velocityEngine.setProperty( "velocimacro.permissions.allow.inline.local.scope", "true");
-            velocityEngine.setProperty( "directive.foreach.counter.initial.value","0");
-            //velocityEngine.setProperty( RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
-            //"org.apache.myfaces.buildtools.maven2.plugin.builder.utils.ConsoleLogSystem" );
-
-            velocityEngine.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM,
-                    new MavenPluginConsoleLogSystem(this.getLog()));
-
-            velocityEngine.init();
-        }
-        catch (Exception e)
-        {
-            throw new MojoExecutionException("Error creating VelocityEngine", e);
-        }
-        
-        return velocityEngine;
-    }
-    
-}
diff --git a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConverterTagsMojo.java b/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConverterTagsMojo.java
deleted file mode 100644
index f89cf04..0000000
--- a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConverterTagsMojo.java
+++ /dev/null
@@ -1,444 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ConverterMeta;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.Model;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.BuildException;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.MavenPluginConsoleLogSystem;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.MyfacesUtils;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.context.Context;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.StringUtils;
-
-/**
- * Maven goal to generate java source code for Component tag classes.
- * 
- * <p>It uses velocity to generate templates, and has the option to define custom templates.</p>
- * <p>The executed template has the following variables available to it:</p>
- * <ul>
- *  <li>utils : Returns an instance of 
- *  org.apache.myfaces.buildtools.maven2.plugin.builder.utils.MyfacesUtils, 
- *  it contains some useful methods.</li>
- *  <li>converter : Returns the current instance of
- *   org.apache.myfaces.buildtools.maven2.plugin.builder.model.ConverterMeta</li>
- * </ul>
- * 
- * @version $Id$
- * @requiresDependencyResolution compile
- * @goal make-converter-tags
- * @phase generate-sources
- */
-public class MakeConverterTagsMojo extends AbstractMojo
-{
-    /**
-     * Injected Maven project.
-     * 
-     * @parameter expression="${project}"
-     * @readonly
-     */
-    private MavenProject project;
-
-    /**
-     * Defines the directory where the metadata file (META-INF/myfaces-metadata.xml) is loaded.
-     * 
-     * @parameter expression="${project.build.directory}/myfaces-builder-plugin/main/resources"
-     * @readonly
-     */
-    private File buildDirectory;
-
-    /**
-     * Injected name of file generated by earlier run of BuildMetaDataMojo goal.
-     * 
-     * @parameter
-     */
-    private String metadataFile = "META-INF/myfaces-metadata.xml";
-
-    /**
-     * The directory used to load templates into velocity environment.
-     * 
-     * @parameter expression="src/main/resources/META-INF"
-     */
-    private File templateSourceDirectory;
-    
-    /**
-     * This param is used to search in this folder if some file to
-     * be generated exists and avoid generation and duplicate exception.
-     * 
-     * @parameter expression="src/main/java"
-     */    
-    private File mainSourceDirectory;
-
-    /**
-     * This param is used to search in this folder if some file to
-     * be generated exists and avoid generation and duplicate exception.
-     * 
-     * @parameter
-     */        
-    private File mainSourceDirectory2;
-
-    /**
-     * The name of the template used to generate converter tag classes. According to the value on 
-     * jsfVersion property the default if this property is not set could be tagConverterClass11.vm (1.1) or
-     * tagConverterClass12.vm (1.2)
-     * 
-     * @parameter 
-     */
-    private String templateTagName;
-
-    /**
-     * The directory where all generated files are created. This directory is added as a
-     * compile source root automatically like src/main/java is. 
-     * 
-     * @parameter expression="${project.build.directory}/myfaces-builder-plugin/main/java"
-     * @required
-     */
-    private File generatedSourceDirectory;
-
-    /**
-     * Only generate tag classes that contains that package prefix
-     * 
-     * @parameter
-     */
-    private String packageContains;
-
-    /**
-     * Only generate tag classes that its component starts with this type prefix
-     * 
-     * @parameter
-     */
-    private String typePrefix;
-    
-    /**
-     *  Log and continue execution when generating converter tag classes.
-     *  <p>
-     *  If this property is set to false (default), errors when a converter tag class is generated stops
-     *  execution immediately.
-     *  </p>
-     * 
-     * @parameter
-     */
-    private boolean force;
-
-    /**
-     * Defines the jsf version (1.1 or 1.2), used to take the default templates for each version.
-     * <p> 
-     * If version is 1.1, the default templateTagName is 'tagConverterClass11.vm' and if version
-     * is 1.2 the default templateTagName is 'tagConverterClass12.vm'.
-     * </p>
-     * 
-     * @parameter
-     */
-    private String jsfVersion;
-    
-    /**
-     * Define the models that should be included when generate converter tag classes. If not set, the
-     * current model identified by the artifactId is used.
-     * <p>
-     * Each model built by build-metadata goal has a modelId, that by default is the artifactId of
-     * the project. Setting this property defines which objects tied in a specified modelId should
-     * be taken into account.  
-     * </p>
-     * <p>In this case, limit converter tag generation only to the components defined in the models 
-     * identified by the modelId defined. </p>
-     * <p>This is useful when you need to generate files that take information defined on other
-     * projects.</p>
-     * <p>Example:</p>
-     * <pre>
-     *    &lt;modelIds&gt;
-     *        &lt;modelId>model1&lt;/modelId&gt;
-     *        &lt;modelId>model2&lt;/modelId&gt;
-     *    &lt;/modelIds&gt;
-     * </pre>
-     * 
-     * @parameter
-     */
-    private List modelIds;
-    
-    /**
-     * Execute the Mojo.
-     */
-    public void execute() throws MojoExecutionException
-    {
-        // This command makes Maven compile the generated source:
-        // getProject().addCompileSourceRoot( absoluteGeneratedPath.getPath() );
-        try
-        {
-            project.addCompileSourceRoot( generatedSourceDirectory.getCanonicalPath() );
-            
-            if (modelIds == null)
-            {
-                modelIds = new ArrayList();
-                modelIds.add(project.getArtifactId());
-            }
-            Model model = IOUtils.loadModel(new File(buildDirectory,
-                    metadataFile));
-            new Flattener(model).flatten();
-            generateConverters(model);
-        }
-        catch (IOException e)
-        {
-            throw new MojoExecutionException("Error generating components", e);
-        }
-        catch (BuildException e)
-        {
-            throw new MojoExecutionException("Error generating components", e);
-        }
-    }
-        
-    private VelocityEngine initVelocity() throws MojoExecutionException
-    {
-
-        File template = new File(templateSourceDirectory, _getTemplateTagName());
-        
-        if (template.exists())
-        {
-            getLog().info("Using template from file loader: "+template.getPath());
-        }
-        else
-        {
-            getLog().info("Using template from class loader: META-INF/"+_getTemplateTagName());
-        }
-                
-        VelocityEngine velocityEngine = new VelocityEngine();
-                
-        try
-        {
-            velocityEngine.setProperty( "resource.loader", "file, class" );
-            velocityEngine.setProperty( "file.resource.loader.class",
-                    "org.apache.velocity.runtime.resource.loader.FileResourceLoader");
-            velocityEngine.setProperty( "file.resource.loader.path", templateSourceDirectory.getPath());
-            velocityEngine.setProperty( "class.resource.loader.class",
-                    "org.apache.myfaces.buildtools.maven2.plugin.builder.utils.RelativeClasspathResourceLoader" );
-            velocityEngine.setProperty( "class.resource.loader.path", "META-INF");            
-            velocityEngine.setProperty( "velocimacro.library", "tagClassMacros11.vm");
-            velocityEngine.setProperty( "velocimacro.permissions.allow.inline","true");
-            velocityEngine.setProperty( "velocimacro.permissions.allow.inline.local.scope", "true");
-            velocityEngine.setProperty( "directive.foreach.counter.initial.value","0");
-            //velocityEngine.setProperty( RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
-            //    "org.apache.myfaces.buildtools.maven2.plugin.builder.utils.ConsoleLogSystem" );
-            
-            velocityEngine.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM,
-                    new MavenPluginConsoleLogSystem(this.getLog()));
-                        
-            velocityEngine.init();
-        }
-        catch (Exception e)
-        {
-            throw new MojoExecutionException("Error creating VelocityEngine", e);
-        }
-        
-        return velocityEngine;
-    }
-
-    /**
-     * Generates parsed components.
-     */
-    private void generateConverters(Model model) throws IOException,
-            MojoExecutionException
-    {
-        VelocityEngine velocityEngine = initVelocity();
-
-        VelocityContext baseContext = new VelocityContext();
-        baseContext.put("utils", new MyfacesUtils());
-        
-        for (Iterator it = model.getConverters().iterator(); it.hasNext();)
-        {
-            ConverterMeta converter = (ConverterMeta) it.next();
-            
-            if (converter.getTagClass() != null)
-            {
-                File f = new File(mainSourceDirectory, StringUtils.replace(
-                    converter.getTagClass(), ".", "/")+".java");
-                
-                if (!f.exists() && canGenerateConverterTag(converter))
-                {
-                    if (mainSourceDirectory2 != null)
-                    {
-                        File f2 = new File(mainSourceDirectory2, StringUtils.replace(
-                                converter.getTagClass(), ".", "/")+".java");
-                        if (f2.exists())
-                        {
-                            //Skip
-                            continue;
-                        }
-                    }
-                    getLog().info("Generating tag class:"+converter.getTagClass());
-                    try
-                    {
-                        _generateConverter(velocityEngine, converter,baseContext);
-                    }
-                    catch(MojoExecutionException e)
-                    {
-                        if (force)
-                        {
-                            getLog().error(e.getMessage());
-                        }
-                        else
-                        {
-                            //Stop execution throwing exception
-                            throw e;
-                        }
-                    }
-                }
-            }
-        }
-        //throw new MojoExecutionException("stopping..");
-    }
-    
-    public boolean canGenerateConverterTag(ConverterMeta component)
-    {
-        if ( modelIds.contains(component.getModelId())
-                && includePackage(component)
-                && includeId(component))
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    
-    public boolean includePackage(ConverterMeta converter)
-    {
-        if (packageContains != null)
-        {
-            if (MyfacesUtils.getPackageFromFullClass(converter.getTagClass()).startsWith(packageContains))
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-        else
-        {
-            return true;
-        }        
-    }
-
-    public boolean includeId(ConverterMeta converter)
-    {
-        if (typePrefix != null)
-        {
-            if (converter.getConverterId().startsWith(typePrefix))
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-        else
-        {
-            return true;
-        }        
-    }
-
-
-    /**
-     * Generates a parsed component.
-     * 
-     * @param converter
-     *            the parsed component metadata
-     */
-    private void _generateConverter(VelocityEngine velocityEngine, ConverterMeta converter, VelocityContext baseContext)
-            throws MojoExecutionException
-    {
-
-        Context context = new VelocityContext(baseContext);
-        context.put("converter", converter);
-
-        Writer writer = null;
-        File outFile = null;
-
-        try
-        {
-            outFile = new File(generatedSourceDirectory, StringUtils.replace(
-                    converter.getTagClass(), ".", "/")+".java");
-
-            if ( !outFile.getParentFile().exists() )
-            {
-                outFile.getParentFile().mkdirs();
-            }
-
-            writer = new OutputStreamWriter(new FileOutputStream(outFile));
-
-            Template template = velocityEngine.getTemplate(_getTemplateTagName());
-                        
-            template.merge(context, writer);
-
-            writer.flush();
-        }
-        catch (Exception e)
-        {
-            throw new MojoExecutionException(
-                    "Error merging velocity templates: " + e.getMessage(), e);
-        }
-        finally
-        {
-            IOUtil.close(writer);
-            writer = null;
-        }
-    }
-    
-    private String _getTemplateTagName()
-    {
-        if (templateTagName == null)
-        {
-            if (_is12())
-            {
-                return "tagConverterClass12.vm";
-            }
-            else
-            {
-                return "tagConverterClass11.vm";
-            }
-        }
-        else
-        {
-            return templateTagName;
-        }
-    }
-
-    private boolean _is12()
-    {
-        return "1.2".equals(jsfVersion) || "12".equals(jsfVersion);
-    }
-
-}
diff --git a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeTagsMojo.java b/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeTagsMojo.java
deleted file mode 100644
index 035f082..0000000
--- a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeTagsMojo.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentMeta;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.Model;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.BuildException;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.MavenPluginConsoleLogSystem;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.MyfacesUtils;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.context.Context;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.StringUtils;
-
-/**
- * Maven goal to generate java source code for Component tag classes.
- * 
- * <p>It uses velocity to generate templates, and has the option to define custom templates.</p>
- * <p>The executed template has the following variables available to it:</p>
- * <ul>
- *  <li>utils : Returns an instance of 
- *  org.apache.myfaces.buildtools.maven2.plugin.builder.utils.MyfacesUtils, 
- *  it contains some useful methods.</li>
- *  <li>component : Returns the current instance of
- *   org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentMeta</li>
- * </ul>
- * 
- * @version $Id$
- * @requiresDependencyResolution compile
- * @goal make-tags
- * @phase generate-sources
- */
-public class MakeTagsMojo extends AbstractMojo
-{
-    /**
-     * Injected Maven project.
-     * 
-     * @parameter expression="${project}"
-     * @readonly
-     */
-    private MavenProject project;
-
-    /**
-     * Defines the directory where the metadata file (META-INF/myfaces-metadata.xml) is loaded.
-     * 
-     * @parameter expression="${project.build.directory}/myfaces-builder-plugin/main/resources"
-     * @readonly
-     */
-    private File buildDirectory;
-
-    /**
-     * Injected name of file generated by earlier run of BuildMetaDataMojo goal.
-     * 
-     * @parameter
-     */
-    private String metadataFile = "META-INF/myfaces-metadata.xml";
-
-    /**
-     * The directory used to load templates into velocity environment.
-     * 
-     * @parameter expression="src/main/resources/META-INF"
-     */
-    private File templateSourceDirectory;
-    
-    /**
-     * This param is used to search in this folder if some file to
-     * be generated exists and avoid generation and duplicate exception.
-     * 
-     * @parameter expression="src/main/java"
-     */    
-    private File mainSourceDirectory;
-
-    /**
-     * This param is used to search in this folder if some file to
-     * be generated exists and avoid generation and duplicate exception.
-     * 
-     * @parameter
-     */        
-    private File mainSourceDirectory2;
-
-    /**
-     * The name of the template used to generate component tag classes. According to the value on 
-     * jsfVersion property the default if this property is not set could be tagClass11.vm (1.1) or
-     * tagClass12.vm (1.2)
-     * 
-     * @parameter 
-     */
-    private String templateTagName;
-
-    /**
-     * The directory where all generated files are created. This directory is added as a
-     * compile source root automatically like src/main/java is. 
-     * 
-     * @parameter expression="${project.build.directory}/myfaces-builder-plugin/main/java"
-     * @required
-     */
-    private File generatedSourceDirectory;
-
-    /**
-     * Only generate tag classes that contains that package prefix
-     * 
-     * @parameter
-     */
-    private String packageContains;
-
-    /**
-     * Only generate tag classes that its component starts with this type prefix
-     * 
-     * @parameter
-     */
-    private String typePrefix;
-    
-    /**
-     *  Log and continue execution when generating component tag classes.
-     *  <p>
-     *  If this property is set to false (default), errors when a component tag class is generated stops
-     *  execution immediately.
-     *  </p>
-     * 
-     * @parameter
-     */
-    private boolean force;
-
-    /**
-     * Defines the jsf version (1.1 or 1.2), used to take the default templates for each version.
-     * <p> 
-     * If version is 1.1, the default templateTagName is 'tagClass11.vm' and if version
-     * is 1.2 the default templateTagName is 'tagClass12.vm'.
-     * </p>
-     * 
-     * @parameter
-     */
-    private String jsfVersion;
-    
-    /**
-     * Define the models that should be included when generate component tag classes. If not set, the
-     * current model identified by the artifactId is used.
-     * <p>
-     * Each model built by build-metadata goal has a modelId, that by default is the artifactId of
-     * the project. Setting this property defines which objects tied in a specified modelId should
-     * be taken into account.  
-     * </p>
-     * <p>In this case, limit component tag generation only to the components defined in the models 
-     * identified by the modelId defined. </p>
-     * <p>This is useful when you need to generate files that take information defined on other
-     * projects.</p>
-     * <p>Example:</p>
-     * <pre>
-     *    &lt;modelIds&gt;
-     *        &lt;modelId>model1&lt;/modelId&gt;
-     *        &lt;modelId>model2&lt;/modelId&gt;
-     *    &lt;/modelIds&gt;
-     * </pre>
-     * 
-     * @parameter
-     */
-    private List modelIds;
-    
-    /**
-     * Execute the Mojo.
-     */
-    public void execute() throws MojoExecutionException
-    {
-        // This command makes Maven compile the generated source:
-        // getProject().addCompileSourceRoot( absoluteGeneratedPath.getPath() );
-        try
-        {
-            project.addCompileSourceRoot( generatedSourceDirectory.getCanonicalPath() );
-            
-            if (modelIds == null)
-            {
-                modelIds = new ArrayList();
-                modelIds.add(project.getArtifactId());
-            }
-            Model model = IOUtils.loadModel(new File(buildDirectory,
-                    metadataFile));
-            new Flattener(model).flatten();
-            generateComponents(model);
-        }
-        catch (IOException e)
-        {
-            throw new MojoExecutionException("Error generating components", e);
-        }
-        catch (BuildException e)
-        {
-            throw new MojoExecutionException("Error generating components", e);
-        }
-    }
-        
-    private VelocityEngine initVelocity() throws MojoExecutionException
-    {
-        File template = new File(templateSourceDirectory, _getTemplateTagName());
-        
-        if (template.exists())
-        {
-            getLog().info("Using template from file loader: "+template.getPath());
-        }
-        else
-        {
-            getLog().info("Using template from class loader: META-INF/"+_getTemplateTagName());
-        }
-                
-        VelocityEngine velocityEngine = new VelocityEngine();
-                
-        try
-        {
-            velocityEngine.setProperty( "resource.loader", "file, class" );
-            velocityEngine.setProperty( "file.resource.loader.class",
-                    "org.apache.velocity.runtime.resource.loader.FileResourceLoader");
-            velocityEngine.setProperty( "file.resource.loader.path", templateSourceDirectory.getPath());
-            velocityEngine.setProperty( "class.resource.loader.class",
-                    "org.apache.myfaces.buildtools.maven2.plugin.builder.utils.RelativeClasspathResourceLoader" );
-            velocityEngine.setProperty( "class.resource.loader.path", "META-INF");            
-            velocityEngine.setProperty( "velocimacro.library", "tagClassMacros11.vm");
-            velocityEngine.setProperty( "velocimacro.permissions.allow.inline","true");
-            velocityEngine.setProperty( "velocimacro.permissions.allow.inline.local.scope", "true");
-            velocityEngine.setProperty( "directive.foreach.counter.initial.value","0");
-            //velocityEngine.setProperty( RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
-            //    "org.apache.myfaces.buildtools.maven2.plugin.builder.utils.ConsoleLogSystem" );
-            
-            velocityEngine.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM,
-                    new MavenPluginConsoleLogSystem(this.getLog()));
-
-            velocityEngine.init();
-        }
-        catch (Exception e)
-        {
-            throw new MojoExecutionException("Error creating VelocityEngine", e);
-        }
-        
-        return velocityEngine;
-    }
-
-    /**
-     * Generates parsed components.
-     */
-    private void generateComponents(Model model) throws IOException,
-            MojoExecutionException
-    {
-        VelocityEngine velocityEngine = initVelocity();
-
-        VelocityContext baseContext = new VelocityContext();
-        baseContext.put("utils", new MyfacesUtils());
-        
-        for (Iterator it = model.getComponents().iterator(); it.hasNext();)
-        {
-            ComponentMeta component = (ComponentMeta) it.next();
-            
-            if (component.getTagClass() != null)
-            {
-                File f = new File(mainSourceDirectory, StringUtils.replace(
-                    component.getTagClass(), ".", "/")+".java");
-                
-                if (!f.exists() && canGenerateComponentTag(component))
-                {
-                    if (mainSourceDirectory2 != null)
-                    {
-                        File f2 = new File(mainSourceDirectory2, StringUtils.replace(
-                                component.getTagClass(), ".", "/")+".java");
-                        if (f2.exists())
-                        {
-                            //Skip
-                            continue;
-                        }
-                    }
-                    getLog().info("Generating tag class:"+component.getTagClass());
-                    try 
-                    {
-                        _generateComponent(velocityEngine, component,baseContext);
-                    }
-                    catch(MojoExecutionException e)
-                    {
-                        if (force)
-                        {
-                            getLog().error(e.getMessage());
-                        }
-                        else
-                        {
-                            //Stop execution throwing exception
-                            throw e;
-                        }
-                    }
-                }
-            }
-        }
-        //throw new MojoExecutionException("stopping..");
-    }
-    
-    public boolean canGenerateComponentTag(ComponentMeta component)
-    {
-        if ( modelIds.contains(component.getModelId())
-                && includePackage(component)
-                && includeType(component))
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    
-    public boolean includePackage(ComponentMeta component)
-    {
-        if (packageContains != null)
-        {
-            if (component.getTagPackage().startsWith(packageContains))
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-        else
-        {
-            return true;
-        }        
-    }
-
-    public boolean includeType(ComponentMeta component)
-    {
-        if (typePrefix != null)
-        {
-            if (component.getType().startsWith(typePrefix))
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-        else
-        {
-            return true;
-        }        
-    }
-
-
-    /**
-     * Generates a parsed component.
-     * 
-     * @param component
-     *            the parsed component metadata
-     */
-    private void _generateComponent(VelocityEngine velocityEngine, ComponentMeta component, VelocityContext baseContext)
-            throws MojoExecutionException
-    {
-
-        Context context = new VelocityContext(baseContext);
-        context.put("component", component);
-
-        Writer writer = null;
-        File outFile = null;
-
-        try
-        {
-            outFile = new File(generatedSourceDirectory, StringUtils.replace(
-                    component.getTagClass(), ".", "/")+".java");
-
-            if ( !outFile.getParentFile().exists() )
-            {
-                outFile.getParentFile().mkdirs();
-            }
-
-            writer = new OutputStreamWriter(new FileOutputStream(outFile));
-
-            Template template = velocityEngine.getTemplate(_getTemplateTagName());
-                        
-            template.merge(context, writer);
-
-            writer.flush();
-        }
-        catch (Exception e)
-        {
-            throw new MojoExecutionException(
-                    "Error merging velocity templates: " + e.getMessage(), e);
-        }
-        finally
-        {
-            IOUtil.close(writer);
-            writer = null;
-        }
-    }
-    
-    private String _getTemplateTagName()
-    {
-        if (templateTagName == null)
-        {
-            if (_is12())
-            {
-                return "tagClass12.vm";
-            }
-            else
-            {
-                return "tagClass11.vm";
-            }
-        }
-        else
-        {
-            return templateTagName;            
-        }        
-    }
-
-    private boolean _is12()
-    {
-        return "1.2".equals(jsfVersion) || "12".equals(jsfVersion);
-    }
-
-}
diff --git a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeValidatorTagsMojo.java b/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeValidatorTagsMojo.java
deleted file mode 100644
index 3242347..0000000
--- a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeValidatorTagsMojo.java
+++ /dev/null
@@ -1,444 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.Model;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ValidatorMeta;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.BuildException;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.MavenPluginConsoleLogSystem;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.MyfacesUtils;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.context.Context;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.StringUtils;
-
-/**
- * Maven goal to generate java source code for Component tag classes.
- * 
- * <p>It uses velocity to generate templates, and has the option to define custom templates.</p>
- * <p>The executed template has the following variables available to it:</p>
- * <ul>
- *  <li>utils : Returns an instance of 
- *  org.apache.myfaces.buildtools.maven2.plugin.builder.utils.MyfacesUtils, 
- *  it contains some useful methods.</li>
- *  <li>validator : Returns the current instance of
- *   org.apache.myfaces.buildtools.maven2.plugin.builder.model.ValidatorMeta</li>
- * </ul>
- * 
- * @version $Id$
- * @requiresDependencyResolution compile
- * @goal make-validator-tags
- * @phase generate-sources
- */
-public class MakeValidatorTagsMojo extends AbstractMojo
-{
-    /**
-     * Injected Maven project.
-     * 
-     * @parameter expression="${project}"
-     * @readonly
-     */
-    private MavenProject project;
-
-    /**
-     * Defines the directory where the metadata file (META-INF/myfaces-metadata.xml) is loaded.
-     * 
-     * @parameter expression="${project.build.directory}/myfaces-builder-plugin/main/resources"
-     * @readonly
-     */
-    private File buildDirectory;
-
-    /**
-     * Injected name of file generated by earlier run of BuildMetaDataMojo goal.
-     * 
-     * @parameter
-     */
-    private String metadataFile = "META-INF/myfaces-metadata.xml";
-
-    /**
-     * The directory used to load templates into velocity environment.
-     * 
-     * @parameter expression="src/main/resources/META-INF"
-     */
-    private File templateSourceDirectory;
-    
-    /**
-     * This param is used to search in this folder if some file to
-     * be generated exists and avoid generation and duplicate exception.
-     * 
-     * @parameter expression="src/main/java"
-     */    
-    private File mainSourceDirectory;
-
-    /**
-     * This param is used to search in this folder if some file to
-     * be generated exists and avoid generation and duplicate exception.
-     * 
-     * @parameter
-     */        
-    private File mainSourceDirectory2;
-
-    /**
-     * The name of the template used to generate validator tag classes. According to the value on 
-     * jsfVersion property the default if this property is not set could be tagValidatorClass11.vm (1.1) or
-     * tagValidatorClass12.vm (1.2)
-     * 
-     * @parameter 
-     */
-    private String templateTagName;
-
-    /**
-     * The directory where all generated files are created. This directory is added as a
-     * compile source root automatically like src/main/java is. 
-     *  
-     * @parameter expression="${project.build.directory}/myfaces-builder-plugin/main/java"
-     * @required
-     */
-    private File generatedSourceDirectory;
-
-    /**
-     * Only generate tag classes that contains that package prefix
-     * 
-     * @parameter
-     */
-    private String packageContains;
-
-    /**
-     * Only generate tag classes that its component starts with this type prefix
-     * 
-     * @parameter
-     */
-    private String typePrefix;
-    
-    /**
-     *  Log and continue execution when generating validator tag classes.
-     *  <p>
-     *  If this property is set to false (default), errors when a validator tag class is generated stops
-     *  execution immediately.
-     *  </p>
-     * 
-     * @parameter
-     */
-    private boolean force;
-
-    /**
-     * Defines the jsf version (1.1 or 1.2), used to take the default templates for each version.
-     * <p> 
-     * If version is 1.1, the default templateTagName is 'tagValidatorClass11.vm' and if version
-     * is 1.2 the default templateTagName is 'tagValidatorClass12.vm'.
-     * </p>
-     * 
-     * @parameter
-     */
-    private String jsfVersion;
-    
-    /**
-     * Define the models that should be included when generate validator tag classes. If not set, the
-     * current model identified by the artifactId is used.
-     * <p>
-     * Each model built by build-metadata goal has a modelId, that by default is the artifactId of
-     * the project. Setting this property defines which objects tied in a specified modelId should
-     * be taken into account.  
-     * </p>
-     * <p>In this case, limit converter tag generation only to the components defined in the models 
-     * identified by the modelId defined. </p>
-     * <p>This is useful when you need to generate files that take information defined on other
-     * projects.</p>
-     * <p>Example:</p>
-     * <pre>
-     *    &lt;modelIds&gt;
-     *        &lt;modelId>model1&lt;/modelId&gt;
-     *        &lt;modelId>model2&lt;/modelId&gt;
-     *    &lt;/modelIds&gt;
-     * </pre>
-     * 
-     * @parameter
-     */
-    private List modelIds;
-    
-    /**
-     * Execute the Mojo.
-     */
-    public void execute() throws MojoExecutionException
-    {
-        // This command makes Maven compile the generated source:
-        // getProject().addCompileSourceRoot( absoluteGeneratedPath.getPath() );
-        try
-        {
-            project.addCompileSourceRoot( generatedSourceDirectory.getCanonicalPath() );
-            
-            if (modelIds == null)
-            {
-                modelIds = new ArrayList();
-                modelIds.add(project.getArtifactId());
-            }
-            Model model = IOUtils.loadModel(new File(buildDirectory,
-                    metadataFile));
-            new Flattener(model).flatten();
-            generateValidators(model);
-        }
-        catch (IOException e)
-        {
-            throw new MojoExecutionException("Error generating components", e);
-        }
-        catch (BuildException e)
-        {
-            throw new MojoExecutionException("Error generating components", e);
-        }
-    }
-        
-    private VelocityEngine initVelocity() throws MojoExecutionException
-    {
-        File template = new File(templateSourceDirectory, _getTemplateTagName());
-        
-        if (template.exists())
-        {
-            getLog().info("Using template from file loader: "+template.getPath());
-        }
-        else
-        {
-            getLog().info("Using template from class loader: META-INF/"+_getTemplateTagName());
-        }
-                
-        VelocityEngine velocityEngine = new VelocityEngine();
-                
-        try
-        {
-            velocityEngine.setProperty( "resource.loader", "file, class" );
-            velocityEngine.setProperty( "file.resource.loader.class",
-                    "org.apache.velocity.runtime.resource.loader.FileResourceLoader");
-            velocityEngine.setProperty( "file.resource.loader.path", templateSourceDirectory.getPath());
-            velocityEngine.setProperty( "class.resource.loader.class",
-                    "org.apache.myfaces.buildtools.maven2.plugin.builder.utils.RelativeClasspathResourceLoader" );
-            velocityEngine.setProperty( "class.resource.loader.path", "META-INF");            
-            velocityEngine.setProperty( "velocimacro.library", "tagClassMacros11.vm");
-            velocityEngine.setProperty( "velocimacro.permissions.allow.inline","true");
-            velocityEngine.setProperty( "velocimacro.permissions.allow.inline.local.scope", "true");
-            velocityEngine.setProperty( "directive.foreach.counter.initial.value","0");
-
-            //velocityEngine.setProperty( RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
-            //    "org.apache.myfaces.buildtools.maven2.plugin.builder.utils.ConsoleLogSystem" );
-            
-            velocityEngine.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM,
-                    new MavenPluginConsoleLogSystem(this.getLog()));
-
-            velocityEngine.init();
-        }
-        catch (Exception e)
-        {
-            throw new MojoExecutionException("Error creating VelocityEngine", e);
-        }
-        
-        return velocityEngine;
-    }
-
-    /**
-     * Generates parsed components.
-     */
-    private void generateValidators(Model model) throws IOException,
-            MojoExecutionException
-    {
-        VelocityEngine velocityEngine = initVelocity();
-
-        VelocityContext baseContext = new VelocityContext();
-        baseContext.put("utils", new MyfacesUtils());
-        
-        for (Iterator it = model.getValidators().iterator(); it.hasNext();)
-        {
-            ValidatorMeta validator = (ValidatorMeta) it.next();
-            
-            if (validator.getTagClass() != null)
-            {
-                File f = new File(mainSourceDirectory, StringUtils.replace(
-                    validator.getTagClass(), ".", "/")+".java");
-                
-                if (!f.exists() && canGenerateValidatorTag(validator))
-                {
-                    if (mainSourceDirectory2 != null)
-                    {
-                        File f2 = new File(mainSourceDirectory2, StringUtils.replace(
-                                validator.getTagClass(), ".", "/")+".java");
-                        if (f2.exists())
-                        {
-                            //Skip
-                            continue;
-                        }
-                    }
-                    getLog().info("Generating tag class:"+validator.getTagClass());
-                    try
-                    {
-                        _generateValidator(velocityEngine, validator,baseContext);
-                    }
-                    catch(MojoExecutionException e)
-                    {
-                        if (force)
-                        {
-                            getLog().error(e.getMessage());
-                        }
-                        else
-                        {
-                            //Stop execution throwing exception
-                            throw e;
-                        }
-                    }
-                }
-            }
-        }
-        //throw new MojoExecutionException("stopping..");
-    }
-    
-    public boolean canGenerateValidatorTag(ValidatorMeta component)
-    {
-        if ( modelIds.contains(component.getModelId())
-                && includePackage(component)
-                && includeId(component))
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    
-    public boolean includePackage(ValidatorMeta validator)
-    {
-        if (packageContains != null)
-        {
-            if (MyfacesUtils.getPackageFromFullClass(validator.getTagClass()).startsWith(packageContains))
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-        else
-        {
-            return true;
-        }        
-    }
-
-    public boolean includeId(ValidatorMeta validator)
-    {
-        if (typePrefix != null)
-        {
-            if (validator.getValidatorId().startsWith(typePrefix))
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-        else
-        {
-            return true;
-        }        
-    }
-
-
-    /**
-     * Generates a parsed component.
-     * 
-     * @param validator
-     *            the parsed component metadata
-     */
-    private void _generateValidator(VelocityEngine velocityEngine, ValidatorMeta validator, VelocityContext baseContext)
-            throws MojoExecutionException
-    {
-
-        Context context = new VelocityContext(baseContext);
-        context.put("validator", validator);
-
-        Writer writer = null;
-        File outFile = null;
-
-        try
-        {
-            outFile = new File(generatedSourceDirectory, StringUtils.replace(
-                    validator.getTagClass(), ".", "/")+".java");
-
-            if ( !outFile.getParentFile().exists() )
-            {
-                outFile.getParentFile().mkdirs();
-            }
-
-            writer = new OutputStreamWriter(new FileOutputStream(outFile));
-
-            Template template = velocityEngine.getTemplate(_getTemplateTagName());
-                        
-            template.merge(context, writer);
-
-            writer.flush();
-        }
-        catch (Exception e)
-        {
-            throw new MojoExecutionException(
-                    "Error merging velocity templates: " + e.getMessage(), e);
-        }
-        finally
-        {
-            IOUtil.close(writer);
-            writer = null;
-        }
-    }
-    
-    private String _getTemplateTagName()
-    {
-        if (templateTagName == null)
-        {
-            if (_is12())
-            {
-                return "tagValidatorClass12.vm";
-            }
-            else
-            {
-                return "tagValidatorClass11.vm";
-            }
-        }
-        else
-        {
-            return templateTagName;
-        }
-    }
-
-    private boolean _is12()
-    {
-        return "1.2".equals(jsfVersion) || "12".equals(jsfVersion);
-    }
-
-}
diff --git a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeValidatorsMojo.java b/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeValidatorsMojo.java
deleted file mode 100644
index 57171e1..0000000
--- a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeValidatorsMojo.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.Model;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ValidatorMeta;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.BuildException;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.MavenPluginConsoleLogSystem;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.utils.MyfacesUtils;
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.context.Context;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.StringUtils;
-
-import com.thoughtworks.qdox.JavaDocBuilder;
-
-/**
- * Maven goal to generate java source code for Validator classes.
- * 
- * <p>It uses velocity to generate templates, and has the option to define custom templates.</p>
- * <p>The executed template has the following variables available to it:</p>
- * <ul>
- *  <li>utils : Returns an instance of 
- *  org.apache.myfaces.buildtools.maven2.plugin.builder.utils.MyfacesUtils, 
- *  it contains some useful methods.</li>
- *  <li>validator : Returns the current instance of
- *   org.apache.myfaces.buildtools.maven2.plugin.builder.model.ValidatorMeta</li>
- * </ul>
- * 
- * @version $Id$
- * @requiresDependencyResolution compile
- * @goal make-validators
- * @phase generate-sources
- */
-public class MakeValidatorsMojo extends AbstractMojo
-{
-    /**
-     * Injected Maven project.
-     * 
-     * @parameter expression="${project}"
-     * @readonly
-     */
-    private MavenProject project;
-
-    /**
-     * Defines the directory where the metadata file (META-INF/myfaces-metadata.xml) is loaded.
-     * 
-     * @parameter expression="${project.build.directory}/myfaces-builder-plugin/main/resources"
-     * @readonly
-     */
-    private File buildDirectory;
-
-    /**
-     * Injected name of file generated by earlier run of BuildMetaDataMojo goal.
-     * 
-     * @parameter
-     */
-    private String metadataFile = "META-INF/myfaces-metadata.xml";
-
-    /**
-     * The directory used to load templates into velocity environment.
-     * 
-     * @parameter expression="src/main/resources/META-INF"
-     */
-    private File templateSourceDirectory;
-
-    /**
-     * The directory where all generated files are created. This directory is added as a
-     * compile source root automatically like src/main/java is. 
-     * 
-     * @parameter expression="${project.build.directory}/myfaces-builder-plugin/main/java"
-     */
-    private File generatedSourceDirectory;
-
-    /**
-     * Only generate tag classes that contains that package prefix
-     * 
-     * @parameter
-     */
-    private String packageContains;
-
-    /**
-     *  Log and continue execution when generating validator classes.
-     *  <p>
-     *  If this property is set to false (default), errors when a validator class is generated stops
-     *  execution immediately.
-     *  </p>
-     * 
-     * @parameter
-     */
-    private boolean force;
-
-    /**
-     * Defines the jsf version (1.1 or 1.2), used to take the default templates for each version.
-     * <p> 
-     * If version is 1.1, the default templateValidatorName is 'validatorClass11.vm' and if version
-     * is 1.2 the default templateValidatorName is 'validatorClass12.vm'.
-     * </p>
-     * 
-     * @parameter
-     */
-    private String jsfVersion;
-    
-    /**
-     * Define the models that should be included when generate validator classes. If not set, the
-     * current model identified by the artifactId is used.
-     * <p>
-     * Each model built by build-metadata goal has a modelId, that by default is the artifactId of
-     * the project. Setting this property defines which objects tied in a specified modelId should
-     * be taken into account.  
-     * </p>
-     * <p>In this case, limit converter tag generation only to the components defined in the models 
-     * identified by the modelId defined. </p>
-     * <p>This is useful when you need to generate files that take information defined on other
-     * projects.</p>
-     * <p>Example:</p>
-     * <pre>
-     *    &lt;modelIds&gt;
-     *        &lt;modelId>model1&lt;/modelId&gt;
-     *        &lt;modelId>model2&lt;/modelId&gt;
-     *    &lt;/modelIds&gt;
-     * </pre>
-     * 
-     * @parameter
-     */
-    private List modelIds;
-
-    /**
-     * The name of the template used to generate validator classes. According to the value on 
-     * jsfVersion property the default if this property is not set could be validatorClass11.vm (1.1) or
-     * validatorClass12.vm (1.2)
-     * 
-     * @parameter 
-     */
-    private String templateValidatorName;
-    
-    /**
-     * This param is used to search in this folder if some file to
-     * be generated exists and avoid generation and duplicate exception.
-     * 
-     * @parameter expression="src/main/java"
-     */    
-    private File mainSourceDirectory;
-    
-    /**
-     * This param is used to search in this folder if some file to
-     * be generated exists and avoid generation and duplicate exception.
-     * 
-     * @parameter
-     */        
-    private File mainSourceDirectory2;
-
-    /**
-     * Execute the Mojo.
-     */
-    public void execute() throws MojoExecutionException
-    {
-        // This command makes Maven compile the generated source:
-        // getProject().addCompileSourceRoot( absoluteGeneratedPath.getPath() );
-        
-        try
-        {
-            project.addCompileSourceRoot( generatedSourceDirectory.getCanonicalPath() );
-            
-            if (modelIds == null)
-            {
-                modelIds = new ArrayList();
-                modelIds.add(project.getArtifactId());
-            }
-            Model model = IOUtils.loadModel(new File(buildDirectory,
-                    metadataFile));
-            new Flattener(model).flatten();
-            generateValidators(model);
-        }
-        catch (IOException e)
-        {
-            throw new MojoExecutionException("Error generating validators", e);
-        }
-        catch (BuildException e)
-        {
-            throw new MojoExecutionException("Error generating validators", e);
-        }
-    }
-    
-    
-    private VelocityEngine initVelocity() throws MojoExecutionException
-    {
-        File template = new File(templateSourceDirectory, _getTemplateName());
-        
-        if (template.exists())
-        {
-            getLog().info("Using template from file loader: "+template.getPath());
-        }
-        else
-        {
-            getLog().info("Using template from class loader: META-INF/"+_getTemplateName());
-        }
-                
-        VelocityEngine velocityEngine = new VelocityEngine();
-                
-        try
-        {
-            velocityEngine.setProperty( "resource.loader", "file, class" );
-            velocityEngine.setProperty( "file.resource.loader.class",
-                    "org.apache.velocity.runtime.resource.loader.FileResourceLoader");
-            velocityEngine.setProperty( "file.resource.loader.path", templateSourceDirectory.getPath());
-            velocityEngine.setProperty( "class.resource.loader.class",
-                    "org.apache.myfaces.buildtools.maven2.plugin.builder.utils.RelativeClasspathResourceLoader" );
-            velocityEngine.setProperty( "class.resource.loader.path", "META-INF");            
-            velocityEngine.setProperty( "velocimacro.library", "validatorClassMacros11.vm");
-            velocityEngine.setProperty( "velocimacro.permissions.allow.inline","true");
-            velocityEngine.setProperty( "velocimacro.permissions.allow.inline.local.scope", "true");
-            velocityEngine.setProperty( "directive.foreach.counter.initial.value","0");
-            //velocityEngine.setProperty( RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
-            //    "org.apache.myfaces.buildtools.maven2.plugin.builder.utils.ConsoleLogSystem" );
-            
-            velocityEngine.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM,
-                    new MavenPluginConsoleLogSystem(this.getLog()));
-
-            velocityEngine.init();
-        }
-        catch (Exception e)
-        {
-            throw new MojoExecutionException("Error creating VelocityEngine", e);
-        }
-        
-        return velocityEngine;
-    }
-    
-
-    /**
-     * Generates parsed validators.
-     */
-    private void generateValidators(Model model) throws IOException,
-            MojoExecutionException
-    {
-        // Make sure generated source directory 
-        // is added to compilation source path 
-        //project.addCompileSourceRoot(generatedSourceDirectory.getCanonicalPath());
-        
-        //Init Qdox for extract code 
-        JavaDocBuilder builder = new JavaDocBuilder();
-        
-        List sourceDirs = project.getCompileSourceRoots();
-        
-        // need a File object representing the original source tree
-        for (Iterator i = sourceDirs.iterator(); i.hasNext();)
-        {
-            String srcDir = (String) i.next();
-            builder.addSourceTree(new File(srcDir));
-        }        
-        
-        //Init velocity
-        VelocityEngine velocityEngine = initVelocity();
-
-        VelocityContext baseContext = new VelocityContext();
-        baseContext.put("utils", new MyfacesUtils());
-        
-        for (Iterator it = model.getValidators().iterator(); it.hasNext();)
-        {
-            ValidatorMeta validator = (ValidatorMeta) it.next();
-            
-            if (validator.getClassName() != null)
-            {
-                File f = new File(mainSourceDirectory, StringUtils.replace(
-                    validator.getClassName(), ".", "/")+".java");
-                                
-                if (!f.exists() && canGenerateValidator(validator))
-                {
-                    if (mainSourceDirectory2 != null)
-                    {
-                        File f2 = new File(mainSourceDirectory2, StringUtils.replace(
-                                validator.getClassName(), ".", "/")+".java");
-                        if (f2.exists())
-                        {
-                            //Skip
-                            continue;
-                        }
-                    }
-                    getLog().info("Generating validator class:"+validator.getClassName());
-                    try
-                    {
-                        _generateValidator(velocityEngine, builder,validator,baseContext);
-                    }
-                    catch(MojoExecutionException e)
-                    {
-                        if (force)
-                        {
-                            getLog().error(e.getMessage());
-                        }
-                        else
-                        {
-                            //Stop execution throwing exception
-                            throw e;
-                        }
-                    }
-                }
-            }
-        }        
-    }
-    
-    public boolean canGenerateValidator(ValidatorMeta validator)
-    {
-        if ( modelIds.contains(validator.getModelId())
-                && includePackage(validator))
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-    
-    public boolean includePackage(ValidatorMeta validator)
-    {
-        if (packageContains != null)
-        {
-            if (MyfacesUtils.getPackageFromFullClass(validator.getClassName()).startsWith(packageContains))
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-        else
-        {
-            return true;
-        }        
-    }
-    
-    
-    /**
-     * Generates a parsed validator.
-     * 
-     * @param validator
-     *            the parsed validator metadata
-     */
-    private void _generateValidator(VelocityEngine velocityEngine,
-            JavaDocBuilder builder,
-            ValidatorMeta validator, VelocityContext baseContext)
-            throws MojoExecutionException
-    {
-        Context context = new VelocityContext(baseContext);
-        context.put("validator", validator);
-        
-        Writer writer = null;
-        File outFile = null;
-
-        try
-        {
-            outFile = new File(generatedSourceDirectory, StringUtils.replace(
-                    validator.getClassName(), ".", "/")+".java");
-
-            if ( !outFile.getParentFile().exists() )
-            {
-                outFile.getParentFile().mkdirs();
-            }
-
-            writer = new OutputStreamWriter(new FileOutputStream(outFile));
-
-            Template template = velocityEngine.getTemplate(_getTemplateName());
-                        
-            template.merge(context, writer);
-
-            writer.flush();
-        }
-        catch (Exception e)
-        {
-            throw new MojoExecutionException(
-                    "Error merging velocity templates: " + e.getMessage(), e);
-        }
-        finally
-        {
-            IOUtil.close(writer);
-            writer = null;
-        }
-    }
-                
-    private String _getTemplateName()
-    {
-        if (templateValidatorName == null)
-        {
-            if (_is12())
-            {
-                return "validatorClass12.vm";
-            }
-            else
-            {
-                return "validatorClass11.vm";
-            }
-        }
-        else
-        {
-            return templateValidatorName;
-        }
-    }
-    
-    private boolean _is12()
-    {
-        return "1.2".equals(jsfVersion) || "12".equals(jsfVersion);
-    }
-
-}
diff --git a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/ModelBuilder.java b/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/ModelBuilder.java
deleted file mode 100644
index 74a81db..0000000
--- a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/ModelBuilder.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder;
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.Model;
-
-/**
- * An interface that is implemented by classes that are capable of collecting
- * metadata about JSF components, converters, validators, etc.
- * <p>
- * A ModelBuilder implementation might read xml files, or scan source code for
- * annotations, or read data from a database, or any number of possible
- * approaches. All that matters is that it makes a series of calls to a Model
- * object to add information.
- * <p>
- * ModelBuilder implementations may be run as a chain, ie one instance used to
- * populate the Model object with some objects, then a second instance used to
- * add more data or modify the data already in the model.
- */
-public interface ModelBuilder
-{
-    /**
-     * Given a model (which might already be partly populated with data, add
-     * information about JSF artifacts.
-     */
-    public void buildModel(Model model, MavenProject project)
-            throws MojoExecutionException;
-
-    /**
-     * Given a model (which might already be partly populated with data, add
-     * information about JSF artifacts, indicating include and exclude
-     * rules
-     * 
-     * @since 1.0.2
-     * @param model the model to add the information
-     * @param project the maven project to analyze
-     * @param includes rules to include files
-     * @param excludes rules to exclude files
-     * @throws MojoExecutionException
-     */
-    public void buildModel(Model model, MavenProject project, String includes, String excludes)
-            throws MojoExecutionException;    
-}
\ No newline at end of file
diff --git a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/io/PrettyWriter.java b/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/io/PrettyWriter.java
deleted file mode 100644
index 08111fb..0000000
--- a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/io/PrettyWriter.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.io;
-
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.Writer;
-
-public class PrettyWriter extends PrintWriter
-{
-    public PrettyWriter(OutputStream out)
-    {
-        super(out);
-    }
-
-    public PrettyWriter(OutputStream out, boolean autoFlush)
-    {
-        super(out, autoFlush);
-    }
-
-    public PrettyWriter(Writer out)
-    {
-        super(out);
-    }
-
-    public PrettyWriter(Writer out, boolean autoFlush)
-    {
-        super(out, autoFlush);
-    }
-
-    public void indent()
-    {
-        _indentation++;
-    }
-
-    public void unindent()
-    {
-        _indentation--;
-    }
-
-    public void write(String string, int offset, int length)
-    {
-        if (_unlatchPending())
-        {
-            for (int i = 0; i < _indentation; i++)
-            {
-                super.write(TAB_INDENT, 0, 2);
-            }
-        }
-
-        super.write(string, offset, length);
-    }
-
-    public void write(char[] chars, int offset, int length)
-    {
-        if (_unlatchPending())
-        {
-            for (int i = 0; i < _indentation; i++)
-            {
-                super.write(TAB_INDENT_CHARS, 0, 2);
-            }
-        }
-
-        super.write(chars, offset, length);
-    }
-
-    public void println()
-    {
-        super.println();
-        _latchPending();
-    }
-
-    public void println(boolean x)
-    {
-        super.println(x);
-        _latchPending();
-    }
-
-    public void println(char x)
-    {
-        super.println(x);
-        _latchPending();
-    }
-
-    public void println(int x)
-    {
-        super.println(x);
-        _latchPending();
-    }
-
-    public void println(long x)
-    {
-        super.println(x);
-        _latchPending();
-    }
-
-    public void println(float x)
-    {
-        super.println(x);
-        _latchPending();
-    }
-
-    public void println(double x)
-    {
-        super.println(x);
-        _latchPending();
-    }
-
-    public void println(char[] x)
-    {
-        super.println(x);
-        _latchPending();
-    }
-
-    public void println(String x)
-    {
-        int fromIndex = 0;
-        for (int index = x.indexOf('\n'); index != -1 && index + 1 < x.length(); fromIndex = index + 1, index = x
-                .indexOf('\n', fromIndex))
-        {
-            super.println(x.substring(fromIndex, index));
-            _latchPending();
-        }
-
-        super.println(x.substring(fromIndex));
-        _latchPending();
-    }
-
-    public void println(Object x)
-    {
-        super.println(x);
-        _latchPending();
-    }
-
-    private boolean _unlatchPending()
-    {
-        boolean pending = _pending;
-        if (pending)
-        {
-            _pending = false;
-        }
-
-        return pending;
-    }
-
-    private boolean _latchPending()
-    {
-        boolean pending = _pending;
-        if (!pending)
-        {
-            _pending = true;
-        }
-
-        return !pending;
-    }
-
-    private int _indentation;
-    private boolean _pending = true;
-
-    private static final String TAB_INDENT = "  ";
-    private static final char[] TAB_INDENT_CHARS = TAB_INDENT.toCharArray();
-}
diff --git a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/io/XmlWriter.java b/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/io/XmlWriter.java
deleted file mode 100644
index f6abf67..0000000
--- a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/io/XmlWriter.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.io;
-
-import java.io.PrintWriter;
-import java.util.Stack;
-
-/**
- * Simple utility to help write out data structures in xml format, with pretty
- * indenting.
- */
-public class XmlWriter
-{
-    private static final String XML_CHARS = "<>&";
-
-    private PrintWriter out;
-    private Stack contexts = new Stack();
-    private int indent = 0;
-
-    // Is the current xml element still "open" for adding attributes,
-    // ie needs a ">" before adding nested text or child elements.
-    private boolean openElement = false;
-
-    private static class Context
-    {
-        String elementName;
-        boolean hasContent;
-
-        Context(String element)
-        {
-            elementName = element;
-        }
-    }
-
-    public XmlWriter(PrintWriter out)
-    {
-        this.out = out;
-    }
-
-    private void indent()
-    {
-        out.write("\n");
-        for (int i = 0; i < indent; ++i)
-        {
-            out.write("  ");
-        }
-    }
-
-    private void indentInc()
-    {
-        indent();
-        ++indent;
-    }
-
-    private void indentDec()
-    {
-        --indent;
-        indent();
-    }
-
-    private boolean containsXmlChars(String text)
-    {
-        for (int i = 0; i < XML_CHARS.length(); ++i)
-        {
-            if (text.indexOf(XML_CHARS.charAt(i)) >= 0)
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public void writeElement(String name, String body)
-    {
-        if (body == null)
-        {
-            return;
-        }
-
-        if (openElement)
-        {
-            out.write(">");
-            openElement = false;
-        }
-
-        indent();
-        out.write("<");
-        out.write(name);
-        out.write(">");
-
-        if (containsXmlChars(body))
-        {
-            // The text contains chars that need to be escaped. Rather than
-            // escape them one-by-one, just write the body in a CDATA section.
-
-            if (body.indexOf("\n") > 0)
-            {
-                // multi-line body, so it is most readable when the CDATA
-                // markers are against the left-hand margin
-                out.write("\n<![CDATA[\n");
-                out.write(body);
-                out.write("\n]]>");
-
-                // Write the end tag on the next line, correctly indented
-                indent();
-            }
-            else
-            {
-                // just a small body, so output it "inline"
-                out.write("<![CDATA[");
-                out.write(body);
-                out.write("]]>");
-            }
-        }
-        else
-        {
-            out.write(body);
-        }
-        out.write("</");
-        out.write(name);
-        out.write(">");
-
-        ((Context) contexts.peek()).hasContent = true;
-    }
-
-    public void writeElement(String name, boolean value)
-    {
-        writeElement(name, String.valueOf(value));
-    }
-
-    public void writeElement(String name, Boolean value)
-    {
-        if (value != null)
-        {
-            writeElement(name, value.toString());
-        }
-    }
-
-    public void beginElement(String name)
-    {
-        if (openElement)
-        {
-            out.write(">");
-        }
-        openElement = true;
-
-        indentInc();
-        out.write("<");
-        out.write(name);
-
-        if (!contexts.empty())
-        {
-            ((Context) contexts.peek()).hasContent = true;
-        }
-        contexts.push(new Context(name));
-
-    }
-
-    public void writeAttr(String name, String value)
-    {
-        if (value == null)
-        {
-            return;
-        }
-
-        if (!openElement)
-        {
-            throw new IllegalStateException("xml element not open");
-        }
-        out.write(" ");
-        out.write(name);
-        out.write("=");
-        out.write("\"");
-        out.write(value);
-        out.write("\"");
-    }
-
-    public void endElement(String name)
-    {
-        Context c = (Context) contexts.pop();
-
-        if (!c.elementName.equals(name))
-        {
-            throw new IllegalStateException("Unbalanced xml: expected to end ["
-                    + c.elementName + "]" + " but [" + name
-                    + "] was ended instead");
-        }
-
-        if (c.hasContent)
-        {
-            indentDec();
-            out.write("</");
-            out.write(c.elementName);
-            out.write(">");
-        }
-        else
-        {
-            out.write("/>");
-            --indent; // decrement the indent, but do not write the linefeed
-        }
-        openElement = false;
-    }
-}
diff --git a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/AttributeHolder.java b/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/AttributeHolder.java
deleted file mode 100644
index 5aee42c..0000000
--- a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/AttributeHolder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.model;
-
-import java.util.Iterator;
-
-/**
- * Interface for any artifact that has JSP attributes on it.
- */
-public interface AttributeHolder
-{
-    
-    Iterator attributes();
-
-    AttributeMeta getAttribute(String name);
-
-    void addAttribute(AttributeMeta prop);
-}
diff --git a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/AttributeMeta.java b/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/AttributeMeta.java
deleted file mode 100644
index 833ec1d..0000000
--- a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/model/AttributeMeta.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you 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.apache.myfaces.buildtools.maven2.plugin.builder.model;
-
-import org.apache.commons.digester.Digester;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.io.XmlWriter;
-
-/**
- * Store metadata about a attribute of a jsp tag. 
- * <p>
- * This metadata defines the attributes of JSP tags, among other things.
- * 
- * Since this is a different concept from PropertyMeta, is is left as
- * another class (Maybe PropertyMeta must AttributeMeta but I'm not sure, since
- * there are different concepts (a property is for jsf, an attribute is for jsp)).
- */
-public class AttributeMeta
-{
-    private String _name;
-    private String _className;
-    private Boolean _required;
-    private String _description;
-    private String _longDescription;
-    private Boolean _rtexprvalue;
-    private String _deferredValueType;
-    private String _deferredMethodSignature;
-    private Boolean _exclude;
-    
-    //Set on facelet merge
-    private transient Boolean _faceletsOnly;
-
-    public AttributeMeta()
-    {
-        
-    }
-    
-    /**
-      * @since 1.0.4
-      **/
-    public AttributeMeta(AttributeMeta am)
-    {
-        _name = am._name;
-        _className = am._className;
-        _required = am._required;
-        _description = am._description;
-        _longDescription = am._longDescription;
-        _rtexprvalue = am._rtexprvalue;
-        _deferredValueType = am._deferredValueType;
-        _deferredMethodSignature = am._deferredMethodSignature;
-        _exclude = am._exclude;
-        _faceletsOnly = am._faceletsOnly;
-    }
... 99041 lines suppressed ...

-- 
To stop receiving notification emails like this one, please contact
deki@apache.org.