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:07 UTC

[myfaces-build-tools] 01/02: Create branch to prepare for release 1 of checkstyle rules module

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

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

commit 595523c66c07461057dcb49de3321684680595f2
Author: Simon Kitching <sk...@apache.org>
AuthorDate: Wed Jul 9 18:58:54 2008 +0000

    Create branch to prepare for release 1 of checkstyle rules module
---
 other/checkstyle-rules/LICENSE.txt => LICENSE.txt  |    0
 other/checkstyle-rules/NOTICE.txt => NOTICE.txt    |    0
 maven2-archetypes/LICENSE.txt                      |  202 -
 maven2-archetypes/NOTICE.txt                       |   16 -
 .../LICENSE.txt                                    |  202 -
 .../NOTICE.txt                                     |   16 -
 .../myfaces-archetype-helloworld-facelets/pom.xml  |   36 -
 .../main/resources/META-INF/maven/archetype.xml    |   21 -
 .../src/main/resources/archetype-resources/pom.xml |   96 -
 .../src/main/java/HelloWorldBacking.java           |   58 -
 .../src/main/webapp/WEB-INF/examples-config.xml    |   39 -
 .../src/main/webapp/WEB-INF/tomahawk.taglib.xml    |  458 -
 .../src/main/webapp/WEB-INF/web.xml                |  284 -
 .../src/main/webapp/helloWorld.xhtml               |   26 -
 .../archetype-resources/src/main/webapp/index.jsp  |    4 -
 .../src/main/webapp/page2.xhtml                    |   21 -
 .../src/main/webapp/template.xhtml                 |   16 -
 .../myfaces-archetype-helloworld-portlets/pom.xml  |   16 -
 .../src/main/resources/META-INF/archetype.xml      |   40 -
 .../src/main/resources/archetype-resources/pom.xml |  230 -
 .../portlet/faces/demo/helloworld/NameBean.java    |   20 -
 .../src/main/resources/log4j.properties            |   18 -
 .../src/main/webapp/WEB-INF/faces-config.xml       |   25 -
 .../webapp/WEB-INF/jetty-pluto-web-default.xml     |  242 -
 .../src/main/webapp/WEB-INF/portlet.xml            |   61 -
 .../src/main/webapp/WEB-INF/web.xml                |   54 -
 .../archetype-resources/src/main/webapp/edit.jsp   |   20 -
 .../src/main/webapp/helloworld/hello.jsp           |   21 -
 .../src/main/webapp/helloworld/index.jsp           |   24 -
 .../archetype-resources/src/main/webapp/help.jsp   |   20 -
 .../archetype-resources/src/main/webapp/index.jsp  |   27 -
 .../myfaces-archetype-helloworld/LICENSE.txt       |  202 -
 .../myfaces-archetype-helloworld/NOTICE.txt        |   16 -
 .../myfaces-archetype-helloworld/pom.xml           |   16 -
 .../src/main/resources/META-INF/archetype.xml      |   36 -
 .../src/main/resources/archetype-resources/pom.xml |   92 -
 .../apache/myfaces/blank/HelloWorldController.java |   52 -
 .../src/main/resources/log4j.properties            |   18 -
 .../src/main/webapp/WEB-INF/faces-config.xml       |   33 -
 .../src/main/webapp/WEB-INF/web.xml                |  218 -
 .../src/main/webapp/helloWorld.jsp                 |   19 -
 .../archetype-resources/src/main/webapp/index.jsp  |    4 -
 .../archetype-resources/src/main/webapp/page2.jsp  |   17 -
 .../src/site/apt/index.apt                         |   13 -
 .../myfaces-archetype-jsfcomponents/LICENSE.txt    |  202 -
 .../myfaces-archetype-jsfcomponents/NOTICE.txt     |   16 -
 .../myfaces-archetype-jsfcomponents/pom.xml        |   15 -
 .../src/main/resources/META-INF/archetype.xml      |   65 -
 .../resources/archetype-resources/core/pom.xml     |  302 -
 .../component/sayhello/SayHello.java               |   77 -
 .../component/sayhello/SayHelloRenderer.java       |   63 -
 .../component/sayhello/SayHelloTag.java            |   82 -
 .../src/main/resources/META-INF/faces-config.xml   |   29 -
 .../resources/META-INF/mycomponents.taglib.xml     |   15 -
 .../src/main/tld/entities/say_hello_attributes.xml |   17 -
 .../main/tld/entities/ui_component_attributes.xml  |   34 -
 .../src/main/tld/misc/resolve_entities-tlddoc.xsl  |   32 -
 .../core/src/main/tld/misc/resolve_entities.xsl    |   51 -
 .../src/main/tld/misc/web-jsptaglibrary_1_2.dtd    |  108 -
 .../core/src/main/tld/mycomponents.tld             |   46 -
 .../component/sayhello/SayHelloRendererTest.java   |   66 -
 .../resources/archetype-resources/examples/pom.xml |  150 -
 .../component/example/SayHelloBean.java            |   66 -
 .../component/example/build.properties             |    4 -
 .../src/main/webapp/WEB-INF/examples-config.xml    |   31 -
 .../examples/src/main/webapp/WEB-INF/web.xml       |   38 -
 .../examples/src/main/webapp/home.jsp              |   38 -
 .../examples/src/main/webapp/index.jsp             |    1 -
 .../examples/src/main/webapp/sayhello.jsp          |   49 -
 .../src/main/resources/archetype-resources/pom.xml |   27 -
 .../myfaces-archetype-trinidad/LICENSE.txt         |  202 -
 .../myfaces-archetype-trinidad/NOTICE.txt          |   16 -
 .../myfaces-archetype-trinidad/pom.xml             |   35 -
 .../src/main/resources/META-INF/LICENSE            |  202 -
 .../src/main/resources/META-INF/NOTICE             |   16 -
 .../src/main/resources/META-INF/archetype.xml      |   32 -
 .../src/main/resources/archetype-resources/pom.xml |  115 -
 .../myfaces/trinidad/blank/HelloWorldBacking.java  |   67 -
 .../src/main/webapp/WEB-INF/faces-config.xml       |   63 -
 .../src/main/webapp/WEB-INF/web.xml                |  113 -
 .../archetype-resources/src/main/webapp/index.jspx |   37 -
 .../archetype-resources/src/main/webapp/page2.jspx |   37 -
 maven2-archetypes/pom.xml                          |  204 -
 maven2-archetypes/src/site/apt/index.apt           |   37 -
 maven2-plugins/LICENSE.txt                         |  202 -
 maven2-plugins/NOTICE.txt                          |   16 -
 maven2-plugins/myfaces-builder-annotations/pom.xml |   67 -
 .../plugin/builder/annotation/JSFComponent.java    |  340 -
 .../plugin/builder/annotation/JSFConverter.java    |   75 -
 .../plugin/builder/annotation/JSFExclude.java      |   44 -
 .../maven2/plugin/builder/annotation/JSFFacet.java |   49 -
 .../plugin/builder/annotation/JSFJspAttribute.java |   72 -
 .../builder/annotation/JSFJspProperties.java       |   35 -
 .../plugin/builder/annotation/JSFJspProperty.java  |  102 -
 .../plugin/builder/annotation/JSFJspTag.java       |   48 -
 .../plugin/builder/annotation/JSFProperty.java     |  121 -
 .../plugin/builder/annotation/JSFRenderKit.java    |   39 -
 .../plugin/builder/annotation/JSFRenderer.java     |   58 -
 .../plugin/builder/annotation/JSFValidator.java    |   76 -
 maven2-plugins/myfaces-builder-plugin/LICENSE.txt  |  202 -
 maven2-plugins/myfaces-builder-plugin/NOTICE.txt   |   16 -
 maven2-plugins/myfaces-builder-plugin/pom.xml      |  189 -
 .../maven2/plugin/builder/BuildMetaDataMojo.java   |  471 -
 .../maven2/plugin/builder/Flattener.java           |  194 -
 .../buildtools/maven2/plugin/builder/IOUtils.java  |  383 -
 .../maven2/plugin/builder/MakeComponentsMojo.java  |  632 --
 .../maven2/plugin/builder/MakeConfigMojo.java      |  366 -
 .../plugin/builder/MakeConverterTagsMojo.java      |  384 -
 .../maven2/plugin/builder/MakeTagsMojo.java        |  384 -
 .../plugin/builder/MakeValidatorTagsMojo.java      |  384 -
 .../maven2/plugin/builder/MakeValidatorsMojo.java  |  376 -
 .../maven2/plugin/builder/ModelBuilder.java        |   47 -
 .../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 |  174 -
 .../maven2/plugin/builder/model/ClassMeta.java     |  316 -
 .../maven2/plugin/builder/model/ComponentMeta.java |  451 -
 .../maven2/plugin/builder/model/ConverterMeta.java |  298 -
 .../maven2/plugin/builder/model/FacetHolder.java   |   34 -
 .../maven2/plugin/builder/model/FacetMeta.java     |  195 -
 .../plugin/builder/model/MethodSignatureMeta.java  |  124 -
 .../maven2/plugin/builder/model/Model.java         |  348 -
 .../maven2/plugin/builder/model/ModelUtils.java    |  128 -
 .../plugin/builder/model/PropertyHolder.java       |   36 -
 .../maven2/plugin/builder/model/PropertyMeta.java  |  525 --
 .../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 -
 .../plugin/builder/qdox/QdoxModelBuilder.java      | 1532 ----
 .../builder/unpack/AbstractDependencyMojo.java     |  416 -
 .../unpack/AbstractFromConfigurationMojo.java      |  434 -
 .../maven2/plugin/builder/unpack/ArtifactItem.java |  361 -
 .../maven2/plugin/builder/unpack/UnpackMojo.java   |  469 -
 .../plugin/builder/utils/BuildException.java       |   41 -
 .../plugin/builder/utils/ConsoleLogSystem.java     |   76 -
 .../maven2/plugin/builder/utils/MyfacesUtils.java  |  745 --
 .../utils/RelativeClasspathResourceLoader.java     |  149 -
 .../maven2/plugin/tagdoc/TagdocContentMojo.java    |  885 --
 .../maven2/plugin/tagdoc/TagdocIndexReport.java    |  478 -
 .../maven2/plugin/tagdoc/TagdocUtils.java          |  162 -
 .../main/resources/META-INF/componentClass11.vm    |  252 -
 .../resources/META-INF/componentClassMacros11.vm   |    4 -
 .../src/main/resources/META-INF/faces-config11.vm  |   75 -
 .../src/main/resources/META-INF/myfaces_html.vm    |   52 -
 .../src/main/resources/META-INF/tagClass11.vm      |  166 -
 .../main/resources/META-INF/tagClassMacros11.vm    |    0
 .../main/resources/META-INF/validatorClass11.vm    |  222 -
 .../resources/META-INF/validatorClassMacros11.vm   |    4 -
 .../src/main/resources/META-INF/xdoc-component.vm  |  104 -
 .../src/main/resources/META-INF/xdoc-converter.vm  |   66 -
 .../src/main/resources/META-INF/xdoc-tag.vm        |   49 -
 .../src/main/resources/META-INF/xdoc-validator.vm  |   66 -
 .../src/main/resources/META-INF/xmlMacros.vm       |    0
 .../myfaces-builder-plugin/src/site/apt/howto.apt  |   40 -
 .../myfaces-builder-plugin/src/site/apt/index.apt  |  167 -
 .../myfaces-builder-plugin/src/site/site.xml       |   41 -
 .../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    |  151 -
 .../test/resources/builder/complex/goodfile.xml    |  124 -
 .../resources/builder/generation/goodfile-flat.xml |  218 -
 .../test/resources/builder/generation/goodfile.xml |  137 -
 .../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/NOTICE.txt     |   16 -
 maven2-plugins/myfaces-faces-plugin/pom.xml        |  119 -
 .../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 -
 .../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/NOTICE.txt      |   16 -
 maven2-plugins/myfaces-i18n-plugin/pom.xml         |   76 -
 .../plugin/i18n/GenerateJavascriptLocalesMojo.java |  156 -
 .../plugin/i18n/GenerateLocaleElementsMojo.java    |  139 -
 .../i18n/uixtools/JSLocaleElementsGenerator.java   |  906 --
 .../maven2/plugin/i18n/uixtools/VersionUtils.java  |   35 -
 maven2-plugins/myfaces-javacc-plugin/LICENSE.txt   |  242 -
 maven2-plugins/myfaces-javacc-plugin/NOTICE.txt    |   20 -
 maven2-plugins/myfaces-javacc-plugin/pom.xml       |   72 -
 .../maven2/plugin/javacc/JavaCCMojo.java           |  348 -
 .../myfaces-javacc-plugin/src/site/apt/index.apt   |  115 -
 .../myfaces-javacc-plugin/src/site/site.xml        |   41 -
 .../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 -
 .../myfaces-javascript-plugin/NOTICE.txt           |   16 -
 maven2-plugins/myfaces-javascript-plugin/pom.xml   |  110 -
 .../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 -
 .../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 -
 maven2-plugins/myfaces-jdev-plugin/LICENSE.txt     |  202 -
 maven2-plugins/myfaces-jdev-plugin/NOTICE.txt      |   16 -
 maven2-plugins/myfaces-jdev-plugin/pom.xml         |   67 -
 .../maven2/plugin/jdeveloper/JDeveloperMojo.java   | 1827 ----
 .../plugin/jdeveloper/TldContentHandler.java       |  187 -
 .../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-tagdoc-plugin/LICENSE.txt   |  202 -
 maven2-plugins/myfaces-tagdoc-plugin/NOTICE.txt    |   16 -
 maven2-plugins/myfaces-tagdoc-plugin/pom.xml       |  144 -
 .../maven2/plugin/tagdoc/TagdocReport.java         | 1441 ---
 maven2-plugins/myfaces-wagon-plugin/LICENSE.txt    |  202 -
 maven2-plugins/myfaces-wagon-plugin/NOTICE.txt     |   10 -
 maven2-plugins/myfaces-wagon-plugin/pom.xml        |  134 -
 .../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 -
 .../myfaces-wagon-plugin/src/site/site.xml         |   40 -
 maven2-plugins/myfaces-xrts-plugin/LICENSE.txt     |  202 -
 maven2-plugins/myfaces-xrts-plugin/NOTICE.txt      |   16 -
 maven2-plugins/myfaces-xrts-plugin/pom.xml         |   81 -
 .../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 -
 maven2-plugins/pom.xml                             |  263 -
 maven2-plugins/src/site/apt/index.apt              |   77 -
 other/normalizer/README.txt                        |   18 -
 other/normalizer/norm                              |    1 -
 other/normalizer/pom.xml                           |   18 -
 .../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 -
 other/checkstyle-rules/pom.xml => pom.xml          |    0
 .../resources/default/myfaces-checks-minimal.xml   |    0
 .../resources/default/myfaces-checks-standard.xml  |    0
 .../resources/default/myfaces-checks-strict.xml    |    0
 .../default/myfaces-codestyle-eclipse.txt          |    0
 .../resources/default/myfaces-codestyle-idea.xml   |    0
 .../resources/default/myfaces-header-regexp.txt    |    0
 .../resources/default/myfaces-header-spaces.txt    |    0
 .../main/resources/default/myfaces-header.txt      |    0
 .../main/resources/tobago/checkstyle-header.txt    |    0
 .../main/resources/tobago/checkstyle-strict.xml    |    0
 .../main/resources/tobago/checkstyle.xml           |    0
 545 files changed, 89663 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/other/checkstyle-rules/NOTICE.txt b/NOTICE.txt
similarity index 100%
rename from other/checkstyle-rules/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/LICENSE.txt b/maven2-archetypes/myfaces-archetype-helloworld-facelets/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/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/NOTICE.txt b/maven2-archetypes/myfaces-archetype-helloworld-facelets/NOTICE.txt
deleted file mode 100644
index 9987813..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/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                   ==
-=========================================================================
-
-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.
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/pom.xml
deleted file mode 100644
index c4ca157..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/pom.xml
+++ /dev/null
@@ -1,36 +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">
-
-  <parent>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-parent</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.myfaces.buildtools</groupId>
-  <artifactId>myfaces-archetype-helloworld-facelets</artifactId>
-  <packaging>maven-plugin</packaging>
-  <name>MyFaces Facelets Archetype</name>
-  <description>Archetype to create a new webapp based on MyFaces and Facelets</description>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/maven/archetype.xml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index 1991f80..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<archetype>
-  <id>maven-archetype-myfaces-facelets</id>
-  <sources>
-    <source>src/main/java/HelloWorldBacking.java</source>
-  </sources>
-  <testSources>
-  <!-- 
-    <source>src/test/java/AppTest.java</source>
-     -->
-  </testSources>
-  <resources>
-    <resource>pom.xml</resource>
-  	<resource>src/main/webapp/WEB-INF/examples-config.xml</resource>
-  	<resource>src/main/webapp/WEB-INF/tomahawk.taglib.xml</resource>
-  	<resource>src/main/webapp/WEB-INF/web.xml</resource>
-  	<resource>src/main/webapp/helloWorld.xhtml</resource>
-  	<resource>src/main/webapp/index.jsp</resource>
-  	<resource>src/main/webapp/page2.xhtml</resource>
-  	<resource>src/main/webapp/template.xhtml</resource>
-  </resources>
-</archetype>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 6e6b36a..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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>
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <packaging>war</packaging>
-    <version>${version}</version>
-    <name>A custom project using myfaces</name>
-    <url>http://www.myorganization.org</url>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <!--This plugin allows to run the example using mvn jetty:run -->
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.8</version>
-                <configuration>
-                    <scanIntervalSeconds>10</scanIntervalSeconds>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>apache-maven-snapshots</id>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-        </repository>
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>        
-    </repositories>
-
-    <!-- Project dependencies -->
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <version>1.2.2</version>
-            <scope>compile</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-impl</artifactId>
-            <version>1.2.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.tomahawk</groupId>
-            <artifactId>tomahawk</artifactId>
-            <version>1.1.6</version>
-            <scope>runtime</scope>    
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>jstl</artifactId>
-                </exclusion>
-            </exclusions>    
-        </dependency>
-
-        <dependency>
-            <groupId>jstl</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.2</version>
-            <scope>runtime</scope>
-        </dependency>   
-    
-     	<dependency>
-		    <groupId>com.sun.facelets</groupId>
-		    <artifactId>jsf-facelets</artifactId>
-		    <version>1.1.11</version>
-	    </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.0</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/java/HelloWorldBacking.java b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/java/HelloWorldBacking.java
deleted file mode 100644
index c79989a..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/java/HelloWorldBacking.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 $package;
-
-/**
- * A typical simple backing bean, that is backed to <code>helloworld.jsp</code>
- * 
- * @author <a href="mailto:matzew@apache.org">Matthias We�endorf</a> 
- */
-public class HelloWorldBacking
-{
-
-    //properties
-    private String name;
-
-    /**
-     * default empty constructor
-     */
-    public HelloWorldBacking()
-    {
-    }
-
-    //-------------------getter & setter
-    public String getName()
-    {
-        return name;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-    /**
-     * Method that is backed to a submit button of a form.
-     */
-    public String send()
-    {
-        //do real logic
-        return ("success");
-    }
-}
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/examples-config.xml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/examples-config.xml
deleted file mode 100644
index 4dfab50..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/examples-config.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE faces-config PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
-  "http://java.sun.com/dtd/web-facesconfig_1_1.dtd" >
-
-<faces-config>
-
-	<application>
-		<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
-	</application>
-
-	<!-- managed beans of the simple hello world app -->
-	<managed-bean>
-		<managed-bean-name>helloWorldBacking</managed-bean-name>
-		<managed-bean-class>
-			${package}.HelloWorldBacking
-		</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>
-
-	<!-- navigation rules for helloWorld.jsp -->
-	<navigation-rule>
-		<from-view-id>/helloWorld.xhtml</from-view-id>
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/page2.xhtml</to-view-id>
-		</navigation-case>
-	</navigation-rule>
-
-	<!-- navigation rules for page2.jsp -->
-	<navigation-rule>
-		<from-view-id>/page2.xhtml</from-view-id>
-		<navigation-case>
-			<from-outcome>back</from-outcome>
-			<to-view-id>/helloWorld.xhtml</to-view-id>
-		</navigation-case>
-	</navigation-rule>
-</faces-config>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tomahawk.taglib.xml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tomahawk.taglib.xml
deleted file mode 100644
index b9fc141..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tomahawk.taglib.xml
+++ /dev/null
@@ -1,458 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "facelet-taglib_1_0.dtd">
-<facelet-taglib>
-    <!-- author: thomas.jachmann@mindmatters.de -->
-    <namespace>http://myfaces.apache.org/tomahawk</namespace>
-    <tag>
-        <tag-name>commandButton</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlCommandButton</component-type>
-            <renderer-type>org.apache.myfaces.Button</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>commandLink</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlCommandLink</component-type>
-            <renderer-type>org.apache.myfaces.Link</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>dataTable</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlDataTable</component-type>
-            <renderer-type>org.apache.myfaces.Table</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>inputHidden</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlInputHidden</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>inputSecret</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlInputSecret</component-type>
-            <renderer-type>org.apache.myfaces.Secret</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>inputText</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlInputText</component-type>
-            <renderer-type>org.apache.myfaces.Text</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>inputTextHelp</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlInputTextHelp</component-type>
-            <renderer-type>org.apache.myfaces.TextHelp</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>inputTextarea</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlInputTextarea</component-type>
-            <renderer-type>org.apache.myfaces.Textarea</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>graphicImage</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlGraphicImage</component-type>
-            <renderer-type>org.apache.myfaces.Image</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>message</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlMessage</component-type>
-            <renderer-type>org.apache.myfaces.Message</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>messages</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlMessages</component-type>
-            <renderer-type>org.apache.myfaces.Messages</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>outputLabel</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlOutputLabel</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>outputText</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlOutputText</component-type>
-            <renderer-type>org.apache.myfaces.Text</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>panelGrid</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlPanelGrid</component-type>
-            <renderer-type>org.apache.myfaces.Grid</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>panelGroup</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlPanelGroup</component-type>
-            <renderer-type>org.apache.myfaces.Group</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>selectOneMenu</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlSelectOneMenu</component-type>
-            <renderer-type>org.apache.myfaces.Menu</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>selectManyMenu</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlSelectManyMenu</component-type>
-            <renderer-type>org.apache.myfaces.Menu</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>selectOneRadio</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlSelectOneRadio</component-type>
-            <renderer-type>org.apache.myfaces.Radio</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>selectBooleanCheckbox</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlSelectBooleanCheckbox</component-type>
-            <renderer-type>org.apache.myfaces.Checkbox</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>selectManyCheckbox</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlSelectManyCheckbox</component-type>
-            <renderer-type>org.apache.myfaces.Checkbox</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>selectOneListbox</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlSelectOneListbox</component-type>
-            <renderer-type>org.apache.myfaces.Listbox</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>selectManyListbox</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlSelectManyListbox</component-type>
-            <renderer-type>org.apache.myfaces.Listbox</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>inputCalendar</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlInputCalendar</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>jsValueChangeListener</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.JsValueChangeListener</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>jsValueSet</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlJsValueSet</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>checkbox</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlCheckbox</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>commandNavigation</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlCommandNavigation</component-type>
-            <renderer-type>org.apache.myfaces.Navigation</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>commandNavigation2</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlCommandNavigationItem</component-type>
-            <renderer-type>org.apache.myfaces.NavigationMenu</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>commandSortHeader</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlCommandSortHeader</component-type>
-            <renderer-type>org.apache.myfaces.SortHeader</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>dataList</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlDataList</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>dataScroller</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlDataScroller</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>inputDate</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlInputDate</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>inputFileUpload</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlInputFileUpload</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>inputHtml</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.InputHtml</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>navigationMenuItem</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.NavigationMenuItem</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>navigationMenuItems</tag-name>
-        <component>
-            <component-type>javax.faces.SelectItems</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>jscookMenu</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.JSCookMenu</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>panelLayout</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlPanelLayout</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>panelNavigation</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlPanelNavigation</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>panelNavigation2</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlPanelNavigationMenu</component-type>
-            <renderer-type>org.apache.myfaces.NavigationMenu</renderer-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>panelTab</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlPanelTab</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>panelTabbedPane</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlPanelTabbedPane</component-type>
-        </component>
-    </tag>
-    <!-- deactivated since there's no component! tag>
-        <tag-name>tabChangeListener</tag-name>
-        <component>
-        <component-type></component-type>
-        </component>
-        </tag-->
-    <tag>
-        <tag-name>collapsiblePanel</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlCollapsiblePanel</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>selectOneCountry</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.SelectOneCountry</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>selectOneLanguage</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.SelectOneLanguage</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>stylesheet</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.Stylesheet</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>div</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.Div</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>htmlTag</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlTag</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>radio</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlRadio</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>tree</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlTree</component-type>
-            <renderer-type>org.apache.myfaces.HtmlTree</renderer-type>
-        </component>
-    </tag>
-    <!-- deactivated since there's no component! tag>
-        <tag-name>treeSelectionListener</tag-name>
-        <component>
-        <component-type></component-type>
-        </component>
-        </tag-->
-    <!-- deactivated since there's no component! tag>
-        <tag-name>iconProvider</tag-name>
-        <component>
-        <component-type></component-type>
-        </component>
-        </tag-->
-    <tag>
-        <tag-name>treeColumn</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlTreeColumn</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>treeCheckbox</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlTreeCheckbox</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>tree2</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlTree2</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>panelStack</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlPanelStack</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>popup</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlPopup</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>newspaperTable</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlNewspaperTable</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>aliasBean</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.AliasBean</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>aliasBeansScope</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.AliasBeansScope</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>buffer</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.Buffer</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>saveState</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.SaveState</component-type>
-        </component>
-    </tag>
-    <!-- deactivated since there's no component! tag>
-        <tag-name>updateActionListener</tag-name>
-        <component>
-        <component-type></component-type>
-        </component>
-        </tag-->
-    <tag>
-        <tag-name>validateCreditCard</tag-name>
-        <validator>
-            <validator-id>org.apache.myfaces.validator.CreditCard</validator-id>
-        </validator>
-    </tag>
-    <tag>
-        <tag-name>validateEmail</tag-name>
-        <validator>
-            <validator-id>org.apache.myfaces.validator.Email</validator-id>
-        </validator>
-    </tag>
-    <tag>
-        <tag-name>validateEqual</tag-name>
-        <validator>
-            <validator-id>org.apache.myfaces.validator.Equal</validator-id>
-        </validator>
-    </tag>
-    <tag>
-        <tag-name>swapImage</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlSwapImage</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>columns</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlColumns</component-type>
-        </component>
-    </tag>
-    <tag>
-        <tag-name>column</tag-name>
-        <component>
-            <component-type>org.apache.myfaces.HtmlColumn</component-type>
-        </component>
-    </tag>
-    <!-- additional validators (note: not in tld, so no code completion) -->
-    <tag>
-        <tag-name>validateRegExpr</tag-name>
-        <validator>
-            <validator-id>org.apache.myfaces.validator.RegExpr</validator-id>
-        </validator>
-    </tag>
-</facelet-taglib>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index e5a6b50..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,284 +0,0 @@
-<?xml version="1.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.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-	version="2.4">
-
-	<description>MyProject web.xml</description>
-
-	<context-param>
-		<param-name>
-			org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL
-		</param-name>
-		<param-value>true</param-value>
-	</context-param>
-
-	<!-- Configure tomahawk taglib -->
-	<context-param>
-		<param-name>facelets.LIBRARIES</param-name>
-		<param-value>/WEB-INF/tomahawk.taglib.xml</param-value>
-	</context-param>
-
-	<!-- Use Documents Saved as *.xhtml -->
-	<context-param>
-		<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
-		<param-value>.xhtml</param-value>
-	</context-param>
-
-	<!-- Special Debug Output for Development -->
-	<context-param>
-		<param-name>facelets.DEVELOPMENT</param-name>
-		<param-value>true</param-value>
-	</context-param>
-
-	<context-param>
-		<description>
-			Comma separated list of URIs of (additional) faces config
-			files. (e.g. /WEB-INF/my-config.xml) See JSF 1.0 PRD2,
-			10.3.2 Attention: You do not need to put
-			/WEB-INF/faces-config.xml in here.
-		</description>
-		<param-name>javax.faces.CONFIG_FILES</param-name>
-		<param-value>/WEB-INF/examples-config.xml</param-value>
-	</context-param>
-	<context-param>
-		<description>
-			State saving method: "client" or "server" (= default) See
-			JSF Specification 2.5.3
-		</description>
-		<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-		<param-value>client</param-value>
-	</context-param>
-	<context-param>
-		<description>
-			Only applicable if state saving method is "server" (=
-			default). Defines the amount (default = 20) of the latest
-			views are stored in session.
-		</description>
-		<param-name>
-			org.apache.myfaces.NUMBER_OF_VIEWS_IN_SESSION
-		</param-name>
-		<param-value>20</param-value>
-	</context-param>
-	<context-param>
-		<description>
-			Only applicable if state saving method is "server" (=
-			default). If true (default) the state will be serialized to
-			a byte stream before it is written to the session. If false
-			the state will not be serialized to a byte stream.
-		</description>
-		<param-name>
-			org.apache.myfaces.SERIALIZE_STATE_IN_SESSION
-		</param-name>
-		<param-value>true</param-value>
-	</context-param>
-	<context-param>
-		<description>
-			Only applicable if state saving method is "server" (=
-			default) and if
-			org.apache.myfaces.SERIALIZE_STATE_IN_SESSION is true (=
-			default) If true (default) the serialized state will be
-			compressed before it is written to the session. If false the
-			state will not be compressed.
-		</description>
-		<param-name>
-			org.apache.myfaces.COMPRESS_STATE_IN_SESSION
-		</param-name>
-		<param-value>true</param-value>
-	</context-param>
-	<context-param>
-		<description>
-			This parameter tells MyFaces if javascript code should be
-			allowed in the rendered HTML output. If javascript is
-			allowed, command_link anchors will have javascript code that
-			submits the corresponding form. If javascript is not
-			allowed, the state saving info and nested parameters will be
-			added as url parameters. Default: "true"
-		</description>
-		<param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
-		<param-value>true</param-value>
-	</context-param>
-	<context-param>
-		<param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
-		<param-value>false</param-value>
-	</context-param>
-	<context-param>
-		<description>
-			If true, rendered HTML code will be formatted, so that it is
-			"human readable". i.e. additional line separators and
-			whitespace will be written, that do not influence the HTML
-			code. Default: "true"
-		</description>
-		<param-name>org.apache.myfaces.PRETTY_HTML</param-name>
-		<param-value>true</param-value>
-	</context-param>
-	<context-param>
-		<description>
-			If true, a javascript function will be rendered that is able
-			to restore the former vertical scroll on every request.
-			Convenient feature if you have pages with long lists and you
-			do not want the browser page to always jump to the top if
-			you trigger a link or button action that stays on the same
-			page. Default: "false"
-		</description>
-		<param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
-		<param-value>true</param-value>
-	</context-param>
-
-	<context-param>
-		<description>
-			Used for encrypting view state. Only relevant for client
-			side state saving. See MyFaces wiki/web site documentation
-			for instructions on how to configure an application for
-			diffenent encryption strengths.
-		</description>
-		<param-name>org.apache.myfaces.SECRET</param-name>
-		<param-value>NzY1NDMyMTA=</param-value>
-	</context-param>
-
-	<context-param>
-		<description>
-			Validate managed beans, navigation rules and ensure that
-			forms are not nested.
-		</description>
-		<param-name>org.apache.myfaces.VALIDATE</param-name>
-		<param-value>true</param-value>
-	</context-param>
-
-	<context-param>
-		<description>
-			Treat readonly same as if disabled attribute was set for
-			select elements.
-		</description>
-		<param-name>
-			org.apache.myfaces.READONLY_AS_DISABLED_FOR_SELECTS
-		</param-name>
-		<param-value>true</param-value>
-	</context-param>
-
-	<context-param>
-		<description>
-			Use the defined class as the class which will be called when
-			a resource is added to the ExtensionFilter handling. Using
-			StreamingAddResource here helps with performance. If you
-			want to add custom components and want to use the
-			ExtensionFilter, you need to provide your custom
-			implementation here.
-		</description>
-		<param-name>org.apache.myfaces.ADD_RESOURCE_CLASS</param-name>
-		<param-value>
-			org.apache.myfaces.renderkit.html.util.DefaultAddResource
-		</param-value>
-	</context-param>
-
-	<context-param>
-		<description>
-			Virtual path in the URL which triggers loading of resources
-			for the MyFaces extended components in the ExtensionFilter.
-		</description>
-		<param-name>
-			org.apache.myfaces.RESOURCE_VIRTUAL_PATH
-		</param-name>
-		<param-value>/faces/myFacesExtensionResource</param-value>
-	</context-param>
-
-	<context-param>
-		<description>
-			Check if the extensions-filter has been properly configured.
-		</description>
-		<param-name>
-			org.apache.myfaces.CHECK_EXTENSIONS_FILTER
-		</param-name>
-		<param-value>true</param-value>
-	</context-param>
-
-	<context-param>
-		<description>
-			Define partial state saving as true/false.
-		</description>
-		<param-name>javax.faces.PARTIAL_STATE_SAVING_METHOD</param-name>
-		<param-value>false</param-value>
-	</context-param>
-
-	<!-- Extensions Filter -->
-	<filter>
-		<filter-name>extensionsFilter</filter-name>
-		<filter-class>
-			org.apache.myfaces.webapp.filter.ExtensionsFilter
-		</filter-class>
-		<init-param>
-			<description>
-				Set the size limit for uploaded files. Format: 10 - 10
-				bytes 10k - 10 KB 10m - 10 MB 1g - 1 GB
-			</description>
-			<param-name>uploadMaxFileSize</param-name>
-			<param-value>100m</param-value>
-		</init-param>
-		<init-param>
-			<description>
-				Set the threshold size - files below this limit are
-				stored in memory, files above this limit are stored on
-				disk.
-
-				Format: 10 - 10 bytes 10k - 10 KB 10m - 10 MB 1g - 1 GB
-			</description>
-			<param-name>uploadThresholdSize</param-name>
-			<param-value>100k</param-value>
-		</init-param>
-	</filter>
-
-	<filter-mapping>
-		<filter-name>extensionsFilter</filter-name>
-		<url-pattern>*.jsf</url-pattern>
-	</filter-mapping>
-	<filter-mapping>
-		<filter-name>extensionsFilter</filter-name>
-		<url-pattern>/faces/*</url-pattern>
-	</filter-mapping>
-
-	<!-- Listener, to allow Jetty serving MyFaces apps -->
-	<listener>
-		<listener-class>
-			org.apache.myfaces.webapp.StartupServletContextListener
-		</listener-class>
-	</listener>
-
-	<!-- Faces Servlet -->
-	<servlet>
-		<servlet-name>Faces Servlet</servlet-name>
-		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<!-- Faces Servlet Mapping -->
-	<servlet-mapping>
-		<servlet-name>Faces Servlet</servlet-name>
-		<url-pattern>*.jsf</url-pattern>
-	</servlet-mapping>
-
-	<!-- Welcome files -->
-	<welcome-file-list>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>index.html</welcome-file>
-	</welcome-file-list>
-
-</web-app>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml
deleted file mode 100644
index 51fd399..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html">
-<head>
-<title>Hello World</title>
-</head>
-<body>
-<ui:composition template="/template.xhtml">
-
-	<ui:define name="body">
-		<h:form id="form">
-			<h:panelGrid id="grid" columns="2">
-				<h:outputText id="output1" value="Please enter your name" />
-				<h:inputText id="input1" value="#{helloWorldBacking.name}"
-					required="true" />
-				<h:commandButton id="button1" value="press me"
-					action="#{helloWorldBacking.send}" />
-				<h:message id="message1" for="input1" />
-			</h:panelGrid>
-		</h:form>
-	</ui:define>
-</ui:composition>
-</body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/index.jsp
deleted file mode 100644
index a29c228..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page session="false"%>
-<%
-response.sendRedirect("helloWorld.jsf");
-%>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
deleted file mode 100644
index d5713c6..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html">
-<head>
-<title>Hello World</title>
-</head>
-<body>
-
-<f:view>
-	<h:outputText
-		value="Hello #{helloWorldBacking.name}. We hope you enjoy Apache MyFaces" />
-	<h:form id="form2">
-		<h:commandLink id="link1" action="back">
-			<h:outputText id="linkText" value="GO HOME" />
-		</h:commandLink>
-	</h:form>
-</f:view>
-</body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/template.xhtml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/template.xhtml
deleted file mode 100644
index 7cf88b1..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/template.xhtml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<title>Myfaces Example Facelets</title>
-</head>
-
-<body>
-<h1><ui:insert name="title">Myfaces Example Facelets</ui:insert></h1>
-<p><ui:insert name="body">Hello World Example!</ui:insert></p>
-</body>
-
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/pom.xml
deleted file mode 100644
index db5a046..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<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">
-
-    <parent>
-        <groupId>org.apache.myfaces.buildtools</groupId>
-        <artifactId>myfaces-archetype-parent</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-helloworld-portlets</artifactId>
-    <packaging>maven-plugin</packaging>
-    <name>MyFaces Portlet Archetype</name>
-    <description>Archetype to create a new portlet webapp based on myfaces</description>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/archetype.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index 749e789..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -1,40 +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.
- 
- @author Leonardo Uribe (latest modification by $Author$)
- @version $Revision$ $Date$
- 
--->
-
-<archetype>
-  <id>myfaces-archetype-helloworld-portlets</id>
-  <resources>
-    <resource>src/main/java/org/apache/myfaces/portlet/faces/demo/helloworld/NameBean.java</resource>
-    <resource>src/main/webapp/index.jsp</resource>
-    <resource>src/main/webapp/edit.jsp</resource>
-    <resource>src/main/webapp/help.jsp</resource>
-    <resource>src/main/webapp/helloworld/hello.jsp</resource>
-    <resource>src/main/webapp/helloworld/index.jsp</resource>
-    <resource>src/main/webapp/WEB-INF/web.xml</resource>
-    <resource>src/main/webapp/WEB-INF/portlet.xml</resource>
-    <resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
-    <resource>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</resource>
-  </resources>
-</archetype>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 404cc1c..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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>
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <packaging>war</packaging>
-    <version>${version}</version>
-    <name>A custom project using myfaces</name>
-    <url>http://www.myorganization.org</url>
-
-  <dependencies>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.4</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <version>2.1</version>
-      <scope>provided</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>1.2</version>    
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>portlet-api</groupId>
-      <artifactId>portlet-api</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-        
-    <dependency>
-      <groupId>org.apache.myfaces.portlet-bridge</groupId>
-      <artifactId>portlet-bridge-api</artifactId>
-      <version>1.0.0-alpha-2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.myfaces.portlet-bridge</groupId>
-      <artifactId>portlet-bridge-impl</artifactId>
-      <version>1.0.0-alpha-2</version>
-    </dependency>
-  </dependencies>
-    
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-jdev-plugin</artifactId>
-        <groupId>org.apache.myfaces.trinidadbuild</groupId>
-        <configuration>
-          <libraries>
-            <library>JSP Runtime</library>
-          </libraries>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <properties>
-    <jsf.version>1.2_03</jsf.version>
-  </properties>
-    
-  <profiles>
-    <!-- sets up the webapp for deployment to pluto  "mvn clean install -Ppluto" -->    
-    <profile>
-      <id>pluto</id>
-      <build>
-        <plugins>
-          <!-- configure maven-war-plugin to use updated web.xml -->
-          <plugin>
-            <artifactId>maven-war-plugin</artifactId>
-            <configuration>
-                 <webXml>
-                        ${project.build.directory}/pluto-resources/web.xml
-                </webXml>
-            </configuration>
-          </plugin>
-        
-          <plugin>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>maven-pluto-plugin</artifactId>
-            <version>1.1.4</version>
-            <executions>  
-              <execution>  
-                <phase>generate-resources</phase>  
-                <goals>  
-                  <goal>assemble</goal>  
-                </goals>  
-              </execution>  
-            </executions>  
-          </plugin>  
-        </plugins>
-      </build>
-    </profile>
-    
-    <!-- To run jetty, issue "mvn clean -PjettyConfig jetty:run" -->
-    <profile>
-      <id>jettyConfig</id>
-        <dependencies>
-        <dependency>
-          <groupId>com.bekk.boss</groupId>
-          <artifactId>maven-jetty-pluto-embedded</artifactId>
-          <version>1.0</version>
-        </dependency>
-        </dependencies>
-        <build>      
-      <plugins>
-        <plugin>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>maven-jetty-plugin</artifactId>
-          <configuration>
-            <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
-            <webDefaultXml>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
-            <systemProperties>
-              <systemProperty>
-                <name>org.apache.pluto.embedded.portletId</name>
-                <value>${artifactId}</value>
-              </systemProperty>
-            </systemProperties>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.pluto</groupId>
-          <artifactId>maven-pluto-plugin</artifactId>
-          <version>1.1.4</version>
-          <executions>  
-            <execution>  
-              <phase>generate-resources</phase>  
-              <goals>  
-                <goal>assemble</goal>  
-              </goals>  
-            </execution>  
-          </executions>  
-        </plugin>  
-      </plugins>
-      </build>  
-    </profile>  
-  
-    <!-- By default the war examples use myfaces! :) -->
-    <profile>
-      <id>myfaces</id>
-      <activation>
-        <property>
-          <name>!jsf</name>
-        </property>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.myfaces.core</groupId>
-          <artifactId>myfaces-api</artifactId>
-          <version>1.2.2</version>
-        </dependency>
-
-        <dependency>
-          <groupId>org.apache.myfaces.core</groupId>
-          <artifactId>myfaces-impl</artifactId>
-          <version>1.2.2</version>
-        </dependency>
-      </dependencies>
-    </profile>
-
-    <!-- To use the examples using the Sun's JSF Reference Implementation: mvn clean install -Djsf=ri -->
-    <profile>
-      <id>jsfri</id>
-      <activation>
-        <property>
-          <name>jsf</name>
-          <value>ri</value>
-        </property>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>javax.faces</groupId>
-          <artifactId>jsf-api</artifactId>
-          <version>${jsf.version}</version>
-        </dependency>
-      </dependencies>
-      <properties>
-        <jsf_implementation>JSF-RI</jsf_implementation>
-      </properties>
-    </profile>
-    
-    <profile>
-      <id>jsfri-provided</id>
-      <activation>
-        <property>
-          <name>jsf</name>
-          <value>ri-provided</value>
-        </property>
-      </activation>
-
-      <repositories>
-        <repository>
-          <id>java.net</id>
-          <name>java.net Maven 1 Repository</name>
-          <url>https://maven-repository.dev.java.net/nonav/repository</url>
-          <layout>legacy</layout>
-        </repository>
-      </repositories>
-      <dependencies>
-        <dependency>
-          <groupId>javax.faces</groupId>
-          <artifactId>jsf-api</artifactId>
-          <version>${jsf.version}</version>
-          <scope>compile</scope>
-        </dependency>
-        <dependency>
-          <groupId>javax.faces</groupId>
-          <artifactId>jsf-impl</artifactId>
-          <version>${jsf.version}</version>
-          <scope>runtime</scope>
-        </dependency>
-      </dependencies>
-      <properties>
-        <jsf_implementation>JSF-RI</jsf_implementation>
-      </properties>
-    </profile>
-  </profiles>
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/portlet/faces/demo/helloworld/NameBean.java b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/portlet/faces/demo/helloworld/NameBean.java
deleted file mode 100644
index 7a55842..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/portlet/faces/demo/helloworld/NameBean.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.apache.myfaces.portlet.faces.demo.helloworld;
-
-public class NameBean
-{
-  public String _name;
-  
-  public NameBean()
-  {
-  }
-
-  public void setName(String _name)
-  {
-    this._name = _name;
-  }
-
-  public String getName()
-  {
-    return _name;
-  }
-}
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/resources/log4j.properties
deleted file mode 100644
index a16da0a..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-#for debugging log4j itself
-log4j.debug=false
-
-#Logger-Priorities:
-#DEBUG lowest, prints all messages
-#INFO  prints all messages with FATAL, ERROR, WARN or INFO priority
-#WARN  prints all messages with FATAL, ERROR or WARN priority
-#ERROR prints all messages with FATAL or ERROR priority
-#FATAL highest, prints only FATAL messages
-
-# root logger
-log4j.rootLogger=INFO, A1
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
-
-# myfaces logger
-log4j.logger.org.apache.myfaces=INFO
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
deleted file mode 100644
index b821653..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE faces-config PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
-  "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-<faces-config xmlns="http://java.sun.com/JSF/Configuration">
-  <navigation-rule>
-    <from-view-id>*</from-view-id>
-    <navigation-case>
-      <from-outcome>helloWorld</from-outcome>
-      <to-view-id>/helloworld/index.jsp</to-view-id>
-    </navigation-case>
-  </navigation-rule>
-  <navigation-rule>
-    <from-view-id>/helloworld/index.jsp</from-view-id>
-    <navigation-case>
-      <from-outcome>sayhello</from-outcome>
-      <to-view-id>/helloworld/hello.jsp</to-view-id>
-    </navigation-case>
-  </navigation-rule>
-  <managed-bean>
-    <managed-bean-name>namebean</managed-bean-name>
-    <managed-bean-class>org.apache.myfaces.portlet.faces.demo.helloworld.NameBean</managed-bean-class>
-    <managed-bean-scope>request</managed-bean-scope>
-  </managed-bean>
-</faces-config>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
deleted file mode 100644
index 80ab83f..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    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.
-	   
--->
-
-<!-- This web.xml file is used in order to configure pluto to run with jetty in order to test the appropriate web applications -->
-<web-app 
-   xmlns="http://java.sun.com/xml/ns/javaee" 
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" 
-   metadata-complete="true"
-   version="2.5"> 
-
-  <context-param>
-    <param-name>org.mortbay.jetty.webapp.NoTLDJarPattern</param-name>
-    <param-value>start.jar|ant-.*\.jar|dojo-.*\.jar|jetty-.*\.jar|jsp-api-.*\.jar|junit-.*\.jar|servlet-api-.*\.jar|dnsns\.jar|rt\.jar|jsse\.jar|tools\.jar|sunpkcs11\.jar|sunjce_provider\.jar|xerces.*\.jar</param-value>
-  </context-param>
-  
-  <!-- Listeners -->
-  <listener>
-    <listener-class>
-      com.bekk.boss.pluto.embedded.jetty.util.OverrideContextLoaderListener
-    </listener-class>
-  </listener>
-  
-  <listener>
-    <listener-class>
      com.bekk.boss.pluto.embedded.util.PortalStartupListener
-    </listener-class>
-  </listener>
-
-  <!-- Filters and Mappings -->
-  <filter>
-    <filter-name>plutoResourceFilter</filter-name>
-    <filter-class>com.bekk.boss.pluto.embedded.util.PlutResourcesFilter</filter-class>
-  </filter>
-
-  <filter>
-    <filter-name>plutoPortalDriver</filter-name>
-    <filter-class>com.bekk.boss.pluto.embedded.util.PlutoPortalDriverFilter</filter-class>
-  </filter>
-	
-  <filter-mapping>
-    <filter-name>plutoResourceFilter</filter-name>
-    <url-pattern>*.css</url-pattern>
-    <url-pattern>*.gif</url-pattern>
-    <url-pattern>*.png</url-pattern>
-    <url-pattern>*.js</url-pattern>
-  </filter-mapping>
-
-  <filter-mapping>
-    <filter-name>plutoPortalDriver</filter-name>
-    <url-pattern>/pluto/index.jsp</url-pattern>
-    <url-pattern>/pluto/index.jsp/*</url-pattern>
-  </filter-mapping>
-
-  <!-- Servlets and Mappings -->
-
-  <!--
-    The default servlet.                                                  
-    This servlet, normally mapped to /, provides the handling for static  
-    content, OPTIONS and TRACE methods for the context.                   
-    The following initParameters are supported:                           
-                                                                          
-      acceptRanges     If true, range requests and responses are          
-                       supported                                          
-                                                                          
-      dirAllowed       If true, directory listings are returned if no     
-                       welcome file is found. Else 403 Forbidden.         
-                                                                          
-      redirectWelcome  If true, redirect welcome file requests            
-                       else use request dispatcher forwards               
-                                                                          
-      gzip             If set to true, then static content will be served  
-                       as gzip content encoded if a matching resource is  
-                       found ending with ".gz"                            
-                                                                          
-      resoureBase      Can be set to replace the context resource base    
-                                                                          
-      relativeResourceBase                                                
-                       Set with a pathname relative to the base of the    
-                       servlet context root. Useful for only serving      
-                       static content from only specific subdirectories.  
-                                                                          
-      useFileMappedBuffer                                                 
-                       If set to true (the default), a  memory mapped     
-                       file buffer will be used to serve static content   
-                       when using an NIO connector. Setting this value    
-                       to false means that a direct buffer will be used   
-                       instead. If you are having trouble with Windows    
-                       file locking, set this to false.                   
-                                                                          
-     cacheControl      If set, all static content will have this value    
-                       set as the cache-control header.                   
-                                                                          
-     maxCacheSize      Maximum size of the static resource cache          
-                                                                          
-     maxCachedFileSize Maximum size of any single file in the cache       
-                                                                          
-     maxCachedFiles    Maximum number of files in the cache               
-  -->
-
-  <servlet>
-    <servlet-name>default</servlet-name>
-    <servlet-class>org.mortbay.jetty.servlet.DefaultServlet</servlet-class>
-    <init-param>
-      <param-name>acceptRanges</param-name>
-      <param-value>true</param-value>
-    </init-param>
-    <init-param>
-      <param-name>dirAllowed</param-name>
-      <param-value>true</param-value>
-    </init-param>
-    <init-param>
-      <param-name>redirectWelcome</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <init-param>
-      <param-name>maxCacheSize</param-name>
-      <param-value>4000000</param-value>
-    </init-param>
-    <init-param>
-      <param-name>maxCachedFileSize</param-name>
-      <param-value>254000</param-value>
-    </init-param>
-    <init-param>
-      <param-name>maxCachedFiles</param-name>
-      <param-value>1000</param-value>
-    </init-param>
-    <init-param>
-      <param-name>gzip</param-name>
-      <param-value>true</param-value>
-    </init-param>
-    <init-param>
-      <param-name>useFileMappedBuffer</param-name>
-      <param-value>true</param-value>
-    </init-param>  
-    <load-on-startup>0</load-on-startup>
-  </servlet> 
-
-  <servlet id="jsp">
-    <servlet-name>jsp</servlet-name>
-    <servlet-class>com.bekk.boss.pluto.embedded.util.PortletJspServlet</servlet-class>
-    <init-param>
-        <param-name>logVerbosityLevel</param-name>
-        <param-value>DEBUG</param-value>
-    </init-param>
-    <init-param>
-        <param-name>fork</param-name>
-        <param-value>false</param-value>
-    </init-param>
-    <init-param>
-        <param-name>xpoweredBy</param-name>
-        <param-value>false</param-value>
-    </init-param>
-    <load-on-startup>0</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>default</servlet-name>
-    <url-pattern>/</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping> 
-    <servlet-name>jsp</servlet-name> 
-    <url-pattern>*.jsp</url-pattern> 
-    <url-pattern>*.jspf</url-pattern>
-    <url-pattern>*.jspx</url-pattern>
-    <url-pattern>*.xsp</url-pattern>
-    <url-pattern>*.JSP</url-pattern> 
-    <url-pattern>*.JSPF</url-pattern>
-    <url-pattern>*.JSPX</url-pattern>
-    <url-pattern>*.XSP</url-pattern>
-  </servlet-mapping>
-
-  <!-- Other settings -->
-  <session-config>
-    <session-timeout>60</session-timeout>
-  </session-config>
-
-  <welcome-file-list>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
-	
-  <locale-encoding-mapping-list>
-    <locale-encoding-mapping><locale>ar</locale><encoding>ISO-8859-6</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>be</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>bg</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ca</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>cs</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>da</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>de</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>el</locale><encoding>ISO-8859-7</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>en</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>es</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>et</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>fi</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>fr</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>hr</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>hu</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>is</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>it</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>iw</locale><encoding>ISO-8859-8</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ja</locale><encoding>Shift_JIS</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ko</locale><encoding>EUC-KR</encoding></locale-encoding-mapping>     
-    <locale-encoding-mapping><locale>lt</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>lv</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>mk</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>nl</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>no</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>pl</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>pt</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ro</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ru</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sh</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sk</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sl</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sq</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sr</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sv</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>tr</locale><encoding>ISO-8859-9</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>uk</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>zh</locale><encoding>GB2312</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>zh_TW</locale><encoding>Big5</encoding></locale-encoding-mapping>   
-  </locale-encoding-mapping-list>
-</web-app>
-
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
deleted file mode 100644
index 7830c6d..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    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.	   
--->
-<portlet-app version="1.0"
-             xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
-
-  <portlet>
-    <description lang="EN">MyFaces Portlet Bridge Demo Portlet</description>
-    <portlet-name>${artifactId}</portlet-name>
-    <display-name lang="EN">MyFaces Portlet Bridge Demo</display-name>
-    <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
-
-    <init-param>
-      <name>javax.portlet.faces.defaultViewId.view</name>
-      <value>/index.jsp</value>
-    </init-param>
-
-    <init-param>
-      <name>javax.portlet.faces.defaltViewId.edit</name>
-      <value>/edit.jsp</value>
-    </init-param>
-
-    <init-param>
-      <name>javax.portlet.faces.defaultViewId.help</name>
-      <value>/help.jsp</value>
-    </init-param>
-
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>edit</portlet-mode>
-      <portlet-mode>view</portlet-mode>
-      <portlet-mode>help</portlet-mode>
-    </supports>
-
-    <supported-locale>en</supported-locale>
-
-    <portlet-info>
-      <title>MyFaces Portlet Bridge Demo</title>
-      <short-title>Bridge Demo</short-title>
-    </portlet-info>
-  </portlet>
-    
-</portlet-app>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 4a409e4..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version = '1.0' encoding = 'ISO-8859-1'?>
-<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN' 'http://java.sun.com/dtd/web-app_2_3.dtd'>
-<!--
-    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.
-	   
--->
-<!-- The Jetty Pluto Plugin needs to have a Webapp 2.3 web-xml.  Don't know why. -->
-<web-app>
- 
-  <context-param>
-    <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
-    <param-value>.jsp</param-value>
-  </context-param>
-  
-  <!-- Listener, to allow Jetty serving MyFaces apps -->
-  <!-- TODO: is this needed anymore for jetty?  I don't think so.. -->
-  <!-- listener>
-    <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
-  </listener -->
-
-  <!-- Faces Servlet -->
-  <servlet>
-    <servlet-name>faces</servlet-name>
-    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <!-- Faces Servlet Mappings -->
-  <!-- 
-    In this demo application, I chose to use suffix mapping.  I did this because it makes urls
-    in the portlet world look nicer in the source.  The portlet url should be the same 
-    reguardless.
-  -->
-  <servlet-mapping>
-    <servlet-name>faces</servlet-name>
-    <url-pattern>*.jsf</url-pattern>
-  </servlet-mapping>
-  
-</web-app>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/edit.jsp b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/edit.jsp
deleted file mode 100644
index f7b780d..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/edit.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<f:view>
-  <html>
-    <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>index</title>
-    </head>
-    <body>
-      <h:form>
-        <h:panelGrid columns="1">
-          <h:outputText value="This is the portlet edit screen."/>
-        </h:panelGrid>
-      </h:form>
-    </body>
-  </html>
-</f:view>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/hello.jsp b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/hello.jsp
deleted file mode 100644
index 750b2fa..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/hello.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<f:view>
-  <html>
-    <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>hello</title>
-    </head>
-    <body>
-      <h:form>
-        <h:panelGrid columns="1">
-          <h:outputText value="Hello #{namebean.name}"/>
-          <h:commandButton value="return" action="helloWorld"/>
-        </h:panelGrid>
-      </h:form>
-    </body>
-  </html>
-</f:view>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/index.jsp b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/index.jsp
deleted file mode 100644
index 2b5743a..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/index.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<f:view>
-  <html>
-    <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>index</title>
-    </head>
-    <body>
-      <h:form>
-        <h:panelGrid columns="1">
-          <h:panelGrid columns="2">
-            <h:outputText value="Please enter your name: "/>
-            <h:inputText value="#{namebean.name}"/>
-          </h:panelGrid>
-          <h:commandButton value="Click Here" action="sayhello"/>
-        </h:panelGrid>
-      </h:form>
-    </body>
-  </html>
-</f:view>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/help.jsp b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/help.jsp
deleted file mode 100644
index e387c18..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/help.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<f:view>
-  <html>
-    <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>index</title>
-    </head>
-    <body>
-      <h:form>
-        <h:panelGrid columns="1">
-          <h:outputText value="This is the portlet help screen."/>
-        </h:panelGrid>
-      </h:form>
-    </body>
-  </html>
-</f:view>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/index.jsp
deleted file mode 100644
index 33e20e9..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<f:view>
-  <html>
-    <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>index</title>
-    </head>
-    <body>
-      <h:form>
-        <h:panelGrid columns="1">
-          <h:outputText value="Please select:"/>
-          <h:panelGroup>
-            <ul>
-              <li>
-                <h:commandLink value="HelloWorld example" action="helloWorld"/>
-              </li>
-            </ul>
-          </h:panelGroup>
-        </h:panelGrid>
-      </h:form>
-    </body>
-  </html>
-</f:view>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/LICENSE.txt b/maven2-archetypes/myfaces-archetype-helloworld/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/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/NOTICE.txt b/maven2-archetypes/myfaces-archetype-helloworld/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/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/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld/pom.xml
deleted file mode 100644
index 5e68f54..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<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">
-
-    <parent>
-        <groupId>org.apache.myfaces.buildtools</groupId>
-        <artifactId>myfaces-archetype-parent</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-helloworld</artifactId>
-    <packaging>maven-plugin</packaging>
-    <name>MyFaces Basic Archetype</name>
-    <description>Archetype to create a new webapp based on myfaces</description>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/archetype.xml b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index 8d6effb..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -1,36 +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.
- 
- @author Bruno Aranda (latest modification by $Author: grantsmith $)
- @version $Revision: 472560 $ $Date: 2006-11-08 18:45:25 +0100 (Mi, 08 Nov 2006) $
- 
--->
-
-<archetype>
-  <id>myfaces-archetype-helloworld</id>
-  <resources>
-    <resource>src/main/java/org/apache/myfaces/blank/HelloWorldController.java</resource>
-    <resource>src/main/webapp/index.jsp</resource>
-    <resource>src/main/webapp/helloWorld.jsp</resource>
-    <resource>src/main/webapp/page2.jsp</resource>
-    <resource>src/main/webapp/WEB-INF/web.xml</resource>
-    <resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
-  </resources>
-</archetype>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 1bea129..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<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>
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <packaging>war</packaging>
-    <version>${version}</version>
-    <name>A custom project using myfaces</name>
-    <url>http://www.myorganization.org</url>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <!--This plugin allows to run the example using mvn jetty:run -->
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.8</version>
-                <configuration>
-                    <scanIntervalSeconds>10</scanIntervalSeconds>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>apache-maven-snapshots</id>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-        </repository>
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-
-    <!-- Project dependencies -->
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <version>1.2.2</version>
-            <scope>compile</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-impl</artifactId>
-            <version>1.2.2</version>
-            <scope>compile</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.myfaces.tomahawk</groupId>
-            <artifactId>tomahawk</artifactId>
-            <version>1.1.6</version>
-            <scope>runtime</scope>    
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>jstl</artifactId>
-                </exclusion>
-            </exclusions>    
-        </dependency>
-        
-        <dependency>
-            <groupId>jstl</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.2</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.0</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldController.java b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldController.java
deleted file mode 100644
index c62289b..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldController.java
+++ /dev/null
@@ -1,52 +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.blank;
-
-/**
- * A typical simple backing bean, that is backed to <code>helloworld.jsp</code>
- * 
- */
-public class HelloWorldController {
-
-    
-    //properties
-    private String name;
-    
-    /**
-     * default empty constructor
-     */
-    public HelloWorldController(){
-    }
-    
-    //-------------------getter & setter
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-    
-    /**
-     * Method that is backed to a submit button of a form.
-     */
-    public String send(){
-        //do real logic, return a string which will be used for the navigation system of JSF
-        return "success";
-    }
-}
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/resources/log4j.properties
deleted file mode 100644
index a16da0a..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-#for debugging log4j itself
-log4j.debug=false
-
-#Logger-Priorities:
-#DEBUG lowest, prints all messages
-#INFO  prints all messages with FATAL, ERROR, WARN or INFO priority
-#WARN  prints all messages with FATAL, ERROR or WARN priority
-#ERROR prints all messages with FATAL or ERROR priority
-#FATAL highest, prints only FATAL messages
-
-# root logger
-log4j.rootLogger=INFO, A1
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
-
-# myfaces logger
-log4j.logger.org.apache.myfaces=INFO
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
deleted file mode 100644
index d698d66..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-
-<faces-config version="1.2" 
-    xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
-	
-	<!-- managed beans of the simple hello world app -->
-	<managed-bean>
-		<managed-bean-name>helloWorld</managed-bean-name>
-		<managed-bean-class>org.apache.myfaces.blank.HelloWorldController</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>
-	
-	<!-- navigation rules for helloWorld.jsp -->
-	<navigation-rule>
-		<from-view-id>/helloWorld.jsp</from-view-id>
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/page2.jsp</to-view-id>
-		</navigation-case>
-	</navigation-rule>
-	
-	<!-- navigation rules for page2.jsp -->
-	<navigation-rule>
-		<from-view-id>/page2.jsp</from-view-id>
-		<navigation-case>
-			<from-outcome>back</from-outcome>
-			<to-view-id>/helloWorld.jsp</to-view-id>
-		</navigation-case>
-	</navigation-rule>
-</faces-config>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index e3ad41b..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.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.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-         version="2.4">
-
-    <description>MyProject web.xml</description>
-
-    <!--optional: context-param>
-        <description>Comma separated list of URIs of (additional) faces config files.
-            (e.g. /WEB-INF/my-config.xml)
-            See JSF 1.0 PRD2, 10.3.2
-            Attention: You do not need to put /WEB-INF/faces-config.xml in here.
-        </description>
-        <param-name>javax.faces.CONFIG_FILES</param-name>
-        <param-value>/WEB-INF/examples-config.xml</param-value>
-    </context-param-->
-    <context-param>
-        <description>State saving method: "client" or "server" (= default)
-            See JSF Specification 2.5.3</description>
-        <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-        <param-value>client</param-value>
-    </context-param>
-    <context-param>
-        <description>Only applicable if state saving method is "server" (= default).
-            Defines the amount (default = 20) of the latest views are stored in session.</description>
-        <param-name>org.apache.myfaces.NUMBER_OF_VIEWS_IN_SESSION</param-name>
-        <param-value>20</param-value>
-    </context-param>
-    <context-param>
-        <description>Only applicable if state saving method is "server" (= default).
-            If true (default) the state will be serialized to a byte stream before it
-            is written to the session.
-            If false the state will not be serialized to a byte stream.</description>
-        <param-name>org.apache.myfaces.SERIALIZE_STATE_IN_SESSION</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>Only applicable if state saving method is "server" (= default) and if
-            org.apache.myfaces.SERIALIZE_STATE_IN_SESSION is true (= default)
-            If true (default) the serialized state will be compressed before it
-            is written to the session. If false the state will not be compressed.</description>
-        <param-name>org.apache.myfaces.COMPRESS_STATE_IN_SESSION</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>This parameter tells MyFaces if javascript code should be allowed in the
-            rendered HTML output.
-            If javascript is allowed, command_link anchors will have javascript code
-            that submits the corresponding form.
-            If javascript is not allowed, the state saving info and nested parameters
-            will be added as url parameters.
-            Default: "true"</description>
-        <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
-        <param-value>false</param-value>
-    </context-param>
-    <context-param>
-        <description>If true, rendered HTML code will be formatted, so that it is "human readable".
-            i.e. additional line separators and whitespace will be written, that do not
-            influence the HTML code.
-            Default: "true"</description>
-        <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    <context-param>
-        <description>If true, a javascript function will be rendered that is able to restore the
-            former vertical scroll on every request. Convenient feature if you have pages
-            with long lists and you do not want the browser page to always jump to the top
-            if you trigger a link or button action that stays on the same page.
-            Default: "false"</description>
-        <param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
-        <param-value>true</param-value>
-    </context-param>
-
-    <context-param>
-        <description>Used for encrypting view state. Only relevant for client side
-            state saving. See MyFaces wiki/web site documentation for instructions
-            on how to configure an application for diffenent encryption strengths.
-        </description>
-        <param-name>org.apache.myfaces.SECRET</param-name>
-        <param-value>NzY1NDMyMTA=</param-value>
-    </context-param>
-
-    <context-param>
-        <description>
-            Validate managed beans, navigation rules and ensure that forms are not nested.
-        </description>
-        <param-name>org.apache.myfaces.VALIDATE</param-name>
-        <param-value>true</param-value>
-    </context-param>
-    
-    <context-param>
-        <description>
-            Treat readonly same as if disabled attribute was set for select elements.
-        </description>
-        <param-name>org.apache.myfaces.READONLY_AS_DISABLED_FOR_SELECTS</param-name>
-        <param-value>true</param-value>
-    </context-param>    
-    
-    <context-param>
-        <description>
-            Use the defined class as the class which will be called when a resource is added to the
-            ExtensionFilter handling. Using StreamingAddResource here helps with performance. If you want to add
-            custom components and want to use the ExtensionFilter, you need to provide your custom implementation here.
-        </description>
-        <param-name>org.apache.myfaces.ADD_RESOURCE_CLASS</param-name>
-        <param-value>org.apache.myfaces.renderkit.html.util.DefaultAddResource</param-value>
-    </context-param>        
-
-    <context-param>
-        <description>
-            Virtual path in the URL which triggers loading of resources for the MyFaces extended components
-            in the ExtensionFilter.
-        </description>
-        <param-name>org.apache.myfaces.RESOURCE_VIRTUAL_PATH</param-name>
-        <param-value>/faces/myFacesExtensionResource</param-value>
-    </context-param>
-    
-    <context-param>
-        <description>
-            Check if the extensions-filter has been properly configured.
-        </description>
-        <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name>
-        <param-value>true</param-value>
-    </context-param>    
-
-    <context-param>
-        <description>
-            Define partial state saving as true/false.
-        </description>
-        <param-name>javax.faces.PARTIAL_STATE_SAVING_METHOD</param-name>
-        <param-value>false</param-value>
-    </context-param>    
-
-    <!-- Extensions Filter -->
-    <filter>
-        <filter-name>extensionsFilter</filter-name>
-        <filter-class>org.apache.myfaces.webapp.filter.ExtensionsFilter</filter-class>
-        <init-param>
-            <description>Set the size limit for uploaded files.
-                Format: 10 - 10 bytes
-                10k - 10 KB
-                10m - 10 MB
-                1g - 1 GB</description>
-            <param-name>uploadMaxFileSize</param-name>
-            <param-value>100m</param-value>
-        </init-param>
-        <init-param>
-            <description>Set the threshold size - files
-                below this limit are stored in memory, files above
-                this limit are stored on disk.
-
-                Format: 10 - 10 bytes
-                10k - 10 KB
-                10m - 10 MB
-                1g - 1 GB</description>
-            <param-name>uploadThresholdSize</param-name>
-            <param-value>100k</param-value>
-        </init-param>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>extensionsFilter</filter-name>
-        <url-pattern>*.jsf</url-pattern>
-    </filter-mapping>
-    <filter-mapping>
-        <filter-name>extensionsFilter</filter-name>
-        <url-pattern>/faces/*</url-pattern>
-    </filter-mapping>
-
-    <!-- Listener, to allow Jetty serving MyFaces apps -->
-    <listener>
-        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
-    </listener>
-
-    <!-- Faces Servlet -->
-    <servlet>
-        <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <!-- Faces Servlet Mapping -->
-    <servlet-mapping>
-        <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>*.jsf</url-pattern>
-    </servlet-mapping>
-
-    <!-- Welcome files -->
-    <welcome-file-list>
-        <welcome-file>index.jsp</welcome-file>
-        <welcome-file>index.html</welcome-file>
-    </welcome-file-list>
-
-</web-app>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
deleted file mode 100644
index 1334d73..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<html>
-    <head>
-        <title>Hello World</title>
-    </head>
-    <body>
-        <f:view>
-            <h:form id="mainForm">
-              <h:panelGrid columns="2">
-                <h:outputLabel for="name" value="Please enter your name" />
-                <h:inputText id="name" value="#{helloWorld.name}" required="true"/>
-                <h:commandButton value="Press me" action="#{helloWorld.send}"/>
-                <h:messages showDetail="true" showSummary="false"/>
-              </h:panelGrid>
-            </h:form>
-        </f:view>
-    </body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/index.jsp
deleted file mode 100644
index a29c228..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page session="false"%>
-<%
-response.sendRedirect("helloWorld.jsf");
-%>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/page2.jsp b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
deleted file mode 100644
index 6d12c41..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<html>
-    <head>
-        <title>Hello World</title>
-    </head>
-    <body>
-        <f:view>
-            <h:form id="mainForm">
-                <h2><h:outputText value="Hello #{helloWorld.name}. We hope you enjoy Apache MyFaces"/></h2>
-                <h:commandLink action="back">
-                    <h:outputText value="Home"/>
-                </h:commandLink>
-            </h:form>
-        </f:view>
-    </body>
-</html>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/site/apt/index.apt b/maven2-archetypes/myfaces-archetype-helloworld/src/site/apt/index.apt
deleted file mode 100644
index cdb1b21..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/site/apt/index.apt
+++ /dev/null
@@ -1,13 +0,0 @@
- ------
- Myfaces HelloWorld Archetype
- ------
-
-Overview
-
-  This project defines a Maven archetype plugin. Running the plugin will create a directory tree
-  containing the files needed to quickly get started on a new JSF project which uses JSP as the
-  templating language.
-
-Usage
-
-  TODO: writeme
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/LICENSE.txt b/maven2-archetypes/myfaces-archetype-jsfcomponents/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/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/NOTICE.txt b/maven2-archetypes/myfaces-archetype-jsfcomponents/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/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/pom.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/pom.xml
deleted file mode 100644
index 7efdd4b..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<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">
-
-  <parent>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-parent</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
-  </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-jsfcomponents</artifactId>
-    <packaging>maven-plugin</packaging>
-    <name>JSF Component Library Archetype</name>
-    <description>Archetype to create a libary project of JSF components</description>
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/archetype.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index c47fb59..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -1,65 +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.
- 
- @author Bruno Aranda (latest modification by $Author: grantsmith $)
- @version $Revision: 472560 $ $Date: 2006-11-08 18:45:25 +0100 (Mi, 08 Nov 2006) $
- 
--->
-
-<archetype>
-    <id>myfaces-archetype-jsfcomponents</id>
-    <resources>
-        <resource>examples/src/main/resources/org/myorganization/component/example/build.properties</resource>
-        <resource>examples/src/main/java/org/myorganization/component/example/SayHelloBean.java</resource>
-        <resource>examples/src/main/webapp/sayhello.jsp</resource>
-        <resource>examples/src/main/webapp/index.jsp</resource>
-        <resource>examples/src/main/webapp/WEB-INF/examples-config.xml</resource>
-        <resource>examples/src/main/webapp/WEB-INF/web.xml</resource>
-        <resource>examples/src/main/webapp/home.jsp</resource>
-        <resource>examples/pom.xml</resource>
-        <resource>core/src/main/resources/META-INF/faces-config.xml</resource>
-        <resource>core/src/main/tld/entities/say_hello_attributes.xml</resource>
-        <resource>core/src/main/tld/entities/ui_component_attributes.xml</resource>
-        <resource>core/src/main/tld/misc/resolve_entities.xsl</resource>
-        <resource>core/src/main/tld/misc/web-jsptaglibrary_1_2.dtd</resource>
-        <resource>core/src/main/tld/misc/resolve_entities-tlddoc.xsl</resource>
-        <resource>core/src/main/tld/mycomponents.tld</resource>
-        <resource>core/src/main/java/org/myorganization/component/sayhello/SayHello.java</resource>
-        <resource>core/src/main/java/org/myorganization/component/sayhello/SayHelloRenderer.java</resource>
-        <resource>core/src/main/java/org/myorganization/component/sayhello/SayHelloTag.java</resource>
-        <resource>core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java</resource>
-        <resource>core/pom.xml</resource>
-    </resources>
-</archetype>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/pom.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/pom.xml
deleted file mode 100644
index fa99cde..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/pom.xml
+++ /dev/null
@@ -1,302 +0,0 @@
-<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>
-    <artifactId>${artifactId}-core</artifactId>
-    <packaging>jar</packaging>
-    <name>My JSF Components Library</name>
-
-    <description>
-        This is my super jsf components library.
-    </description>
-
-    <parent>
-        <groupId>${groupId}</groupId>
-        <artifactId>${artifactId}-project</artifactId>
-        <version>${version}</version>
-    </parent>
-
-    <dependencies>
-
-        <!-- compile -->
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-validator</groupId>
-            <artifactId>commons-validator</artifactId>
-            <version>1.2.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-el</groupId>
-            <artifactId>commons-el</artifactId>
-            <version>1.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- provided dependencies -->
-
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <version>1.1.5</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jsp-api</artifactId>
-            <version>2.0</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
-            <scope>provided</scope>
-        </dependency>
-    
-        <!-- test dependencies -->
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.2</version>
-            <scope>test</scope>
-        </dependency>
-    
-        <dependency>
-            <groupId>org.apache.struts.shale</groupId>
-            <artifactId>shale-test</artifactId>
-            <version>1.0.2</version>
-            <scope>test</scope>		
-        </dependency>        
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xslt-maven-plugin</artifactId>
-                <version>1.0</version>
-                <configuration>
-                    <xslFile>src/main/tld/misc/resolve_entities.xsl</xslFile>
-                    <srcIncludes>**/*.tld</srcIncludes>
-                    <srcDir>src/main/tld</srcDir>
-                    <destDir>target/classes/META-INF</destDir>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>transform</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <reporting>
-        <plugins>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>changelog-maven-plugin</artifactId>
-                <version>2.0-beta-1</version>
-                <reportSets>
-                    <reportSet>
-                        <id>dual-report</id>
-                        <configuration>
-                            <type>range</type>
-                            <range>30</range>
-                        </configuration>
-                        <reports>
-                            <report>changelog</report>
-                            <report>file-activity</report>
-                            <report>dev-activity</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.0-beta-3</version>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jxr-maven-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>taglist-maven-plugin</artifactId>
-                <version>2.0-beta-1</version>
-                <configuration>
-                    <tags>TODO, FIXME, XXX, @deprecated</tags>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>surefire-report-maven-plugin</artifactId>
-            </plugin>
-
-        </plugins>
-    </reporting>
-
-    <profiles>
-        <profile>
-            <id>generate-site</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>xslt-maven-plugin</artifactId>
-                        <version>1.0</version>
-                        <executions>
-                            <execution>
-                                <id>generate-tld-for-tlddoc</id>
-                                <goals>
-                                    <goal>transform</goal>
-                                </goals>
-                                <configuration>
-                                    <xslFile>src/main/tld/misc/resolve_entities-tlddoc.xsl</xslFile>
-                                    <srcIncludes>**/*.tld</srcIncludes>
-                                    <srcDir>src/main/tld</srcDir>
-                                    <destDir>target/tlddoc-site</destDir>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>generate-tld-for-jar</id>
-                                <goals>
-                                    <goal>transform</goal>
-                                </goals>
-                                <configuration>
-                                    <xslFile>src/main/tld/misc/resolve_entities.xsl</xslFile>
-                                    <srcIncludes>**/*.tld</srcIncludes>
-                                    <srcDir>src/main/tld</srcDir>
-                                    <destDir>target/classes/META-INF</destDir>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-
-            </build>
-            <reporting>
-                <plugins>
-                    <plugin>
-                        <groupId>net.sourceforge.maven-taglib</groupId>
-                        <artifactId>maven-taglib-plugin</artifactId>
-                        <configuration>
-                            <taglib.src.dir>${basedir}/target/tlddoc-site</taglib.src.dir>
-                            <tldDocDir>${basedir}/target/site/tlddoc</tldDocDir>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </reporting>
-        </profile>
-        <profile>
-            <id>generate-assembly</id>
-            <activation>
-              <property>
-                <name>performRelease</name>
-                <value>true</value>
-              </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>xslt-maven-plugin</artifactId>
-                        <version>1.0</version>
-                        <executions>
-                            <execution>
-                                <id>generate-tld-for-tlddoc</id>
-                                <goals>
-                                    <goal>transform</goal>
-                                </goals>
-                                <configuration>
-                                    <xslFile>src/main/tld/misc/resolve_entities-tlddoc.xsl</xslFile>
-                                    <srcIncludes>**/*.tld</srcIncludes>
-                                    <srcDir>src/main/tld</srcDir>
-                                    <destDir>target/tlddoc-site</destDir>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>generate-tld-for-jar</id>
-                                <goals>
-                                    <goal>transform</goal>
-                                </goals>
-                                <configuration>
-                                    <xslFile>src/main/tld/misc/resolve_entities.xsl</xslFile>
-                                    <srcIncludes>**/*.tld</srcIncludes>
-                                    <srcDir>src/main/tld</srcDir>
-                                    <destDir>target/classes/META-INF</destDir>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-javadoc</id>
-                                <goals><goal>jar</goal></goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>net.sourceforge.maven-taglib</groupId>
-                        <artifactId>maven-taglib-plugin</artifactId>
-                        <configuration>
-                            <taglib.src.dir>${basedir}/target/tlddoc-site</taglib.src.dir>
-                            <tldDocDir>${basedir}/target/tlddoc</tldDocDir>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>attach-javadoc</id>
-                                <goals><goal>taglibdocjar</goal></goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHello.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHello.java
deleted file mode 100644
index 5a3fdb2..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHello.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.myorganization.component.sayhello;
-
-import javax.faces.component.UIOutput;
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-
-/**
- * The sayHello component
- */
-public class SayHello extends UIOutput
-{
-    public static final String COMPONENT_TYPE = "org.myorganization.SayHello";
-    public static final String DEFAULT_RENDERER_TYPE = "org.myorganization.SayHelloRenderer";
-    public static final String COMPONENT_FAMILY = "javax.faces.Output";
-
-    private String firstName;
-    private String lastName;
-
-    public SayHello()
-    {
-        // do nothing
-    }
-
-
-    public String getFamily()
-    {
-        return COMPONENT_FAMILY;
-    }
-
-    public void restoreState(FacesContext context, Object state) {
-        Object values[] = (Object[])state;
-        super.restoreState(context, values[0]);
-
-        this.firstName = (String)values[1];
-        this.lastName = (String)values[2];
-    }
-
-    public Object saveState(FacesContext context) {
-        Object values[] = new Object[3];
-        values[0] = super.saveState(context);
-        values[1] = firstName;
-        values[2] = lastName;
-        return values;
-    }
-
-    public String getFirstName()
-    {
-        if (firstName != null)
-        {
-            return firstName;
-        }
-
-        ValueBinding vb = getValueBinding("firstName");
-        return (vb == null)? null : (String) vb.getValue(FacesContext.getCurrentInstance());
-    }
-
-    public void setFirstName(String firstName)
-    {
-        this.firstName = firstName;
-    }
-
-    public String getLastName()
-    {
-        if (lastName != null)
-        {
-            return lastName;
-        }
-
-        ValueBinding vb = getValueBinding("lastName");
-        return (vb == null)? null : (String) vb.getValue(FacesContext.getCurrentInstance());
-    }
-
-    public void setLastName(String lastName)
-    {
-        this.lastName = lastName;
-    }
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHelloRenderer.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHelloRenderer.java
deleted file mode 100644
index e603568..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHelloRenderer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.myorganization.component.sayhello;
-
-import javax.faces.render.Renderer;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.faces.component.UIComponent;
-import java.io.IOException;
-
-/**
- * The renderer for my component
- */
-public class SayHelloRenderer extends Renderer
-{
-
-    public void decode(FacesContext facesContext, UIComponent uiComponent)
-    {
-        super.decode(facesContext, uiComponent);
-        // nothing to decode
-    }
-
-    public void encodeBegin(FacesContext facesContext, UIComponent uiComponent) throws IOException
-    {
-        super.encodeBegin(facesContext, uiComponent);
-        // no need to use encodeBegin.
-    }
-
-    public void encodeChildren(FacesContext facesContext, UIComponent uiComponent) throws IOException
-    {
-        super.encodeChildren(facesContext, uiComponent);
-        // this component does not have children
-    }
-
-    public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException
-    {
-        super.encodeEnd(facesContext, uiComponent);
-
-        if (!uiComponent.isRendered())
-        {
-            return;
-        }
-
-        ResponseWriter writer = facesContext.getResponseWriter();
-
-        SayHello sayHello = (SayHello) uiComponent;
-
-        String firstName = sayHello.getFirstName();
-        String lastName = sayHello.getLastName();
-
-        writer.write("Hello ");
-
-        if (firstName != null)
-        {
-            writer.write(firstName);
-        }
-
-        if (lastName != null)
-        {
-            writer.write(" "+lastName);
-        }
-
-        writer.write("!");
-    }
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHelloTag.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHelloTag.java
deleted file mode 100644
index 2bc0d9a..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHelloTag.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.myorganization.component.sayhello;
-
-import javax.faces.application.Application;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.webapp.UIComponentTag;
-
-/**
- * The tag for my component
- */
-public class SayHelloTag extends UIComponentTag
-{
-
-    private String firstName;
-    private String lastName;
-
-    /**
-     * @see javax.faces.webapp.UIComponentTag#getComponentType()
-     */
-    public String getComponentType()
-    {
-        return SayHello.COMPONENT_TYPE;
-    }
-
-    /**
-     * @see javax.faces.webapp.UIComponentTag#getRendererType()
-     */
-    public String getRendererType()
-    {
-        return SayHello.DEFAULT_RENDERER_TYPE;
-    }
-
-    /**
-     * @see javax.faces.webapp.UIComponentTag#setProperties
-     */
-     protected void setProperties(UIComponent component) {
-          super.setProperties(component);
-
-         FacesContext context = FacesContext.getCurrentInstance();
-         Application application = context.getApplication();
-
-        // firstName
-        if (UIComponentTag.isValueReference(firstName))
-        {
-            component.setValueBinding("firstName", application.createValueBinding(firstName));
-        }
-        else
-        {
-            component.getAttributes().put("firstName", firstName);
-        }
-
-        // lastName
-        if (lastName != null)
-        {
-            if (UIComponentTag.isValueReference(lastName))
-            {
-                component.setValueBinding("lastName", application.createValueBinding(lastName));
-            }
-            else
-            {
-                component.getAttributes().put("lastName", lastName);
-            }
-        }
-
-     }
-
-    public void release() {
-        super.release();
-        this.firstName = null;
-        this.lastName = null;
-    }
-
-    public void setFirstName(String firstName)
-    {
-        this.firstName = firstName;
-    }
-
-    public void setLastName(String lastName)
-    {
-        this.lastName = lastName;
-    }
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/faces-config.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/faces-config.xml
deleted file mode 100644
index b1af4fc..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/faces-config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config xmlns="http://java.sun.com/JSF/Configuration">
-
-  <!-- components -->
-
-  <component>
-    <component-type>org.myorganization.SayHello</component-type>
-    <component-class>org.myorganization.component.sayhello.SayHello</component-class>
-  </component>
-
-
-  <!-- renderkit -->
-
-  <render-kit>
-
-    <renderer>
-      <component-family>javax.faces.Output</component-family>
-      <renderer-type>org.myorganization.SayHelloRenderer</renderer-type>
-      <renderer-class>org.myorganization.component.sayhello.SayHelloRenderer</renderer-class>
-    </renderer>
-
-  </render-kit>
-
-</faces-config>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/mycomponents.taglib.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/mycomponents.taglib.xml
deleted file mode 100644
index 847bd10..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/mycomponents.taglib.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE facelet-taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
-  "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
-<facelet-taglib>
-	<namespace>http://www.myorganitzation.org/mycomponents</namespace>
-	
-	<tag>
-		<tag-name>sayHello</tag-name>
-		<component>
-			<component-type>org.myorganization.SayHello</component-type>
-			<renderer-type>org.myorganization.SayHelloRenderer</renderer-type>
-		</component>
-	</tag>
-</facelet-taglib> 
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/entities/say_hello_attributes.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/entities/say_hello_attributes.xml
deleted file mode 100644
index 86185ea..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/entities/say_hello_attributes.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- This is the list of attributes for the sayHello component -->
-<attribute>
-    <name>firstName</name>
-    <required>false</required>
-    <rtexprvalue>false</rtexprvalue>
-    <description>
-        The first name of the user
-    </description>
-</attribute>
-<attribute>
-    <name>lastName</name>
-    <required>false</required>
-    <rtexprvalue>false</rtexprvalue>
-    <description>
-        The last name of the user
-    </description>
-</attribute>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/entities/ui_component_attributes.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/entities/ui_component_attributes.xml
deleted file mode 100644
index da13cad..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/entities/ui_component_attributes.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<attribute>
-    <name>id</name>
-    <required>false</required>
-    <rtexprvalue>false</rtexprvalue>
-    <type>java.lang.String</type>
-    <description>
-        The developer-assigned ID of this component.  The ID must be unique
-        within the scope of the tag's enclosing naming container (e.g.
-        h:form or f:subview).  This value must be a static value.
-    </description>
-</attribute>
-
-<attribute>
-    <name>binding</name>
-    <required>false</required>
-    <rtexprvalue>false</rtexprvalue>
-    <type>java.lang.String</type>
-    <description>
-        Identifies a backing bean property (of type UIComponent or appropriate
-        subclass) to bind to this component instance.  This value must be an
-        EL expression.
-    </description>
-</attribute>
-
-<attribute>
-    <name>rendered</name>
-    <required>false</required>
-    <rtexprvalue>false</rtexprvalue>
-    <type>java.lang.String</type>
-    <description>
-        A boolean value that indicates whether this component should be rendered.
-        Default value: true.
-    </description>
-</attribute>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/misc/resolve_entities-tlddoc.xsl b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/misc/resolve_entities-tlddoc.xsl
deleted file mode 100644
index 16d84dc..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/misc/resolve_entities-tlddoc.xsl
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  - Stylesheet to expand xml entity references inline. 
-  - 
-  - This is a temporary workaround for a bug in the tlddoc application which means that
-  - a (valid) xmlns attribute is rejected; tlddoc v1.3 only accepts input that (incorrectly)
-  - puts the tld elements in no namespace. This stylesheet therefore generates a special
-  - version of the tld for feeding to the tlddoc app, until such time as tlddoc is fixed.
-  -->
-<xsl:stylesheet version="1.1"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <xsl:output method="xml"
-      encoding="ISO-8859-1"
-      doctype-public="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-      doctype-system="http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"
-      indent="yes"/>
-
-  <xsl:template match="*" priority="2">
-    <!-- avoiding copy to get get rid of namespace attribute -->
-    <xsl:element name="{name(.)}">
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:element>
-  </xsl:template>
-
-  <xsl:template match="@*|node()">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/misc/resolve_entities.xsl b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/misc/resolve_entities.xsl
deleted file mode 100644
index eafd3aa..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/misc/resolve_entities.xsl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-  - Stylesheet to pretty-print an xml document. In addition, if the input
-  - document contains any xml entity references, then those are expanded
-  - inline.
-  -
-  - Based on a stylesheet by John Mongan.
-  -->
-<xsl:stylesheet version="1.1"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-    <xsl:output method="xml"
-                encoding="ISO-8859-1"
-                doctype-public="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-                doctype-system="http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"/>
-
-    <xsl:param name="indent-increment" select="'   '" />
-
-    <xsl:template match="*">
-      <xsl:param name="indent" select="'&#xA;'"/>
-
-      <xsl:value-of select="$indent"/>
-      <xsl:copy>
-        <xsl:copy-of select="@*" />
-        <xsl:apply-templates>
-          <xsl:with-param name="indent"
-               select="concat($indent, $indent-increment)"/>
-        </xsl:apply-templates>
-        <xsl:if test="*">
-          <xsl:value-of select="$indent"/>
-        </xsl:if>
-      </xsl:copy>
-    </xsl:template>
-
-   <xsl:template match="comment()|processing-instruction()">
-      <xsl:param name="indent" select="'&#xA;'"/>
-      <xsl:value-of select="$indent"/>
-      <xsl:copy />
-   </xsl:template>
-
-   <!-- 
-     - Discard the text content of a node where the text content
-     - is nothing but whitespace. When this rule isn't matched
-     - the default xml processing applies, which is to copy the
-     - text directly to the output.
-     -
-     - WARNING: this is dangerous. Handle with care 
-     -->
-   <xsl:template match="text()[normalize-space(.)='']"/>
-
-</xsl:stylesheet>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/misc/web-jsptaglibrary_1_2.dtd b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/misc/web-jsptaglibrary_1_2.dtd
deleted file mode 100644
index 4b6fb7f..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/misc/web-jsptaglibrary_1_2.dtd
+++ /dev/null
@@ -1,108 +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.
--->
-
-<!--
-
-   This is the DTD defining the JavaServer Pages 1.2 Tag Library
-   descriptor (.tld) (XML) file format/syntax.
-
-   A Tag Library is a JAR file containing a valid instance of a Tag Library
-   Descriptor (taglib.tld) file in the META-INF subdirectory, along with the
-   appropriate implementing classes, and other resources required to
-   implement the tags defined therein.
-
-  -->
-
-<!NOTATION WEB-JSPTAGLIB.1_2 PUBLIC
-          "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN">
-
-<!--
-This is the XML DTD for the JSP 1.2 Tag Library Descriptor.
-All JSP 1.2 tag library descriptors must include a DOCTYPE
-of the following form:
-
-  <!DOCTYPE taglib
-        PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-	"http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-
--->
-
-<!ELEMENT taglib (tlib-version, jsp-version, short-name, uri?,
-                  display-name?, small-icon?, large-icon?, description?,
-                  validator?, listener*, tag+) >
-
-<!ATTLIST taglib id ID #IMPLIED
-	  xmlns CDATA #FIXED
-		"http://java.sun.com/JSP/TagLibraryDescriptor">
-
-<!ELEMENT tlib-version (#PCDATA) >
-<!ELEMENT jsp-version  (#PCDATA) >
-<!ELEMENT short-name      (#PCDATA) >
-<!ELEMENT uri	 (#PCDATA) >
-<!ELEMENT description	(#PCDATA) >
-<!ELEMENT validator (validator-class, init-param*, description?) >
-<!ELEMENT validator-class (#PCDATA) >
-<!ELEMENT init-param (param-name, param-value, description?)>
-<!ELEMENT param-name (#PCDATA)>
-<!ELEMENT param-value (#PCDATA)>
-<!ELEMENT listener (listener-class) >
-<!ELEMENT listener-class (#PCDATA) >
-<!ELEMENT tag (name, tag-class, tei-class?, body-content?, display-name?,
-               small-icon?, large-icon?, description?, variable*, attribute*,
-               example?) >
-<!ELEMENT tag-class (#PCDATA) >
-<!ELEMENT tei-class (#PCDATA) >
-<!ELEMENT body-content (#PCDATA) >
-<!ELEMENT display-name (#PCDATA) >
-<!ELEMENT large-icon (#PCDATA) >
-<!ELEMENT small-icon (#PCDATA) >
-<!ELEMENT example (#PCDATA) >
-<!ELEMENT variable ( (name-given | name-from-attribute), variable-class?,
-                    declare?, scope?, description?) >
-<!ELEMENT name-given (#PCDATA) >
-<!ELEMENT name-from-attribute (#PCDATA) >
-<!ELEMENT variable-class (#PCDATA) >
-<!ELEMENT declare (#PCDATA) >
-<!ELEMENT scope (#PCDATA) >
-<!ELEMENT attribute (name, required? , rtexprvalue?, type?, description?) >
-<!ELEMENT name	(#PCDATA) >
-<!ELEMENT required    (#PCDATA) >
-<!ELEMENT rtexprvalue (#PCDATA) >
-<!ELEMENT type (#PCDATA) >
-
-<!-- ID attributes -->
-
-<!ATTLIST tlib-version id ID #IMPLIED>
-<!ATTLIST jsp-version id ID #IMPLIED>
-<!ATTLIST short-name id ID #IMPLIED>
-<!ATTLIST uri id ID #IMPLIED>
-<!ATTLIST description id ID #IMPLIED>
-<!ATTLIST example id ID #IMPLIED>
-<!ATTLIST tag id ID #IMPLIED>
-<!ATTLIST tag-class id ID #IMPLIED>
-<!ATTLIST tei-class id ID #IMPLIED>
-<!ATTLIST body-content id ID #IMPLIED>
-<!ATTLIST attribute id ID #IMPLIED>
-<!ATTLIST name id ID #IMPLIED>
-<!ATTLIST required id ID #IMPLIED>
-<!ATTLIST rtexprvalue id ID #IMPLIED>
-<!ATTLIST param-name id ID #IMPLIED>
-<!ATTLIST param-value id ID #IMPLIED>
-<!ATTLIST listener id ID #IMPLIED>
-<!ATTLIST listener-class id ID #IMPLIED>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/mycomponents.tld b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/mycomponents.tld
deleted file mode 100644
index 2fdc390..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/mycomponents.tld
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!DOCTYPE taglib
-  PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-  "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd" [
-
-<!--
-===========================================================================
-My component entities. Working with entities allows a more clear structure
-of the tld file and the possibility to reuse attributes without having to
-rewrite them again.
-When adding a new component or creating/modifying attributes for an existing
-component, create or modify the corresponding 'entities' file in the entities
-folder.
-===========================================================================
--->
-<!ENTITY ui_component_attributes       SYSTEM "entities/ui_component_attributes.xml">
-<!ENTITY say_hello_attributes       SYSTEM "entities/say_hello_attributes.xml">
-]>
-
-<taglib>
-
-    <tlib-version>1.0</tlib-version>
-    <jsp-version>1.2</jsp-version>
-    <short-name>mycomp</short-name>
-    <uri>http://www.myorganitzation.org/mycomponents</uri>
-    <description>
-        Example components library. Actually it only contains a simple component
-    </description>
-
-    <!-- Add your component tags here -->
-
-    <!-- sayHello demo component-->
-    <tag>
-        <name>sayHello</name>
-        <tag-class>org.myorganization.component.sayhello.SayHelloTag</tag-class>
-        <body-content>JSP</body-content>
-        <description>Simple component to greet a user.</description>
-
-        <!-- import the entities for that component here-->
-        &ui_component_attributes;
-        &say_hello_attributes;
-	</tag>
-
-
-</taglib>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java
deleted file mode 100644
index 00d9c7c..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.myorganization.component.sayhello;
-
-import junit.framework.Test;
-import org.apache.shale.test.base.AbstractJsfTestCase;
-import org.apache.shale.test.mock.MockRenderKitFactory;
-import org.apache.shale.test.mock.MockResponseWriter;
-
-import java.io.IOException;
-import java.io.StringWriter;
-
-/**
- * Class to test the behaviour of the SayHello renderer
- */
-public class SayHelloRendererTest extends AbstractJsfTestCase
-{
-
-    public static Test suite()
-    {
-        return null;
-    }
-
-    private MockResponseWriter writer ;
-    private SayHello sayHello;
-
-    public SayHelloRendererTest(String name)
-    {
-        super(name);
-    }
-
-    public void setUp()
-    {
-        super.setUp();
-
-        sayHello = new SayHello();
-        sayHello.setFirstName("John");
-        sayHello.setLastName("Smith");
-
-        writer = new MockResponseWriter(new StringWriter(), null, null);
-        facesContext.setResponseWriter(writer);
-        // TODO remove these two lines once shale-test goes alpha, see MYFACES-1155
-        facesContext.getViewRoot().setRenderKitId(MockRenderKitFactory.HTML_BASIC_RENDER_KIT);
-        facesContext.getRenderKit().addRenderer(
-                sayHello.getFamily(),
-                sayHello.getRendererType(),
-                new SayHelloRenderer());
-    }
-
-    public void tearDown()
-    {
-        super.tearDown();
-        sayHello = null;
-        writer = null;
-    }
-
-    public void testEncodeEnd() throws IOException
-    {
-        sayHello.encodeEnd(facesContext);
-        facesContext.renderResponse();
-
-        String output = writer.getWriter().toString();
-
-        assertEquals("Hello John Smith!", output);
-        assertNotSame("Bye John Smith!", output);
-    }
-
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml
deleted file mode 100644
index dde870a..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- This is the project descriptor for the examples of my components -->
-
-<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>
-    <artifactId>${artifactId}-examples</artifactId>
-    <packaging>war</packaging>
-    <name>My Components Examples</name>
-
-    <parent>
-        <groupId>${groupId}</groupId>
-        <artifactId>${artifactId}-project</artifactId>
-        <version>${version}</version>
-    </parent>
-
-    <dependencies>
-           <dependency>
-               <groupId>${groupId}</groupId>
-               <artifactId>${artifactId}-core</artifactId>
-               <version>${version}</version>
-           </dependency>
-           <dependency>
-               <groupId>commons-logging</groupId>
-               <artifactId>commons-logging</artifactId>
-               <version>1.0.4</version>
-               <scope>compile</scope>
-           </dependency>
-            <dependency>
-                <groupId>jstl</groupId>
-                <artifactId>jstl</artifactId>
-                <version>1.2</version>
-                <scope>runtime</scope>
-            </dependency>           
-           
-       </dependencies>
-
-    <repositories>
-        <!-- Repository for jstl 1.2 -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository> 
-    </repositories>
-
-    <profiles>
-        <!-- By default the war examples use myfaces! :) -->
-        <profile>
-            <id>myfaces</id>
-            <activation>
-                <property>
-                    <name>!jsf</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-api</artifactId>
-                    <version>1.2.2</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-impl</artifactId>
-                    <version>1.2.2</version>
-                    <!-- Sandbox examples must only have runtime dependency to myfaces-impl
-                 so that it will be automatically added to war. But there must not be
-                 any compile dependency on impl so that is is always possible to use
-                 other JSF implementations. -->
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-
-            <properties>
-                <jsf_implementation>MyFaces</jsf_implementation>
-            </properties>
-        </profile>
-
-        <!-- To use the examples using the Sun's JSF Reference Implementation: -Djsf=ri -->
-        <profile>
-            <id>jsfri</id>
-            <activation>
-                <property>
-                    <name>jsf</name>
-                    <value>ri</value>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>javax.faces</groupId>
-                    <artifactId>jsf-api</artifactId>
-                    <version>1.1_02</version>
-                </dependency>
-                <dependency>
-                    <groupId>javax.faces</groupId>
-                    <artifactId>jsf-impl</artifactId>
-                    <version>1.1_02</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <!-- 
-               <dependency>
-                    <groupId>jstl</groupId>
-                    <artifactId>jstl</artifactId>
-                    <version>1.1.0</version>
-                    <scope>compile</scope>
-                </dependency>
-                 -->
-            </dependencies>
-
-            <repositories>
-                <repository>
-                    <id>java.net</id>
-                    <name>java.net Maven 1 Repository</name>
-                    <url>https://maven-repository.dev.java.net/nonav/repository</url>
-                    <layout>legacy</layout>
-                </repository>
-            </repositories>
-
-            <properties>
-                <jsf_implementation>JSF-RI</jsf_implementation>
-            </properties>
-        </profile>
-
-    </profiles>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <!--This plugin allows to run the example using mvn jetty:run -->
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.8</version>
-                <configuration>
-                    <scanIntervalSeconds>10</scanIntervalSeconds>
-                </configuration>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
-    </build>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/java/org/myorganization/component/example/SayHelloBean.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/java/org/myorganization/component/example/SayHelloBean.java
deleted file mode 100644
index 122150c..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/java/org/myorganization/component/example/SayHelloBean.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.myorganization.component.example;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.faces.event.ActionEvent;
-
-/**
- * Managed bean for the sayHello page example
- */
-public class SayHelloBean
-{
-
-    private static final Log log = LogFactory.getLog(SayHelloBean.class);
-
-    private String firstName;
-    private String lastName;
-    private boolean renderGreeting;
-
-    public SayHelloBean()
-    {
-        this.renderGreeting = false;
-    }
-
-    public void sayIt(ActionEvent evt)
-    {
-        renderGreeting = true;
-
-        if (log.isInfoEnabled())
-        {
-            log.info("The name to say hello is '"+firstName+"' and the last name is '"+lastName+"'.");
-        }
-    }
-
-
-    public String getFirstName()
-    {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName)
-    {
-        this.firstName = firstName;
-    }
-
-    public String getLastName()
-    {
-        return lastName;
-    }
-
-    public void setLastName(String lastName)
-    {
-        this.lastName = lastName;
-    }
-
-
-    public boolean isRenderGreeting()
-    {
-        return renderGreeting;
-    }
-
-    public void setRenderGreeting(boolean renderGreeting)
-    {
-        this.renderGreeting = renderGreeting;
-    }
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/resources/org/myorganization/component/example/build.properties b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/resources/org/myorganization/component/example/build.properties
deleted file mode 100644
index 29deaef..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/resources/org/myorganization/component/example/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# Do not edit this file, as it will be completed automatically
-# by maven during the build process
-mycomponents_version=${pom.version}
-jsf_implementation=${jsf_implementation}
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/examples-config.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/examples-config.xml
deleted file mode 100644
index 5cec759..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/examples-config.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE faces-config PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
-  "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-
-<!-- =========== FULL CONFIGURATION FILE ================================== -->
-
-<!-- my components examples -->
-
-<faces-config>
-
-
-    <!-- Managed Beans for sayhello.jsp -->
-    <managed-bean>
-        <managed-bean-name>sayHelloBean</managed-bean-name>
-        <managed-bean-class>org.myorganization.component.example.SayHelloBean</managed-bean-class>
-        <managed-bean-scope>request</managed-bean-scope>
-    </managed-bean>
-
-    <!-- NAVIGATION RULES -->
-
-    <navigation-rule>
-        <navigation-case>
-            <from-outcome>go_home</from-outcome>
-            <to-view-id>/home.jsp</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-
-</faces-config>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/web.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 7da038b..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
-
-  <description>debug web.xml</description>
-
-  <context-param>
-    <description>Comma separated list of URIs of (additional) faces config files.
-            (e.g. /WEB-INF/my-config.xml)
-            See JSF 1.0 PRD2, 10.3.2
-            Attention: You do not need to put /WEB-INF/faces-config.xml in here.
-    </description>
-    <param-name>javax.faces.CONFIG_FILES</param-name>
-    <param-value>/WEB-INF/examples-config.xml</param-value>
-  </context-param>
-
-  <context-param>
-    <description>State saving method: "client" or "server" (= default)
-            See JSF Specification 2.5.3</description>
-    <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-    <param-value>server</param-value>
-  </context-param>
-
-  <servlet>
-    <servlet-name>Faces Servlet</servlet-name>
-    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>Faces Servlet</servlet-name>
-    <url-pattern>*.jsf</url-pattern>
-  </servlet-mapping>
-
-  <welcome-file-list>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
-
-</web-app>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/home.jsp b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/home.jsp
deleted file mode 100644
index e7b0e90..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/home.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://www.myorganitzation.org/mycomponents" prefix="mycomp"%>
-
-<html>
-
-<head>
-    <title>My JSF Components Examples</title>
-</head>
-
-<body>
-
-<f:view>
-    <h:form>
-
-        <f:loadBundle basename="org.myorganization.component.example.build" var="buildInfo"/>
-
-        <h:panelGrid columns="2">
-            <h:outputText style="font-weight: bold" value="My JSF Components Library"/>
-            <h:outputText value=" (Version #{buildInfo['mycomponents_version']}, using #{buildInfo ['jsf_implementation']})"/>
-        </h:panelGrid>
-
-        <h:panelGrid>
-
-            <h:outputText value="My component examples" />
-            <h:panelGrid style="padding-left:25px">
-                <h:outputLink value="sayhello.jsf">
-                    <f:verbatim>sayHello - demo component</f:verbatim>
-                </h:outputLink>
-            </h:panelGrid>
-
-        </h:panelGrid>
-
-    </h:form>
-</f:view>
-</body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/index.jsp b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/index.jsp
deleted file mode 100644
index c4a9b48..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/index.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<jsp:forward page="home.jsf"/>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/sayhello.jsp b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/sayhello.jsp
deleted file mode 100644
index fa67d71..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/sayhello.jsp
+++ /dev/null
@@ -1,49 +0,0 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://www.myorganitzation.org/mycomponents" prefix="mycomp"%>
-
-<html>
-<head>
-    <title>My JSF Components</title>
-</head>
-
-<body>
-
-<f:view>
-
-    <mycomp:sayHello firstName="John" lastName="Smith"/>
-
-    <h:outputText value=" (probably not you, I know)"/>
-
-    <f:verbatim><hr></f:verbatim>
-
-    <h:form>
-        <h:panelGrid columns="2">
-            <h:outputLabel for="inputFirstName" value="First name" />
-            <h:inputText id="inputFirstName" value="#{sayHelloBean.firstName}"/>
-
-            <h:outputLabel for="inputLastName" value="Last name" />
-            <h:inputText id="inputLastName" value="#{sayHelloBean.lastName}"/>
-        </h:panelGrid>
-
-        <h:panelGrid columns="1">
-
-            <h:commandButton value="Say Hello!" actionListener="#{sayHelloBean.sayIt}"/>
-
-            <mycomp:sayHello firstName="#{sayHelloBean.firstName}"
-                             lastName="#{sayHelloBean.lastName}"
-                             rendered="#{sayHelloBean.renderGreeting}"/>
-
-            <h:commandLink value="[HOME]" action="go_home"/>
-
-        </h:panelGrid>
-
-    </h:form>
-
-</f:view>
-
-
-</body>
-
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 77e19c1..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<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>
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}-project</artifactId>
-  <packaging>pom</packaging>
-  <name>My JSF Components Library Project</name>
-  <version>${version}</version>
-
-  <description>
-      This is the project for my funky components. This will build both the core and the examples
-  </description>
-
-    <modules>
-        <module>core</module>
-        <module>examples</module>
-    </modules>
-
-    <repositories>
-        <repository>
-            <id>Myfaces repository</id>
-            <url>http://myfaces.zones.apache.org/dist/maven-repository</url>
-        </repository>
-    </repositories>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/LICENSE.txt b/maven2-archetypes/myfaces-archetype-trinidad/LICENSE.txt
deleted file mode 100644
index 75b5248..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/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-trinidad/NOTICE.txt b/maven2-archetypes/myfaces-archetype-trinidad/NOTICE.txt
deleted file mode 100644
index ab2c2b5..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/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                   ==
-=========================================================================
-
-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.
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/pom.xml b/maven2-archetypes/myfaces-archetype-trinidad/pom.xml
deleted file mode 100644
index 68af520..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/pom.xml
+++ /dev/null
@@ -1,35 +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"> 
-
-  <parent>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-parent</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.myfaces.buildtools</groupId>
-  <artifactId>myfaces-archetype-trinidad</artifactId>
-  <packaging>maven-plugin</packaging>
-  <name>MyFaces Trinidad Archetype</name>
-  <description>Archetype to create a new webapp based on Trinidad</description>
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/LICENSE b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/LICENSE
+++ /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-trinidad/src/main/resources/META-INF/NOTICE b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index ab2c2b5..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/NOTICE
+++ /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                   ==
-=========================================================================
-
-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.
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/archetype.xml b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index dea5438..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -1,32 +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.
-	   
--->
-
-<archetype>
-  <id>myfaces-archetype-trinidad</id>
-  <resources>
-    <resource>src/main/java/org/apache/myfaces/trinidad/blank/HelloWorldBacking.java</resource>
-    <resource>src/main/webapp/index.jspx</resource>
-    <resource>src/main/webapp/page2.jspx</resource>
-    <resource>src/main/webapp/WEB-INF/web.xml</resource>
-    <resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
-  </resources>
-</archetype>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 1770307..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,115 +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>
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <packaging>war</packaging>
-  <version>${version}</version>
-  <name>A custom project using myfaces</name>
-  <url>http://www.myorganization.org</url>
-
-  <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <!--This plugin allows to run the example using mvn jetty:run -->
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.8</version>
-                <configuration>
-                    <scanIntervalSeconds>10</scanIntervalSeconds>
-                </configuration>
-            </plugin>
-        </plugins>    
-  </build>
-
-  <repositories>
-    <repository>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-      <id>apache-maven-snapshots</id>
-      <url>http://people.apache.org/repo/m2-incubating-repository/</url>
-    </repository>
-    <repository>
-      <id>java.net</id>
-      <url>http://download.java.net/maven/1</url>
-      <layout>legacy</layout>
-    </repository>    
-  </repositories>
-
-  <!-- Project dependencies -->
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.myfaces.core</groupId>
-      <artifactId>myfaces-api</artifactId>
-      <version>${myfaces.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.myfaces.core</groupId>
-      <artifactId>myfaces-impl</artifactId>
-      <version>${myfaces.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <!-- Apache Trinidad -->
-    <dependency>
-      <groupId>org.apache.myfaces.trinidad</groupId>
-      <artifactId>trinidad-api</artifactId>
-      <version>${trinidad.version}</version>
-      <scope>compile</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.myfaces.trinidad</groupId>
-      <artifactId>trinidad-impl</artifactId>
-      <version>${trinidad.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-    	<groupId>jstl</groupId>
-    	<artifactId>jstl</artifactId>
-    	<version>1.2</version>
-    	<scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.0</version>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-
-  <properties>
-    <trinidad.version>1.2.5</trinidad.version>
-    <myfaces.version>1.2.2</myfaces.version>
-  </properties>
-
-</project>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/trinidad/blank/HelloWorldBacking.java b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/trinidad/blank/HelloWorldBacking.java
deleted file mode 100644
index 4d0ed6d..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/trinidad/blank/HelloWorldBacking.java
+++ /dev/null
@@ -1,67 +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.trinidad.blank;
-
-import javax.faces.context.FacesContext;
-
-import org.apache.myfaces.trinidad.render.ExtendedRenderKitService;
-import org.apache.myfaces.trinidad.util.Service;
-
-/**
- * A typical simple backing bean, that is backed to <code>helloworld.jsp</code>
- * 
- */
-public class HelloWorldBacking
-{
-
-  //properties
-  private String _name;
-
-  /**
-   * default empty constructor
-   */
-  public HelloWorldBacking()
-  {   
-  }
-
-  //-------------------getter & setter
-  public String getName()
-  {
-    return _name;
-  }
-
-  public void setName(String name)
-  {
-    this._name = name;
-  }
-
-  /**
-   * Method that is backed to a submit button of a form.
-   */
-  public String send()
-  {
-    FacesContext facesContext = FacesContext.getCurrentInstance();
-    ExtendedRenderKitService service = (ExtendedRenderKitService)
-      Service.getRenderKitService(facesContext, ExtendedRenderKitService.class);
-    service.addScript(facesContext, "alert('Script added by ExtendedRenderKitService')");
-
-    //do real logic
-    return ("success");
-  }
-}
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
deleted file mode 100644
index e5ecb66..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.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.
-	   
--->
-<faces-config version="1.2" 
-    xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
-  
-  <application>
-    <!-- Use the Trinidad RenderKit -->
-    <default-render-kit-id>
-      org.apache.myfaces.trinidad.core
-    </default-render-kit-id>
-  </application>
-
-  <!-- Global preferences object that proxies to others -->
-  <managed-bean>
-    <managed-bean-name>helloWorldBacking</managed-bean-name>
-    <managed-bean-class>
-       org.apache.myfaces.trinidad.blank.HelloWorldBacking
-    </managed-bean-class>
-    <managed-bean-scope>
-       request
-    </managed-bean-scope>
-  </managed-bean>
-
-  <!-- navigation rules for index.jspx -->
-  <navigation-rule>
-    <from-view-id>/index.jspx</from-view-id>
-    <navigation-case>
-      <from-outcome>success</from-outcome>
-      <to-view-id>/page2.jspx</to-view-id>
-    </navigation-case>
-  </navigation-rule>
-	
-  <!-- navigation rules for page2.jspx -->
-  <navigation-rule>
-    <from-view-id>/page2.jspx</from-view-id>
-    <navigation-case>
-      <from-outcome>back</from-outcome>
-      <to-view-id>/index.jspx</to-view-id>
-    </navigation-case>
-  </navigation-rule>
-
-</faces-config>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index dcb4552..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version = '1.0' encoding = 'ISO-8859-1'?>
-<!--
-    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.
-	   
--->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-         version="2.4">
-  <!-- Use client-side state saving.  In Trinidad, it is an
-       optimized, token-based mechanism that is almost always a
-       better choice than the standard JSF server-side state saving. -->
-  <context-param>
-    <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-    <param-value>client</param-value>
-    <!--param-value>server</param-value-->
-  </context-param>
-
-  <!-- Trinidad by default uses an optimized client-side state saving
-       mechanism. To disable that, uncomment the following -->
-  <!--context-param>
-    <param-name>org.apache.myfaces.trinidad.CLIENT_STATE_METHOD</param-name>
-    <param-value>all</param-value>
-  </context-param-->
-
-  <!-- Trinidad also supports an optimized strategy for caching some
-   view state at an application level, which significantly improves
-   scalability.  However, it makes it harder to develop (updates to
-   pages will not be noticed until the server is restarted), and in
-   some rare cases cannot be used for some pages (see Trinidad
-   documentation for more information) -->
-  <context-param>
-    <param-name>org.apache.myfaces.trinidad.USE_APPLICATION_VIEW_CACHE</param-name>
-    <param-value>false</param-value>
-  </context-param>
-
-  <!-- If this parameter is enabled, Trinidad will automatically
-       check the modification date of your JSPs, and discard saved
-       state when they change;  this makes development easier,
-       but adds overhead that should be avoided when your application
-       is deployed -->
-  <context-param>
-    <param-name>org.apache.myfaces.trinidad.CHECK_FILE_MODIFICATION</param-name>
-    <param-value>true</param-value>
-  </context-param>
-
-  <!-- Enables Change Persistence at a session scope.  By default,
-       Change Persistence is entirely disabled. The ChangeManager is
-       an API, which can persist component modifications (like,
-       is a showDetail or tree expanded or collapsed). For providing
-       a custom Change Persistence implementation inherit from the 
-       Trinidad API's ChangeManager class. As the value you have 
-       to use the fullqualified class name. -->
-  <context-param>
-    <param-name>org.apache.myfaces.trinidad.CHANGE_PERSISTENCE</param-name>
-    <param-value>session</param-value>
-  </context-param>
-
-  <filter>
-    <filter-name>trinidad</filter-name>
-    <filter-class>org.apache.myfaces.trinidad.webapp.TrinidadFilter</filter-class>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>trinidad</filter-name>
-    <servlet-name>faces</servlet-name>
-  </filter-mapping>
-
-  <!-- Faces Servlet -->
-  <servlet>
-    <servlet-name>faces</servlet-name>
-    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-  </servlet>
-  
-  <!-- resource loader servlet -->
-  <servlet>
-    <servlet-name>resources</servlet-name>
-    <servlet-class>org.apache.myfaces.trinidad.webapp.ResourceServlet</servlet-class>
-  </servlet>
-
-  <!-- Faces Servlet Mappings -->
-  <servlet-mapping>
-    <servlet-name>faces</servlet-name>
-    <url-pattern>/faces/*</url-pattern>
-  </servlet-mapping>
-  
-  <servlet-mapping>
-    <servlet-name>resources</servlet-name>
-    <url-pattern>/adf/*</url-pattern>
-  </servlet-mapping>
-
-
-  <!-- Welcome Files -->
-  <welcome-file-list>
-    <welcome-file>faces/index.jspx</welcome-file>
-  </welcome-file-list>
-
-</web-app>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/index.jspx b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/index.jspx
deleted file mode 100644
index 641c7eb..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/index.jspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-<!--
-    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.
-	   
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
-          xmlns:f="http://java.sun.com/jsf/core"
-          xmlns:tr="http://myfaces.apache.org/trinidad" >
-  <jsp:directive.page contentType="text/html;charset=utf-8"/>
-  <f:view>
-    <tr:document title="Apache MyFaces Trinidad Archetype Demo">
-       <tr:form>
-       
-        <tr:panelPage>
-          <tr:inputText label="Your name" id="input1" value="#{helloWorldBacking.name}" required="true"/>
-          <tr:commandButton id="button1" text="press me" action="#{helloWorldBacking.send}" />
-        </tr:panelPage>
-       
-       </tr:form>
-    </tr:document>
-  </f:view>
-</jsp:root>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/page2.jspx b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/page2.jspx
deleted file mode 100644
index 63caf44..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/page2.jspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-<!--
-    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.
-	   
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
-          xmlns:f="http://java.sun.com/jsf/core"
-          xmlns:tr="http://myfaces.apache.org/trinidad" >
-  <jsp:directive.page contentType="text/html;charset=utf-8"/>
-  <f:view>
-    <tr:document title="Apache MyFaces Trinidad Archetype Demo">
-       <tr:form>
-       
-        <tr:panelPage>
-          <tr:outputText id="input1" value="Hello #{helloWorldBacking.name}. We hope you enjoy Apache MyFaces Trinidad"/>
-          <tr:commandLink id="link" text="GO HOME" action="back" />
-        </tr:panelPage>
-       
-       </tr:form>
-    </tr:document>
-  </f:view>
-</jsp:root>
\ No newline at end of file
diff --git a/maven2-archetypes/pom.xml b/maven2-archetypes/pom.xml
deleted file mode 100644
index 4356a37..0000000
--- a/maven2-archetypes/pom.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2006 The Apache Software Foundation.
-
-  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.
--->
-
-<!--
-  - The archetypes project defines a set of maven archetype plugins that can be
-  - used to create an initial directory tree of files when starting a new JSF
-  - project.
-  -
-  - This pom is used:
-  - * as the parent pom for all individual archetype modules, to define common settings
-  - * to define the common archetype website
-  - * as a convenient tool for building all the archetype projects.
-  -->
-<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</groupId>
-    <artifactId>myfaces</artifactId>
-    <version>5</version>
-  </parent>
-
-  <groupId>org.apache.myfaces.buildtools</groupId>
-  <artifactId>myfaces-archetype-parent</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <name>Apache MyFaces Buildtools Maven2 Archetype Parent</name>
-  <url>http://myfaces.apache.org/build-tools/archetypes</url>
-
-  <issueManagement>
-    <system>jira</system>
-    <url>http://issues.apache.org/jira/browse/MYFACES</url>
-  </issueManagement>
-
-  <ciManagement>
-    <system>continuum</system>
-    <url>http://myfaces.zones.apache.org:8080/continuum</url>
-    <notifiers>
-      <notifier>
-        <type>mail</type>
-        <sendOnSuccess>true</sendOnSuccess>
-        <configuration>
-          <address>commits@myfaces.apache.org</address>
-        </configuration>
-      </notifier>
-    </notifiers>
-  </ciManagement>
-
-  <inceptionYear>2008</inceptionYear>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>${basedir}</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>NOTICE.txt</include>
-          <include>LICENSE.txt</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-      </resource>
-    </resources>
-
-    <pluginManagement>
-      <plugins>
-	<plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-plugin-plugin</artifactId>
-          <!-- 2.4 throws error, so temporally put on 2.3 -->
-          <version>2.3</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.2</version>
-          <configuration>
-            <archive>
-              <manifest>
-                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              </manifest>
-            </archive>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-
-  </build>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.0.1</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <rulesets>
-            <ruleset>/rulesets/basic.xml</ruleset>
-            <ruleset>/rulesets/unusedcode.xml</ruleset>
-          </rulesets>
-          <linkXref>true</linkXref>
-          <minimumTokens>100</minimumTokens>
-          <targetJdk>1.5</targetJdk>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/trunk/maven2-archetypes/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/trunk/maven2-archetypes/</developerConnection>
-    <url>http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/</url>
-  </scm>
-
-  <modules>
-    <module>myfaces-archetype-helloworld</module>
-    <module>myfaces-archetype-helloworld-facelets</module>
-    <module>myfaces-archetype-helloworld-portlets</module>
-    <module>myfaces-archetype-trinidad</module>
-    <module>myfaces-archetype-jsfcomponents</module>
-  </modules>
-
-  <distributionManagement>
-    <snapshotRepository>
-      <uniqueVersion>false</uniqueVersion>
-      <id>apache.snapshots</id>
-      <name>Apache Maven Snapshot Repository</name>
-      <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-    </snapshotRepository>
-    <site>
-      <id>apache-site</id>
-      <url>scpexe://people.apache.org/www/myfaces.apache.org/build-tools/archetypes</url>
-    </site>
-  </distributionManagement>
-
-  <profiles>
-    <profile>
-      <id>release</id>
-      <!--
-      NOTE: Execute this profile like
-            mvn clean source:jar install deploy -DaltDeploymentRepository=matzew::default::file://FOLDER -Prelease
-       -->
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.0-alpha-4</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.3</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-scm-plugin</artifactId>
-            <version>1.0</version>
-            <executions>
-              <execution>
-                <phase>validate</phase>
-                <id>getting-scm.revision</id>
-                <goals>
-                  <goal>update</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
diff --git a/maven2-archetypes/src/site/apt/index.apt b/maven2-archetypes/src/site/apt/index.apt
deleted file mode 100644
index 71923a9..0000000
--- a/maven2-archetypes/src/site/apt/index.apt
+++ /dev/null
@@ -1,37 +0,0 @@
- ------
- Myfaces Archetypes
- ------
-
-Overview
-
-  The archetype subprojects define Maven plugins that can build a directory tree containing
-  the files needed to quickly get started on a new JSF project.
-
-  Different archetypes create different initial setups, such as including different libraries
-  in the created pom.xml file, and adding different configuration to the created web.xml file.
-
-Archetypes
-
-* HelloWorld Basic Archetype
-
-  Sets up a webapp project that uses MyFaces Core 1.2.x with JSP as the page templating system.
-  The webapp contains a single .jsp file is created which renders an HTML page saying 
-  "hello world".
-
-* HelloWorld-Facelets Archetype
-
-  As for the HelloWorld archetype, but configured to use the Facelets page templating system.
-
-* HelloWorld-Portlet Archetype
-
-  Sets up a simple portlet-enabled webapp. 
-
-* Trinidad Archetype
-
-  Sets up a webapp that uses MyFaces Core 1.2.x and MyFaces Trinidad.
-
-* JSF-Component Library Archetype
-
-  Sets up a project that is intended to define new JSF components (rather than just use them).
-  If you want to create a jar that defines a set of new custom JSF components then this
-  archetype is a good starting point.
diff --git a/maven2-plugins/LICENSE.txt b/maven2-plugins/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-plugins/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/NOTICE.txt b/maven2-plugins/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-plugins/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 1581f94..0000000
--- a/maven2-plugins/myfaces-builder-annotations/pom.xml
+++ /dev/null
@@ -1,67 +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.
-	   
--->
-<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.1-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.myfaces.buildtools</groupId>
-  <artifactId>myfaces-builder-annotations</artifactId> 
-  <version>1.0.1-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>
-
-  <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/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 2d2194d..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFComponent.java
+++ /dev/null
@@ -1,340 +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 the tag handler of the tag class.
-     * 
-     * ?? What's the difference between tagHandler and tagClass?
-     */
-    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;
-}
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 eeaca4a..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFConverter.java
+++ /dev/null
@@ -1,75 +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;
-
-/**
- * 
- * @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 "";
-}
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 fab0cd4..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFExclude.java
+++ /dev/null
@@ -1,44 +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(ElementType.TYPE)
-@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/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 f1f2d93..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFJspAttribute.java
+++ /dev/null
@@ -1,72 +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.TYPE)
-@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.
-     */
-    boolean rtexprvalue() 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/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 72c083e..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFJspProperties.java
+++ /dev/null
@@ -1,35 +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;
-
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.SOURCE)
-public @interface JSFJspProperties
-{
-
-    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 c832fa5..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFJspProperty.java
+++ /dev/null
@@ -1,102 +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
- * 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 "";
-}
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 2cbe831..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFJspTag.java
+++ /dev/null
@@ -1,48 +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 name of the component in a page (ex: x:mycomp).
- * 
- * @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 "";
-
-}
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 0af01ee..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFProperty.java
+++ /dev/null
@@ -1,121 +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;
-    
-    /**
-     * 
-     */
-    boolean localMethod() default false;
-    
-    /**
-     * 
-     */
-    String localMethodScope() default "";
-    
-    /**
-     * 
-     */
-    boolean setMethod() default false;
-    
-    /**
-     * 
-     */
-    String setMethodScope() default "";
-    
-    /**
-     * 
-     */
-    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 inheritTag() 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 "";
-
-}
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 b90dda9..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFRenderKit.java
+++ /dev/null
@@ -1,39 +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
-{
-
-}
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/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 9b3acaf..0000000
--- a/maven2-plugins/myfaces-builder-annotations/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/annotation/JSFValidator.java
+++ /dev/null
@@ -1,76 +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;
-
-/**
- * 
- * @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 "";
-}
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 25144f5..0000000
--- a/maven2-plugins/myfaces-builder-plugin/pom.xml
+++ /dev/null
@@ -1,189 +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.
-	   
--->
-<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.1-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.myfaces.buildtools</groupId>
-  <artifactId>myfaces-builder-plugin</artifactId> 
-  <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>
-
-  <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>
-    </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.6.3</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>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.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 3aebb9f..0000000
--- a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/BuildMetaDataMojo.java
+++ /dev/null
@@ -1,471 +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 maven-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;
-    
-    /**
-     * 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);
-            }
-        }
-
-        buildModel(model, project);
-        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);            
-            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 54658c1..0000000
--- a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/Flattener.java
+++ /dev/null
@@ -1,194 +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.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.ComponentMeta;
-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.model.ConverterMeta;
-
-/**
- */
-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();
-    }
-
-    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);
-    }
-}
\ No newline at end of file
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 ee73daa..0000000
--- a/maven2-plugins/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java
+++ /dev/null
@@ -1,632 +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 java.util.Properties;
-import java.util.logging.Logger;
-
-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.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;
-import com.thoughtworks.qdox.model.Type;
-
-/**
- * Maven goal to generate java source code for Component classes.
- * 
- * @version $Id$
- * @requiresDependencyResolution compile
- * @goal make-components
- * @phase generate-sources
- */
-public class MakeComponentsMojo extends AbstractMojo
-{
-    final Logger log = Logger.getLogger(MakeComponentsMojo.class.getName());
-
-    /**
-     * Injected Maven project.
-     * 
-     * @parameter expression="${project}"
-     * @readonly
-     */
-    private MavenProject project;
-
-    /**
-     * @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";
-
-    /**
-     * @parameter expression="src/main/resources/META-INF"
-     */
-    private File templateSourceDirectory;
-
-    /**
-     * @parameter expression="${project.build.directory}/myfaces-builder-plugin/main/java"
-     */
-    private File generatedSourceDirectory;
-
-    /**
-     * @parameter
-     */
-    private String packageContains;
-
-    /**
-     * @parameter
-     */
-    private String typePrefix;
-
-    /**
-     * @parameter
-     */
-    private boolean force;
-
-    /**
-     * @parameter
-     */
-    private boolean suppressListenerMethods;
-
-    /**
-     * @parameter
-     */
-    private String jsfVersion;
-    
-    /**
-     * @parameter
-     */
-    private List modelIds;
-
-    /**
-     * @parameter 
-     */
-    private String templateComponentName;
-    
... 83534 lines suppressed ...

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