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

[myfaces-build-tools] tag checkstyle-rules-5 created (now d9a43cc)

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

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


      at d9a43cc  (commit)
This tag includes the following new commits:

     new d9a43cc  [maven-release-plugin]  copy for tag checkstyle-rules-5

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


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

[myfaces-build-tools] 01/01: [maven-release-plugin] copy for tag checkstyle-rules-5

Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit d9a43cce5bc5f964128a8bf313a46bf4613b5e4d
Author: Leonardo Uribe <lu...@apache.org>
AuthorDate: Tue Mar 20 19:16:46 2012 +0000

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

diff --git a/other/checkstyle-rules/LICENSE b/LICENSE
similarity index 100%
rename from other/checkstyle-rules/LICENSE
rename to LICENSE
diff --git a/other/checkstyle-rules/NOTICE b/NOTICE
similarity index 100%
rename from other/checkstyle-rules/NOTICE
rename to NOTICE
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-codi-jsf12/pom.xml b/maven2-archetypes/myfaces-archetype-codi-jsf12/pom.xml
deleted file mode 100644
index a102823..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf12/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.4-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-codi-jsf12</artifactId>
-    <packaging>jar</packaging>
-    <name>MyFaces CODI Archetype for JSF 1.2</name>
-    <description>Archetype to create a new JSF 1.2 webapp based on MyFaces CODI</description>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/META-INF/LICENSE.txt b/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/META-INF/NOTICE.txt b/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces Maven Plugins     ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index a78b206..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,49 +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-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
-                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                      xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
-
-                      name="myfaces-archetype-codi-jsf12" partial="false">
-
-  <requiredProperties/>
-
-  <fileSets>
-      <fileSet filtered="true" packaged="true">
-          <directory>src/main/java/</directory>
-      </fileSet>
-      <fileSet filtered="false" packaged="false">
-          <directory>src/main/webapp/</directory>
-          <excludes>
-              <exclude>WEB-INF/faces-config.xml</exclude>
-          </excludes>
-      </fileSet>
-      <fileSet filtered="true" packaged="false">
-          <directory>src/main/webapp/</directory>
-          <includes>
-              <!-- faces-config needs to be filtered -->
-              <include>WEB-INF/faces-config.xml</include>
-          </includes>
-      </fileSet>
-  </fileSets>
-
-  <modules/>
-
-</archetype-descriptor>
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index bd366bb..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,332 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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 1.2, OpenWebBeans and MyFaces CODI</name>
-    <url>http://www.myorganization.org</url>
-
-    <properties>
-        <jsf-myfaces.version>1.2.10</jsf-myfaces.version>
-        <jsf-mojarra.version>1.2_15</jsf-mojarra.version>
-        <openwebbeans.version>1.1.0</openwebbeans.version>
-        <codi.version>1.0.1</codi.version>
-        <maven.jetty.plugin.version>6.1.22</maven.jetty.plugin.version>
-    </properties>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>myfaces</id>
-            <activation>
-                <property>
-                    <name>!jsf</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-api</artifactId>
-                    <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-impl</artifactId>
-                    <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <profile>
-            <!-- Active adding -Djsf=mojarra when execute maven goals. -->
-            <id>mojarra</id>
-            <activation>
-                <property>
-                    <name>jsf</name>
-                    <value>mojarra</value>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>javax.faces</groupId>
-                    <artifactId>jsf-api</artifactId>
-                    <version>${symbol_dollar}{jsf-ri.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>javax.faces</groupId>
-                    <artifactId>jsf-impl</artifactId>
-                    <version>${symbol_dollar}{jsf-ri.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-            <repositories>
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1</url>
-                    <layout>legacy</layout>
-                </repository>
-            </repositories>
-        </profile>
-
-        <profile>
-            <!-- Use mvn clean jetty:run-exploded -PjettyConfig to run with jetty -->
-            <id>jettyConfig</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <!--This plugin allows to run the war using mvn jetty:run -->
-                        <groupId>org.mortbay.jetty</groupId>
-                        <artifactId>maven-jetty-plugin</artifactId>
-                        <version>${symbol_dollar}{maven.jetty.plugin.version}</version>
-                        <configuration>
-                            <scanIntervalSeconds>10</scanIntervalSeconds>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <!-- Project dependencies -->
-    <dependencies>
-
-        <!-- Specifications -->
-        <!-- JSR-330 -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
-            <version>1.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- JSR-299 -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-            <version>1.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <version>1.1.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-            <version>1.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-validation_1.0_spec</artifactId>
-            <version>1.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
-            <version>1.1.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>1.2</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-el_1.0_spec</artifactId>
-            <version>1.0.2</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>1.6.1</version>
-        </dependency>
-
-        <!-- OpenWebBeans -->
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-impl</artifactId>
-            <version>${symbol_dollar}{openwebbeans.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-jsf12</artifactId>
-            <version>${symbol_dollar}{openwebbeans.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-web</artifactId>
-            <version>${symbol_dollar}{openwebbeans.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-spi</artifactId>
-            <version>${symbol_dollar}{openwebbeans.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-resource</artifactId>
-            <version>${symbol_dollar}{openwebbeans.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-
-        <!-- MyFaces CODI -->
-        <!-- the JSF independent core -->
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
-            <artifactId>myfaces-extcdi-core-api</artifactId>
-            <version>${symbol_dollar}{codi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
-            <artifactId>myfaces-extcdi-core-impl</artifactId>
-            <version>${symbol_dollar}{codi.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- the JSF-1.2 specific library -->
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-            <artifactId>myfaces-extcdi-jsf12-module-api</artifactId>
-            <version>${symbol_dollar}{codi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-            <artifactId>myfaces-extcdi-jsf12-module-impl</artifactId>
-            <version>${symbol_dollar}{codi.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- the BV-1.0 specific library -->
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-            <artifactId>myfaces-extcdi-bv1-module-api</artifactId>
-            <version>${symbol_dollar}{codi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-            <artifactId>myfaces-extcdi-bv1-module-impl</artifactId>
-            <version>${symbol_dollar}{codi.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- CODI JPA-1.0 Module -->
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-            <artifactId>myfaces-extcdi-jpa1-module-api</artifactId>
-            <version>${symbol_dollar}{codi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-            <artifactId>myfaces-extcdi-jpa1-module-impl</artifactId>
-            <version>${symbol_dollar}{codi.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- CODI-I18N Message Module -->
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-            <artifactId>myfaces-extcdi-message-module-api</artifactId>
-            <version>${symbol_dollar}{codi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-            <artifactId>myfaces-extcdi-message-module-impl</artifactId>
-            <version>${symbol_dollar}{codi.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- CODI-Scripting Module -->
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-            <artifactId>myfaces-extcdi-scripting-module-api</artifactId>
-            <version>${symbol_dollar}{codi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-            <artifactId>myfaces-extcdi-scripting-module-impl</artifactId>
-            <version>${symbol_dollar}{codi.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!-- OPTIONAL: use the all-in-one jar instead of the individual CODI module dependencies -->
-        <!--dependency>
-            <groupId>org.apache.myfaces.extensions.cdi.bundles</groupId>
-            <artifactId>myfaces-extcdi-bundle-jsf12</artifactId>
-            <version>${symbol_dollar}{codi.version}</version>
-            <scope>compile</scope>
-        </dependency-->
-
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/java/GreetingService.java b/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/java/GreetingService.java
deleted file mode 100644
index d402759..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/java/GreetingService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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};
-
-import javax.inject.Named;
-import javax.enterprise.context.ApplicationScoped;
-
-@Named
-@ApplicationScoped
-public class GreetingService
-{
-    public String createGreeting(String name)
-    {
-        return "Hello " + name + ". We hope you enjoy Apache MyFaces!";
-    }
-
-}
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java b/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java
deleted file mode 100644
index fdbcaed..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java
+++ /dev/null
@@ -1,76 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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};
-
-import java.io.Serializable;
-
-import javax.inject.Named;
-import javax.inject.Inject;
-
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowScoped;
-
-/**
- * A typical simple backing bean, that is backed to <code>helloWorld.xhtml</code>
- */
-@Named("helloWorld")
-@WindowScoped
-public class HelloWorldController implements Serializable
-{
-
-    //properties
-    private String name;
-    @Inject private GreetingService greetingService;
-
-    /**
-     * default empty constructor
-     */
-    public HelloWorldController()
-    {
-    }
-
-    /**
-     * 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 "page2";
-    }
-
-    public String getGreeting()
-    {
-        return greetingService.createGreeting(name);
-    }
-
-    //-------------------getter & setter
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-}
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml b/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
deleted file mode 100644
index f1ee02a..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
@@ -1,21 +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.
--->
-<beans/>
-
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml b/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
deleted file mode 100644
index de760e6..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,38 +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">
-
-
-    <navigation-rule>
-        <navigation-case>
-            <from-outcome>page2</from-outcome>
-            <to-view-id>/page2.jsp</to-view-id>
-        </navigation-case>
-        <navigation-case>
-            <from-outcome>helloWorld</from-outcome>
-            <to-view-id>/helloWorld.jsp</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-	
-</faces-config>
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 2ac2d02..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,124 +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/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"
-        version="2.5">
-
-    <description>MyProject web.xml</description>
-
-    <!-- JSF standard parameters -->
-    <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>
-
-    <!-- MyFaces specific parameters -->
-    <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>
-
-    <!-- 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.html</welcome-file>
-    </welcome-file-list>
-
-    <!-- Listener for OpenWebBeans configuration -->
-    <listener>
-        <listener-class>
-            org.apache.webbeans.servlet.WebBeansConfigurationListener
-        </listener-class>
-    </listener>
-
-</web-app>
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp b/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
deleted file mode 100644
index a7da5d2..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
+++ /dev/null
@@ -1,42 +0,0 @@
-<%--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
---%>
-
-<%@ 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>
-        <link rel="stylesheet" type="text/css" href="resources/css/style.css" />
-    </head>
-    <body>
-        <f:view>
-            <div id="container">
-                <h1>MyFaces Hello World</h1>
-                <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>
-            </div>
-        </f:view>
-    </body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/index.html b/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/index.html
deleted file mode 100644
index 59d22fd..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/index.html
+++ /dev/null
@@ -1,23 +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.
--->
-<html>
-<head>
-    <meta http-equiv="refresh" content="0; URL=helloWorld.jsf">
-</head>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/page2.jsp b/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
deleted file mode 100644
index f2d230b..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
+++ /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.
---%>
-
-<%@ 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>
-        <link rel="stylesheet" type="text/css" href="resources/css/style.css" />
-    </head>
-    <body>
-        <f:view>
-            <div id="container">
-                <h1>MyFaces Hello World</h1>
-                <h:outputText value="#{helloWorld.greeting}"/>
-                <br/>
-                <h:form>
-                    <h:commandLink value="Home" action="helloWorld"/>
-                </h:form>
-            </div>
-        </f:view>
-    </body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css b/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css
deleted file mode 100644
index efb9941..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-body {
-    background-color: rgb(0, 35, 75);
-    font-family: tahoma, arial, helvetica, sans-serif;
-    font-size: 12px;
-}
-
-#container {
-    margin: 10px auto;
-    width: 900px;
-    background-color: white;
-    padding: 3px;
-}
-
-h1 {
-    font-size: 20px;
-}
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/site/apt/index.apt b/maven2-archetypes/myfaces-archetype-codi-jsf12/src/site/apt/index.apt
deleted file mode 100644
index 50b533d..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf12/src/site/apt/index.apt
+++ /dev/null
@@ -1,18 +0,0 @@
- ------
- MyFaces CODI JSF 1.2 Archetype
- ------
-
-Overview
-
-  This project defines a Maven archetype. Running the archetype plugin with this archetype will
-  create a directory tree containing the files needed to quickly get started on a new JSF 1.2
-  project using MyFaces CODI and Apache OpenWebBeans.
-
-Usage
-
-  Use the following maven command and then select myfaces-archetype-codi-jsf12 from the options.
-
-
-+------------------------------------------------------------------+
-mvn archetype:generate -DarchetypeCatalog=http://myfaces.apache.org
-+------------------------------------------------------------------+
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf20/pom.xml b/maven2-archetypes/myfaces-archetype-codi-jsf20/pom.xml
deleted file mode 100644
index e5d4f07..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf20/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.4-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-codi-jsf20</artifactId>
-    <packaging>jar</packaging>
-    <name>MyFaces CODI Archetype for JSF 2.0</name>
-    <description>Archetype to create a new JSF 2.0 webapp based on MyFaces CODI</description>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/META-INF/LICENSE.txt b/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/META-INF/NOTICE.txt b/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces Maven Plugins     ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 2a5b4b8..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,39 +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-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
-                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                      xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
-
-                      name="myfaces-archetype-codi-jsf20" partial="false">
-
-  <requiredProperties/>
-
-  <fileSets>
-      <fileSet filtered="true" packaged="true">
-          <directory>src/main/java/</directory>
-      </fileSet>
-      <fileSet filtered="false" packaged="false">
-          <directory>src/main/webapp/</directory>
-      </fileSet>
-  </fileSets>
-
-  <modules/>
-
-</archetype-descriptor>
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 14ebd46..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,937 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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>${artifactId}</name>
-    <description>A custom project using MyFaces 2.0, OpenWebBeans and MyFaces CODI</description>
-    <url>http://www.myorganization.org</url>
-
-    <!-- Instructions 
-      - Run using jetty 
-          mvn clean jetty:run
-          mvn clean -Dcontainer=jetty-mojarra jetty:run
-        Set your browser to http://localhost:8080/${artifactId}
-      - Build war and bundle JSF jars 
-          mvn clean -Pbundle-myfaces install
-          mvn clean -Pbundle-mojarra install
-     -->
-
-    <properties>
-        <jsf-myfaces.version>2.0.12</jsf-myfaces.version>
-        <jsf-mojarra.version>2.0.9</jsf-mojarra.version>        
-        <jetty.maven.plugin.version>8.1.1.v20120215</jetty.maven.plugin.version>
-        <openwebbeans.version>1.1.0</openwebbeans.version>
-        <codi.version>1.0.4</codi.version>
-    </properties>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <!-- Project dependencies -->
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>1.2</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-el_2.2_spec</artifactId>
-            <version>1.0.2</version>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-            <version>1.1.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Specifications -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <version>1.1.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-            <version>1.0</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- JSR-330 -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
-            <version>1.0</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-            <version>1.0</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-validation_1.0_spec</artifactId>
-            <version>1.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
-            <version>1.1.2</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- JSF API: Add here as provided dependency and then add it
-             on jetty-maven-plugin as compile/runtime dependency.
-             The same goes for other JSF libraries. -->
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <version>${symbol_dollar}{jsf-myfaces.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.2</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>1.6.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
-            <artifactId>myfaces-extcdi-core-api</artifactId>
-            <version>${symbol_dollar}{codi.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>bundle-myfaces</id>
-            <activation>
-                <property>
-                    <name>jsf</name>
-                    <value>myfaces</value>
-                </property>
-            </activation>
-            <!-- Include MyFaces jars into the war -->
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-api</artifactId>
-                    <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-impl</artifactId>
-                    <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jta_1.1_spec</artifactId>
-                    <version>1.1.1</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-                    <version>1.0</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-atinject_1.0_spec</artifactId>
-                    <version>1.0</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-                    <version>1.0</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-validation_1.0_spec</artifactId>
-                    <version>1.1</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jpa_1.0_spec</artifactId>
-                    <version>1.1.2</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-impl</artifactId>
-                    <version>${symbol_dollar}{openwebbeans.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-jsf</artifactId>
-                    <version>${symbol_dollar}{openwebbeans.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-web</artifactId>
-                    <version>${symbol_dollar}{openwebbeans.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-spi</artifactId>
-                    <version>${symbol_dollar}{openwebbeans.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-resource</artifactId>
-                    <version>${symbol_dollar}{openwebbeans.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <!-- MyFaces CODI -->
-                <!-- the JSF independent core -->
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
-                    <artifactId>myfaces-extcdi-core-api</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
-                    <artifactId>myfaces-extcdi-core-impl</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <!-- the JSF-2.0 specific library, which includes the JSF-1.2 parts -->
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <!-- the BV-1.0 specific library -->
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-bv1-module-api</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-bv1-module-impl</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <!-- CODI JPA-1.0 Module -->
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-jpa1-module-api</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-jpa1-module-impl</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <!-- CODI-I18N Message Module -->
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-message-module-api</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-message-module-impl</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <!-- CODI-Scripting Module -->
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-scripting-module-api</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-scripting-module-impl</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <!-- OPTIONAL: use the all-in-one jar instead of the individual CODI module dependencies -->
-                <!--dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.bundles</groupId>
-                    <artifactId>myfaces-extcdi-bundle-jsf20</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                    <scope>compile</scope>
-                </dependency-->
-            </dependencies>
-        </profile>
-
-        <profile>
-            <!-- Plugin embedded jetty 8 container. 
-                 Just running use:
-                 mvn clean jetty:run
-            -->
-            <!-- For debugging use (attach debugger port 8000):
-                 mvnDebug clean jetty:run
-            -->
-            <id>jettyConfig</id>
-            <activation>
-                <property>
-                    <name>!container</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <!--This plugin allows to run the war using mvn jetty:run -->
-                        <groupId>org.mortbay.jetty</groupId>
-                        <artifactId>jetty-maven-plugin</artifactId>
-                        <version>${symbol_dollar}{jetty.maven.plugin.version}</version>
-                        <configuration>
-                            <systemProperties>
-                                <systemProperty>
-                                    <!-- optional to use the ecj compiler -->
-                                    <name>org.apache.jasper.compiler.disablejsr199</name>
-                                    <value>true</value>
-                                </systemProperty>
-                            </systemProperties>
-                            <webApp>
-                                <contextPath>/${artifactId}</contextPath>
-                            </webApp>
-                            <scanIntervalSeconds>5</scanIntervalSeconds>
-                        </configuration>
-                        <dependencies>
-                           <!-- Tld scanning only works when JSF is included
-                                as container dependency. Add other jsf libraries
-                                here, so jetty:run goal can find and process them -->
-                            <dependency>
-                                <groupId>org.apache.myfaces.core</groupId>
-                                <artifactId>myfaces-api</artifactId>
-                                <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                                <scope>compile</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.myfaces.core</groupId>
-                                <artifactId>myfaces-impl</artifactId>
-                                <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.geronimo.specs</groupId>
-                                <artifactId>geronimo-jta_1.1_spec</artifactId>
-                                <version>1.1.1</version>
-                                <scope>compile</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.geronimo.specs</groupId>
-                                <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-                                <version>1.0</version>
-                                <scope>compile</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.geronimo.specs</groupId>
-                                <artifactId>geronimo-atinject_1.0_spec</artifactId>
-                                <version>1.0</version>
-                                <scope>compile</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.geronimo.specs</groupId>
-                                <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-                                <version>1.0</version>
-                                <scope>compile</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.geronimo.specs</groupId>
-                                <artifactId>geronimo-validation_1.0_spec</artifactId>
-                                <version>1.1</version>
-                                <scope>compile</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.geronimo.specs</groupId>
-                                <artifactId>geronimo-jpa_1.0_spec</artifactId>
-                                <version>1.1.2</version>
-                                <scope>compile</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.openwebbeans</groupId>
-                                <artifactId>openwebbeans-impl</artifactId>
-                                <version>${symbol_dollar}{openwebbeans.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.openwebbeans</groupId>
-                                <artifactId>openwebbeans-jsf</artifactId>
-                                <version>${symbol_dollar}{openwebbeans.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.openwebbeans</groupId>
-                                <artifactId>openwebbeans-web</artifactId>
-                                <version>${symbol_dollar}{openwebbeans.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.openwebbeans</groupId>
-                                <artifactId>openwebbeans-spi</artifactId>
-                                <version>${symbol_dollar}{openwebbeans.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.openwebbeans</groupId>
-                                <artifactId>openwebbeans-resource</artifactId>
-                                <version>${symbol_dollar}{openwebbeans.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <!-- MyFaces CODI -->
-                            <!-- the JSF independent core -->
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
-                                <artifactId>myfaces-extcdi-core-api</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
-                                <artifactId>myfaces-extcdi-core-impl</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <!-- the JSF-2.0 specific library, which includes the JSF-1.2 parts -->
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <!-- the BV-1.0 specific library -->
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-bv1-module-api</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-bv1-module-impl</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <!-- CODI JPA-1.0 Module -->
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-jpa1-module-api</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-jpa1-module-impl</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <!-- CODI-I18N Message Module -->
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-message-module-api</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-message-module-impl</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <!-- CODI-Scripting Module -->
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-scripting-module-api</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-scripting-module-impl</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <!-- OPTIONAL: use the all-in-one jar instead of the individual CODI module dependencies -->
-                            <!--dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.bundles</groupId>
-                                <artifactId>myfaces-extcdi-bundle-jsf20</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                                <scope>compile</scope>
-                            </dependency-->
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <profile>
-            <id>bundle-mojarra</id>
-            <activation>
-                <property>
-                    <name>jsf</name>
-                    <value>mojarra</value>
-                </property>
-            </activation>
-            <!-- Include Mojarra jars into the war -->
-            <dependencies>
-                <dependency>
-                    <groupId>com.sun.faces</groupId>
-                    <artifactId>jsf-api</artifactId>
-                    <version>${symbol_dollar}{jsf-mojarra.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.faces</groupId>
-                    <artifactId>jsf-impl</artifactId>
-                    <version>${symbol_dollar}{jsf-mojarra.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jta_1.1_spec</artifactId>
-                    <version>1.1.1</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-                    <version>1.0</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-atinject_1.0_spec</artifactId>
-                    <version>1.0</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-                    <version>1.0</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-validation_1.0_spec</artifactId>
-                    <version>1.1</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jpa_1.0_spec</artifactId>
-                    <version>1.1.2</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-impl</artifactId>
-                    <version>${symbol_dollar}{openwebbeans.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-jsf</artifactId>
-                    <version>${symbol_dollar}{openwebbeans.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-web</artifactId>
-                    <version>${symbol_dollar}{openwebbeans.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-spi</artifactId>
-                    <version>${symbol_dollar}{openwebbeans.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-resource</artifactId>
-                    <version>${symbol_dollar}{openwebbeans.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <!-- MyFaces CODI -->
-                <!-- the JSF independent core -->
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
-                    <artifactId>myfaces-extcdi-core-api</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
-                    <artifactId>myfaces-extcdi-core-impl</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <!-- the JSF-2.0 specific library, which includes the JSF-1.2 parts -->
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <!-- the BV-1.0 specific library -->
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-bv1-module-api</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-bv1-module-impl</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <!-- CODI JPA-1.0 Module -->
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-jpa1-module-api</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-jpa1-module-impl</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <!-- CODI-I18N Message Module -->
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-message-module-api</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-message-module-impl</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <!-- CODI-Scripting Module -->
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-scripting-module-api</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                    <artifactId>myfaces-extcdi-scripting-module-impl</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-                <!-- OPTIONAL: use the all-in-one jar instead of the individual CODI module dependencies -->
-                <!--dependency>
-                    <groupId>org.apache.myfaces.extensions.cdi.bundles</groupId>
-                    <artifactId>myfaces-extcdi-bundle-jsf20</artifactId>
-                    <version>${symbol_dollar}{codi.version}</version>
-                    <scope>compile</scope>
-                </dependency-->
-            </dependencies>
-            <repositories>
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/2</url>
-                </repository>
-            </repositories>
-        </profile>
-
-        <profile>
-            <!-- Plugin embedded jetty 8 container. 
-                 Just running use:
-                 mvn clean -Dcontainer=jetty-mojarra jetty:run 
-            -->
-            <!-- For debugging use (attach debugger port 8000):
-                 mvn clean -Dcontainer=jetty-mojarra jetty:run 
-            -->
-            <id>jettyConfig-mojarra</id>
-            <activation>
-                <property>
-                    <name>container</name>
-                    <value>jetty-mojarra</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <!--This plugin allows to run the war using mvn jetty:run -->
-                        <groupId>org.mortbay.jetty</groupId>
-                        <artifactId>jetty-maven-plugin</artifactId>
-                        <version>${symbol_dollar}{jetty.maven.plugin.version}</version>
-                        <configuration>
-                            <systemProperties>
-                                <systemProperty>
-                                    <!-- optional to use the ecj compiler -->
-                                    <name>org.apache.jasper.compiler.disablejsr199</name>
-                                    <value>true</value>
-                                </systemProperty>
-                            </systemProperties>
-                            <webApp>
-                                <contextPath>/${artifactId}</contextPath>
-                            </webApp>
-                            <scanIntervalSeconds>5</scanIntervalSeconds>
-                        </configuration>
-                        <dependencies>
-                           <!-- Tld scanning only works when JSF is included
-                                as container dependency. Add other jsf libraries
-                                here, so jetty:run goal can find and process them -->
-                           <dependency>
-                               <groupId>com.sun.faces</groupId>
-                               <artifactId>jsf-api</artifactId>
-                               <version>${symbol_dollar}{jsf-mojarra.version}</version>
-                               <scope>compile</scope>
-                           </dependency>
-                           <dependency>
-                               <groupId>com.sun.faces</groupId>
-                               <artifactId>jsf-impl</artifactId>
-                               <version>${symbol_dollar}{jsf-mojarra.version}</version>
-                               <scope>runtime</scope>
-                           </dependency>
-                            <dependency>
-                                <groupId>org.apache.geronimo.specs</groupId>
-                                <artifactId>geronimo-jta_1.1_spec</artifactId>
-                                <version>1.1.1</version>
-                                <scope>compile</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.geronimo.specs</groupId>
-                                <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-                                <version>1.0</version>
-                                <scope>compile</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.geronimo.specs</groupId>
-                                <artifactId>geronimo-atinject_1.0_spec</artifactId>
-                                <version>1.0</version>
-                                <scope>compile</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.geronimo.specs</groupId>
-                                <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-                                <version>1.0</version>
-                                <scope>compile</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.geronimo.specs</groupId>
-                                <artifactId>geronimo-validation_1.0_spec</artifactId>
-                                <version>1.1</version>
-                                <scope>compile</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.geronimo.specs</groupId>
-                                <artifactId>geronimo-jpa_1.0_spec</artifactId>
-                                <version>1.1.2</version>
-                                <scope>compile</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.openwebbeans</groupId>
-                                <artifactId>openwebbeans-impl</artifactId>
-                                <version>${symbol_dollar}{openwebbeans.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.openwebbeans</groupId>
-                                <artifactId>openwebbeans-jsf</artifactId>
-                                <version>${symbol_dollar}{openwebbeans.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.openwebbeans</groupId>
-                                <artifactId>openwebbeans-web</artifactId>
-                                <version>${symbol_dollar}{openwebbeans.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.openwebbeans</groupId>
-                                <artifactId>openwebbeans-spi</artifactId>
-                                <version>${symbol_dollar}{openwebbeans.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.openwebbeans</groupId>
-                                <artifactId>openwebbeans-resource</artifactId>
-                                <version>${symbol_dollar}{openwebbeans.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <!-- MyFaces CODI -->
-                            <!-- the JSF independent core -->
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
-                                <artifactId>myfaces-extcdi-core-api</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
-                                <artifactId>myfaces-extcdi-core-impl</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <!-- the JSF-2.0 specific library, which includes the JSF-1.2 parts -->
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <!-- the BV-1.0 specific library -->
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-bv1-module-api</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-bv1-module-impl</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <!-- CODI JPA-1.0 Module -->
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-jpa1-module-api</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-jpa1-module-impl</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <!-- CODI-I18N Message Module -->
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-message-module-api</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-message-module-impl</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <!-- CODI-Scripting Module -->
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-scripting-module-api</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
-                                <artifactId>myfaces-extcdi-scripting-module-impl</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                            <!-- OPTIONAL: use the all-in-one jar instead of the individual CODI module dependencies -->
-                            <!--dependency>
-                                <groupId>org.apache.myfaces.extensions.cdi.bundles</groupId>
-                                <artifactId>myfaces-extcdi-bundle-jsf20</artifactId>
-                                <version>${symbol_dollar}{codi.version}</version>
-                                <scope>compile</scope>
-                            </dependency-->
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <repositories>
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/2</url>
-                </repository>
-            </repositories>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/java/GreetingService.java b/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/java/GreetingService.java
deleted file mode 100644
index d402759..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/java/GreetingService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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};
-
-import javax.inject.Named;
-import javax.enterprise.context.ApplicationScoped;
-
-@Named
-@ApplicationScoped
-public class GreetingService
-{
-    public String createGreeting(String name)
-    {
-        return "Hello " + name + ". We hope you enjoy Apache MyFaces!";
-    }
-
-}
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java b/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java
deleted file mode 100644
index 0387fef..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java
+++ /dev/null
@@ -1,76 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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};
-
-import java.io.Serializable;
-
-import javax.inject.Named;
-import javax.inject.Inject;
-
-import org.apache.myfaces.extensions.cdi.core.api.scope.conversation.WindowScoped;
-
-/**
- * A typical simple backing bean, that is backed to <code>helloWorld.xhtml</code>
- */
-@Named("helloWorld")
-@WindowScoped
-public class HelloWorldController implements Serializable
-{
-
-    //properties
-    private String name;
-    @Inject private GreetingService greetingService;
-
-    /**
-     * default empty constructor
-     */
-    public HelloWorldController()
-    {
-    }
-
-    /**
-     * 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 "page2.xhtml";
-    }
-
-    public String getGreeting()
-    {
-        return greetingService.createGreeting(name);
-    }
-
-    //-------------------getter & setter
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-}
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml b/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
deleted file mode 100644
index f1ee02a..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
@@ -1,21 +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.
--->
-<beans/>
-
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml b/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
deleted file mode 100644
index 50eebab..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,26 +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="2.0"
-    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_2_0.xsd">
-
-</faces-config>
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index c676fad..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,139 +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/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"
-        version="2.5">
-
-    <description>MyProject web.xml</description>
-
-    <!-- JSF standard parameters -->
-    <context-param>
-        <description>Project stage for the application (new in 2.0). Expects one of
-            the following values: Development, Production, SystemTest, UnitTest
-        </description>
-        <param-name>javax.faces.PROJECT_STAGE</param-name>
-        <param-value>Development</param-value>
-    </context-param>
-    <context-param>
-        <description>
-            If this parameter is set to true and the submitted value of a component is
-            the empty string, the submitted value will be set to null
-        </description>
-        <param-name>javax.faces.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL</param-name>
-        <param-value>true</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>
-
-    <!-- MyFaces specific parameters -->
-    <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>
-
-    <!-- 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>*.xhtml</url-pattern>
-    </servlet-mapping>
-
-    <!-- Welcome files -->
-    <welcome-file-list>
-        <welcome-file>index.html</welcome-file>
-    </welcome-file-list>
-
-    <!-- Listener for OpenWebBeans configuration -->
-    <listener>
-        <listener-class>
-            org.apache.webbeans.servlet.WebBeansConfigurationListener
-        </listener-class>
-    </listener>
-
-</web-app>
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml b/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml
deleted file mode 100644
index 5ba2f95..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml
+++ /dev/null
@@ -1,42 +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.
--->
-<!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:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core">
-<h:head>
-    <title>Hello World</title>
-</h:head>
-<h:body>
-    <h:outputStylesheet name="style.css" library="css"/>
-    <div id="container">
-        <h1>MyFaces Hello World</h1>
-        <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>
-    </div>
-</h:body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/index.html b/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/index.html
deleted file mode 100644
index 24f2b32..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/index.html
+++ /dev/null
@@ -1,23 +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.
--->
-<html>
-<head>
-    <meta http-equiv="refresh" content="0; URL=helloWorld.xhtml">
-</head>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml b/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
deleted file mode 100644
index 0f2df6d..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
+++ /dev/null
@@ -1,37 +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.
--->
-<!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:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core">
-<h:head>
-    <title>Hello World</title>
-</h:head>
-<h:body>
-    <h:outputStylesheet name="style.css" library="css"/>
-    <div id="container">
-        <h1>MyFaces Hello World</h1>
-        <h:outputText value="#{helloWorld.greeting}"/>
-        <br/>
-        <h:link value="Home" outcome="helloWorld"/>
-    </div>
-</h:body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css b/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css
deleted file mode 100644
index efb9941..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-body {
-    background-color: rgb(0, 35, 75);
-    font-family: tahoma, arial, helvetica, sans-serif;
-    font-size: 12px;
-}
-
-#container {
-    margin: 10px auto;
-    width: 900px;
-    background-color: white;
-    padding: 3px;
-}
-
-h1 {
-    font-size: 20px;
-}
diff --git a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/site/apt/index.apt b/maven2-archetypes/myfaces-archetype-codi-jsf20/src/site/apt/index.apt
deleted file mode 100644
index 627a002..0000000
--- a/maven2-archetypes/myfaces-archetype-codi-jsf20/src/site/apt/index.apt
+++ /dev/null
@@ -1,18 +0,0 @@
- ------
- MyFaces CODI JSF 2.0 Archetype
- ------
-
-Overview
-
-  This project defines a Maven archetype. Running the archetype plugin with this archetype will
-  create a directory tree containing the files needed to quickly get started on a new JSF 2.0
-  project using MyFaces CODI and Apache OpenWebBeans.
-
-Usage
-
-  Use the following maven command and then select myfaces-archetype-codi-jsf20 from the options.
-
-
-+------------------------------------------------------------------+
-mvn archetype:generate -DarchetypeCatalog=http://myfaces.apache.org
-+------------------------------------------------------------------+
diff --git a/maven2-archetypes/myfaces-archetype-core-integration-test/pom.xml b/maven2-archetypes/myfaces-archetype-core-integration-test/pom.xml
deleted file mode 100644
index cd96376..0000000
--- a/maven2-archetypes/myfaces-archetype-core-integration-test/pom.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.
--->
-<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.4-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-core-integration-test</artifactId>
-    <packaging>jar</packaging> <!-- maven-archetype -->
-    <name>MyFaces Core Integration Test Archetype</name>
-
-    <description>
-        Archetype to create a new MyFaces core project used for integration tests via cargo and HtmlUnit.
-        Projects created via this archetype aim to test specific issues from the MyFaces core JIRA issue
-        tracker and can be directly added to the MyFaces core integration-tests module.
-    </description>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/META-INF/LICENSE.txt b/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/META-INF/NOTICE.txt b/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces Maven Plugins     ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
diff --git a/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index dcb7d2d..0000000
--- a/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,67 +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-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
-                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                      xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
-                      name="myfaces-archetype-core-integration-test" partial="false">
-
-    <requiredProperties>
-        <requiredProperty key="groupId">
-            <defaultValue>org.apache.myfaces.core.integrationtest</defaultValue>
-        </requiredProperty>
-
-        <requiredProperty key="package">
-            <defaultValue>org.apache.myfaces.integrationtest</defaultValue>
-        </requiredProperty>
-
-        <requiredProperty key="version">
-            <defaultValue>2.0.9-SNAPSHOT</defaultValue>
-        </requiredProperty>
-
-        <!--
-            The issueId from the MyFaces core JIRA issue for which
-            this integration test is created (e.g MYFACES-1234)
-        -->
-        <requiredProperty key="issueId" />
-
-        <!--
-            type of environment:
-                0 - servlet 2.5 + el 1.0 (default)
-                1 - servlet 2.5 + el 2.2
-                2 - servlet 3.0 + el 2.2
-        -->
-        <requiredProperty key="environmentType" />
-    </requiredProperties>
-
-    <fileSets>
-        <fileSet filtered="true" packaged="true">
-            <directory>src/main/java/</directory>
-        </fileSet>
-        <fileSet filtered="true" packaged="true">
-            <directory>src/test/java/</directory>
-        </fileSet>
-        <fileSet filtered="true" packaged="false">
-            <directory>src/main/webapp/</directory>
-        </fileSet>
-    </fileSets>
-
-    <modules/>
-
-</archetype-descriptor>
diff --git a/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 94c7c4a..0000000
--- a/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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.core.integrationtest</groupId>
-        <artifactId>myfaces-integration-tests</artifactId>
-
-        <!-- NOTE: set appropriate version, e.g. 2.0.x-SNAPSHOT or 2.1.x-SNAPSHOT -->
-        <version>${version}</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <packaging>war</packaging>
-    <name>Apache MyFaces JSF-2.0 Core Integration Tests - ${issueId}</name>
-
-
-    <build>
-        <plugins>
-            <plugin>
-                <!-- to start the container for manual tests use "mvn clean package cargo:run" -->
-                <groupId>org.codehaus.cargo</groupId>
-                <artifactId>cargo-maven2-plugin</artifactId>
-                <configuration>
-                    <container>
-## servlet 2.5 + el 2.2
-#if ($environmentType == 1)
-                        <!-- using jetty6x here, b/c jetty7x does not play well with el-2.2 integration -->
-                        <containerId>jetty6x</containerId>
-                        <type>embedded</type>
-
-                        <dependencies>
-                            <!-- use el 2.2 api+impl from glassfish -->
-                            <dependency>
-                                <groupId>javax.el</groupId>
-                                <artifactId>javax.el-api</artifactId>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.glassfish.web</groupId>
-                                <artifactId>javax.el</artifactId>
-                            </dependency>
-                        </dependencies>
-## servlet 3.0 + el 2.2
-#elseif ($environmentType == 2)
-                        <containerId>tomcat7x</containerId>
-                        <zipUrlInstaller>
-                            <url>http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.16/bin/apache-tomcat-7.0.16.zip</url>
-                        </zipUrlInstaller>
-## servlet 2.5 + el 1.0 (default)
-#else
-                        <containerId>tomcat6x</containerId>
-                        <zipUrlInstaller>
-                            <url>http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.32/bin/apache-tomcat-6.0.32.zip</url>
-                        </zipUrlInstaller>
-#end
-                    </container>
-
-                    <configuration>
-                        <properties>
-                            <cargo.servlet.port>${symbol_dollar}{cargo.port}</cargo.servlet.port>
-                        </properties>
-
-                        <deployables>
-                            <deployable>
-                                <groupId>${symbol_dollar}{project.groupId}</groupId>
-                                <artifactId>${symbol_dollar}{project.artifactId}</artifactId>
-                                <type>war</type>
-                                <properties>
-                                    <context>${symbol_dollar}{cargo.context}</context>
-                                </properties>
-                            </deployable>
-                        </deployables>
-                    </configuration>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>start-container</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>start</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>stop-container</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>stop</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <!-- using failsafe instead of surefire plugin ensures execution of phase post-integration-test -->
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>htmlunit-integration-tests</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>integration-test</goal>
-                        </goals>
-                        <configuration>
-                            <includes>
-                                <include>**/*Test*.java</include>
-                            </includes>
-                            <skip>false</skip>
-                            <testNGArtifactName>none:none</testNGArtifactName>
-                            <systemPropertyVariables>
-                                <!-- pass properties to JUnit -->
-                                <cargo.context>${symbol_dollar}{cargo.context}</cargo.context>
-                                <cargo.port>${symbol_dollar}{cargo.port}</cargo.port>
-                            </systemPropertyVariables>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>verify</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-
-
-    <dependencies>
-
-## servlet 2.5 + el 2.2
-#if ($environmentType == 1)
-        <!-- servlet 2.5 -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- el 2.2 api+impl from glassfish (need both dependencies here for cargo-plugin, see above) -->
-        <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>javax.el-api</artifactId>
-            <version>2.2.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.web</groupId>
-            <artifactId>javax.el</artifactId>
-            <version>2.2.1</version>
-            <scope>provided</scope>
-        </dependency>
-## servlet 3.0 + el 2.2
-#elseif ($environmentType == 2)
-        <!-- servlet 3.0 -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_3.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- el 2.2 -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-el_2.2_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-## servlet 2.5 + el 1.0 (default)
-#else
-        <!-- servlet 2.5 -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- el 1.0 -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-el_1.0_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>
-#end
-
-        <!-- test support module -->
-        <dependency>
-            <groupId>org.apache.myfaces.core.integrationtest</groupId>
-            <artifactId>myfaces-integration-test-support</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/archetype-resources/src/main/java/TestBean.java b/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/archetype-resources/src/main/java/TestBean.java
deleted file mode 100644
index 1603014..0000000
--- a/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/archetype-resources/src/main/java/TestBean.java
+++ /dev/null
@@ -1,42 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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};
-
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
-
-/**
- * Bean for integration tests of ${issueId}.
- */
-@ManagedBean
-@RequestScoped
-public class TestBean
-{
-
-    // TODO
-
-    public String action()
-    {
-        return null;
-    }
-
-}
diff --git a/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index fbeeb02..0000000
--- a/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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/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"
-         version="2.5">
-
-    <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>*.xhtml</url-pattern>
-    </servlet-mapping>
-
-    <context-param>
-        <param-name>javax.faces.PROJECT_STAGE</param-name>
-        <param-value>Production</param-value>
-    </context-param>
-
-    <context-param>
-        <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
-        <param-value>.xhtml</param-value>
-    </context-param>
-
-    <welcome-file-list>
-        <welcome-file>index.xhtml</welcome-file>
-    </welcome-file-list>
-
-## servlet 2.5 + el 2.2
-#if ($environmentType == 1)
-    <!--
-        we have to explicitly configure glassfish's el 2.2 implementation,
-        because it is not the standard one on this server
-    -->
-    <context-param>
-        <param-name>org.apache.myfaces.EXPRESSION_FACTORY</param-name>
-        <param-value>com.sun.el.ExpressionFactoryImpl</param-value>
-    </context-param>
-#end
-
-</web-app>
diff --git a/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/archetype-resources/src/main/webapp/pages/index.xhtml b/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/archetype-resources/src/main/webapp/pages/index.xhtml
deleted file mode 100644
index 7b6417c..0000000
--- a/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/archetype-resources/src/main/webapp/pages/index.xhtml
+++ /dev/null
@@ -1,48 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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.
-
--->
-<!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:f="http://java.sun.com/jsf/core"
-      xmlns:h="http://java.sun.com/jsf/html"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:c="http://java.sun.com/jsp/jstl/core">
-<h:head>
-    <title>Apache MyFaces Core - Integration test for ${issueId}</title>
-</h:head>
-<h:body>
-
-    <h1>Apache MyFaces Core - Integration test for ${issueId}</h1>
-
-    <h:messages />
-
-    <h:form id="form">
-
-        <!-- TODO -->
-
-        <h:commandButton id="submit" value="Submit" action="${symbol_pound}{testBean.action}" />
-    </h:form>
-
-</h:body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/archetype-resources/src/test/java/IntegrationTest.java b/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/archetype-resources/src/test/java/IntegrationTest.java
deleted file mode 100644
index 140a083..0000000
--- a/maven2-archetypes/myfaces-archetype-core-integration-test/src/main/resources/archetype-resources/src/test/java/IntegrationTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-/*
- * 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};
-
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import org.apache.myfaces.integrationtest.support.MyFacesIntegrationTest;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Test cases for ${issueId}.
- */
-@RunWith(JUnit4.class)
-public class IntegrationTest extends MyFacesIntegrationTest
-{
-
-    @Test
-    public void testAction_shouldExpectedResult() throws Exception
-    {
-        HtmlPage page = webClient.getPage(getBaseURL() + "pages/index.xhtml");
-
-        // TODO
-    }
-
-}
diff --git a/maven2-archetypes/myfaces-archetype-core-integration-test/src/site/apt/index.apt b/maven2-archetypes/myfaces-archetype-core-integration-test/src/site/apt/index.apt
deleted file mode 100644
index 66c4507..0000000
--- a/maven2-archetypes/myfaces-archetype-core-integration-test/src/site/apt/index.apt
+++ /dev/null
@@ -1,46 +0,0 @@
- ------
- MyFaces Core Integration-Test Archetype
- ------
-
-Overview
-
-  This project defines a Maven archetype. Running the archetype plugin with this archetype will
-  create a directory tree containing the files needed to quickly get started on a new integration
-  test for MyFaces core 2.x.
-
-Usage
-
-  Use the following maven command and then select myfaces-archetype-core-integration-test from the options.
-
-
-+------------------------------------------------------------------+
-mvn archetype:generate -DarchetypeCatalog=http://myfaces.apache.org
-+------------------------------------------------------------------+
-
-  You will then be prompted for some archetype specific properties, which will look like this:
-
-+------------------------------------------------------------------+
-Define value for property 'artifactId': : myfaces-1234-tests
-Define value for property 'environmentType': : 0
-Define value for property 'issueId': : MYFACES-1234
-+------------------------------------------------------------------+
-
-  All other properties (like e.g. groupId) will automatically be configured. As shown above, you need
-  to provide 3 properties:
-
-  * artifactId is the artifactId for the maven project, you should use #\{issueId\}-tests as shown above.
-
-  * environmentType defines which type of environment should be used.
-
-    * 0: servlet 2.5 and el 1.0
-
-    * 1: servlet 2.5 and el 2.2
-
-    * 2: servlet 3.0 and el 2.2
-
-  * issueId is the issue-id of the JIRA issue which this integration test addresses
-
-  []
-
-  The version of the project is automatically set to a default value (e.g. 2.0.9-SNAPSHOT). If you
-  want to test a different version, you have to change this manually in the pom.xml.
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 a9fa0af..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/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.4-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.myfaces.buildtools</groupId>
-  <artifactId>myfaces-archetype-helloworld-facelets</artifactId>
-  <packaging>jar</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/LICENSE.txt b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/NOTICE.txt b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces Maven Plugins     ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index b655ec1..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,52 +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-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
-                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                      xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
-
-                      name="myfaces-archetype-helloworld-facelets" partial="false">
-
-  <requiredProperties/>
-
-  <fileSets>
-      <fileSet filtered="true" packaged="true">
-          <directory>src/main/java/</directory>
-      </fileSet>
-      <fileSet filtered="false" packaged="false">
-          <directory>src/main/webapp/</directory>
-          <excludes>
-              <exclude>WEB-INF/examples-config.xml</exclude>
-          </excludes>
-      </fileSet>
-      <fileSet filtered="true" packaged="false">
-          <directory>src/main/webapp/</directory>
-          <includes>
-              <!-- examples-config needs to be filtered -->
-              <include>WEB-INF/examples-config.xml</include>
-          </includes>
-      </fileSet>
-      <fileSet filtered="false" packaged="false">
-          <directory>src/main/log4j/</directory>
-      </fileSet>
-  </fileSets>
-
-  <modules/>
-
-</archetype-descriptor>
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 4c0a549..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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 1.2 and facelets</name>
-    <url>http://www.myorganization.org</url>
-
-    <properties>
-        <jsf-myfaces.version>1.2.10</jsf-myfaces.version>
-        <jsf-ri.version>1.2_15</jsf-ri.version>        
-        <maven.jetty.plugin.version>6.1.22</maven.jetty.plugin.version>
-        <log4j.version>1.2.13</log4j.version>
-    </properties>
-
-    <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>${symbol_dollar}{maven.jetty.plugin.version}</version>
-                <configuration>
-                    <scanIntervalSeconds>10</scanIntervalSeconds>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
-    <profiles>
-        <profile>
-            <id>myfaces</id>
-            <activation>
-                <property>
-                    <name>!jsf</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-api</artifactId>
-                    <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-impl</artifactId>
-                    <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <!-- Active adding -Djsf=ri when execute maven goals. -->
-            <id>jsf-ri</id>
-            <activation>
-                <property>
-                    <name>jsf</name>
-                    <value>ri</value>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>javax.faces</groupId>
-                    <artifactId>jsf-api</artifactId>
-                    <version>${symbol_dollar}{jsf-ri.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>javax.faces</groupId>
-                    <artifactId>jsf-impl</artifactId>
-                    <version>${symbol_dollar}{jsf-ri.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-            <repositories>
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1</url>
-                    <layout>legacy</layout>
-                </repository>
-            </repositories>
-        </profile>
-        
-        <profile>
-            <!-- Debug profile for myfaces and jetty.
-                It allows to see debug messages using -PjettyConfig -->
-            <id>jettyConfig</id>
-            <build>
-                <resources>
-                    <resource>
-                        <directory>src/main/resources</directory>
-                    </resource>
-                    <resource>
-                        <directory>src/main/log4j</directory>
-                    </resource>
-                </resources>
-                <plugins>
-                    <plugin>
-                        <!--This plugin allows to run the example using mvn jetty:run -->
-                        <groupId>org.mortbay.jetty</groupId>
-                        <artifactId>maven-jetty-plugin</artifactId>
-                        <version>${symbol_dollar}{maven.jetty.plugin.version}</version>
-                        <configuration>
-                            <scanIntervalSeconds>10</scanIntervalSeconds>
-                            <systemProperties>
-                                <systemProperty>
-                                    <name>org.apache.commons.logging.Log</name>
-                                    <value>org.apache.commons.logging.impl.Log4JLogger</value>
-                                </systemProperty>
-                            </systemProperties>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                    <version>${symbol_dollar}{log4j.version}</version>
-                    <type>jar</type>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-    <!-- Project dependencies -->
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.myfaces.tomahawk</groupId>
-            <artifactId>tomahawk12</artifactId>
-            <version>1.1.9</version>
-            <scope>runtime</scope>    
-        </dependency>
-        
-        <dependency>
-            <groupId>javax.servlet</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.14</version>
-        </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-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 a9471b5..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/log4j/log4j.properties b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/log4j/log4j.properties
deleted file mode 100644
index 78352e4..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/log4j/log4j.properties
+++ /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.
-
-log4j.rootLogger=INFO, A1, A2
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-
-#log on a file on target too, to make easier check it
-log4j.appender.A2=org.apache.log4j.RollingFileAppender
-log4j.appender.A2.File=target/log4j.log
-log4j.appender.A2.MaxFileSize=1000KB
-# Keep one backup file
-log4j.appender.A2.MaxBackupIndex=1
-log4j.appender.A2.layout=org.apache.log4j.PatternLayout
-log4j.appender.A2.layout.ConversionPattern=%p %t %c - %m%n
-
-# Log level for myfaces libraries
-log4j.logger.org.apache.commons=INFO
-log4j.logger.org.apache.myfaces=TRACE
-log4j.logger.javax.faces=TRACE
-
-# Print the date in ISO 8601 format
-log4j.appender.A1.layout.ConversionPattern=%5p [%t] (%F\:%L) - %m%n
\ 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 13551e5..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/examples-config.xml
+++ /dev/null
@@ -1,56 +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.
--->
-<!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>
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 881385b..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,270 +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>
-
-	<!-- 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>
-
-	<!-- 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 3770eb6..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml
+++ /dev/null
@@ -1,45 +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.
--->
-<!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 6aaca55..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,22 +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.
---%>
-<%@ 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 be78e11..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
+++ /dev/null
@@ -1,40 +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.
--->
-<!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 ca316cf..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/template.xhtml
+++ /dev/null
@@ -1,35 +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.
--->
-<!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-facelets/src/site/apt/index.apt b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/site/apt/index.apt
deleted file mode 100644
index 463f8ae..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/site/apt/index.apt
+++ /dev/null
@@ -1,18 +0,0 @@
- ------
- Myfaces HelloWorld Facelets Archetype
- ------
-
-Overview
-
-  This project defines a Maven archetype. Running the archetype plugin with this archetype will
-  create a directory tree containing the files needed to quickly get started on a new JSF 1.2
-  project which uses Facelets as the templating language.
-
-Usage
-
-  Use the following maven command and then select myfaces-archetype-helloworld-facelets from the options.
-
-
-+------------------------------------------------------------------+
-mvn archetype:generate -DarchetypeCatalog=http://myfaces.apache.org
-+------------------------------------------------------------------+
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 f47365e..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/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.4-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-helloworld-portlets</artifactId>
-    <packaging>jar</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/LICENSE.txt b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/NOTICE.txt b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces Maven Plugins     ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 4fb4169..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,54 +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-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
-                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                      xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
-
-                      name="myfaces-archetype-helloworld-portlets" partial="false">
-
-  <requiredProperties/>
-
-  <fileSets>
-      <fileSet filtered="true" packaged="true">
-          <directory>src/main/java/</directory>
-      </fileSet>
-      <fileSet filtered="false" packaged="false">
-          <directory>src/main/webapp/</directory>
-          <excludes>
-              <exclude>WEB-INF/faces-config.xml</exclude>
-              <exclude>WEB-INF/portlet.xml</exclude>
-          </excludes>
-      </fileSet>
-      <fileSet filtered="true" packaged="false">
-          <directory>src/main/webapp/</directory>
-          <includes>
-              <!-- faces-config and portlet.xml need to be filtered -->
-              <include>WEB-INF/faces-config.xml</include>
-              <include>WEB-INF/portlet.xml</include>
-          </includes>
-      </fileSet>
-      <fileSet filtered="false" packaged="false">
-          <directory>src/main/log4j/</directory>
-      </fileSet>
-  </fileSets>
-
-  <modules/>
-
-</archetype-descriptor>
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 38152ad..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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 1.2 with the portlet bridge</name>
-    <url>http://www.myorganization.org</url>
-
-    <properties>
-        <jsf-myfaces.version>1.2.10</jsf-myfaces.version>
-        <jsf-ri.version>1.2_15</jsf-ri.version>
-        <maven.jetty.plugin.version>6.1.22</maven.jetty.plugin.version>
-        <log4j.version>1.2.13</log4j.version>
-        <portlet-bridge.version>1.0.0</portlet-bridge.version>
-    </properties>
-    
-    <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>${symbol_dollar}{portlet-bridge.version}</version>
-        </dependency>
-        
-        <dependency>
-          <groupId>org.apache.myfaces.portlet-bridge</groupId>
-          <artifactId>portlet-bridge-impl</artifactId>
-          <version>${symbol_dollar}{portlet-bridge.version}</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>
-     
-    <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>
-                            ${symbol_dollar}{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>
-                <dependency>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                    <version>${symbol_dollar}{log4j.version}</version>
-                    <type>jar</type>
-                </dependency>
-            </dependencies>
-            <build>
-                <resources>
-                    <resource>
-                        <directory>src/main/resources</directory>
-                    </resource>
-                    <resource>
-                        <directory>src/main/log4j</directory>
-                    </resource>
-                </resources>                  
-                <plugins>
-                    <plugin>
-                      <groupId>org.mortbay.jetty</groupId>
-                      <artifactId>maven-jetty-plugin</artifactId>
-                      <version>${symbol_dollar}{maven.jetty.plugin.version}</version>
-                      <configuration>
-                        <webXml>${symbol_dollar}{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>
-                            <systemProperty>
-                                <name>org.apache.commons.logging.Log</name>
-                                <value>org.apache.commons.logging.impl.Log4JLogger</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>${symbol_dollar}{jsf-myfaces.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-impl</artifactId>
-                    <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <!-- Active adding -Djsf=ri when execute maven goals. -->
-            <id>jsf-ri</id>
-            <activation>
-                <property>
-                    <name>jsf</name>
-                    <value>ri</value>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>javax.faces</groupId>
-                    <artifactId>jsf-api</artifactId>
-                    <version>${symbol_dollar}{jsf-ri.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>javax.faces</groupId>
-                    <artifactId>jsf-impl</artifactId>
-                    <version>${symbol_dollar}{jsf-ri.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-            <repositories>
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1</url>
-                    <layout>legacy</layout>
-                </repository>
-            </repositories>
-        </profile>
-    </profiles>  
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/java/NameBean.java b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/java/NameBean.java
deleted file mode 100644
index f7977d3..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/java/NameBean.java
+++ /dev/null
@@ -1,38 +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};
-
-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/log4j/log4j.properties b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/log4j/log4j.properties
deleted file mode 100644
index 78352e4..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/log4j/log4j.properties
+++ /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.
-
-log4j.rootLogger=INFO, A1, A2
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-
-#log on a file on target too, to make easier check it
-log4j.appender.A2=org.apache.log4j.RollingFileAppender
-log4j.appender.A2.File=target/log4j.log
-log4j.appender.A2.MaxFileSize=1000KB
-# Keep one backup file
-log4j.appender.A2.MaxBackupIndex=1
-log4j.appender.A2.layout=org.apache.log4j.PatternLayout
-log4j.appender.A2.layout.ConversionPattern=%p %t %c - %m%n
-
-# Log level for myfaces libraries
-log4j.logger.org.apache.commons=INFO
-log4j.logger.org.apache.myfaces=TRACE
-log4j.logger.javax.faces=TRACE
-
-# Print the date in ISO 8601 format
-log4j.appender.A1.layout.ConversionPattern=%5p [%t] (%F\:%L) - %m%n
\ 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/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 d8b2ef0..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,44 +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.
--->
-<!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>${package}.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 90b4918..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,48 +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>
-  
-  <!-- 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 9c846f4..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/edit.jsp
+++ /dev/null
@@ -1,38 +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.
---%>
-<!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 94ea98d..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/hello.jsp
+++ /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.
---%>
-<!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 37ee178..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/index.jsp
+++ /dev/null
@@ -1,42 +0,0 @@
-<%--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
---%>
-<!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 7e3b778..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/help.jsp
+++ /dev/null
@@ -1,38 +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.
---%>
-<!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 3219e28..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,45 +0,0 @@
-<%--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
---%>
-<!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-portlets/src/site/apt/index.apt b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/site/apt/index.apt
deleted file mode 100644
index 62f8b9a..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/site/apt/index.apt
+++ /dev/null
@@ -1,18 +0,0 @@
- ------
- Myfaces HelloWorld Portlets Archetype
- ------
-
-Overview
-
-  This project defines a Maven archetype. Running the archetype plugin with this archetype will
-  create a directory tree containing the files needed to quickly get started on a new JSF 1.2
-  project which uses Portlets.
-
-Usage
-
-  Use the following maven command and then select myfaces-archetype-helloworld-portlets from the options.
-
-
-+------------------------------------------------------------------+
-mvn archetype:generate -DarchetypeCatalog=http://myfaces.apache.org
-+------------------------------------------------------------------+
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld/pom.xml
deleted file mode 100644
index 672348a..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/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.4-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-helloworld</artifactId>
-    <packaging>jar</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/LICENSE.txt b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/NOTICE.txt b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces Maven Plugins     ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index bfb85ac..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,52 +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-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
-                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                      xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
-
-                      name="myfaces-archetype-helloworld" partial="false">
-
-  <requiredProperties/>
-
-  <fileSets>
-      <fileSet filtered="true" packaged="true">
-          <directory>src/main/java/</directory>
-      </fileSet>
-      <fileSet filtered="false" packaged="false">
-          <directory>src/main/webapp/</directory>
-          <excludes>
-              <exclude>WEB-INF/faces-config.xml</exclude>
-          </excludes>
-      </fileSet>
-      <fileSet filtered="true" packaged="false">
-          <directory>src/main/webapp/</directory>
-          <includes>
-              <!-- faces-config needs to be filtered -->
-              <include>WEB-INF/faces-config.xml</include>
-          </includes>
-      </fileSet>
-      <fileSet filtered="false" packaged="false">
-          <directory>src/main/log4j/</directory>
-      </fileSet>
-  </fileSets>
-
-  <modules/>
-
-</archetype-descriptor>
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 4b47fae..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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 1.2</name>
-    <url>http://www.myorganization.org</url>
-
-    <properties>
-        <jsf-myfaces.version>1.2.10</jsf-myfaces.version>
-        <jsf-ri.version>1.2_15</jsf-ri.version>        
-        <maven.jetty.plugin.version>6.1.22</maven.jetty.plugin.version>
-        <log4j.version>1.2.13</log4j.version>
-    </properties>
-
-    <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>${symbol_dollar}{maven.jetty.plugin.version}</version>
-                <configuration>
-                    <scanIntervalSeconds>10</scanIntervalSeconds>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    
-    <profiles>
-        <profile>
-            <id>myfaces</id>
-            <activation>
-                <property>
-                    <name>!jsf</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-api</artifactId>
-                    <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-impl</artifactId>
-                    <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <!-- Active adding -Djsf=ri when execute maven goals. -->
-            <id>jsf-ri</id>
-            <activation>
-                <property>
-                    <name>jsf</name>
-                    <value>ri</value>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>javax.faces</groupId>
-                    <artifactId>jsf-api</artifactId>
-                    <version>${symbol_dollar}{jsf-ri.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>javax.faces</groupId>
-                    <artifactId>jsf-impl</artifactId>
-                    <version>${symbol_dollar}{jsf-ri.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-            <repositories>
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/1</url>
-                    <layout>legacy</layout>
-                </repository>
-            </repositories>
-        </profile>
-        
-        <profile>
-            <!-- Debug profile for myfaces and jetty.
-                It allows to see debug messages using -PjettyConfig -->
-            <id>jettyConfig</id>
-            <build>
-                <resources>
-                    <resource>
-                        <directory>src/main/resources</directory>
-                    </resource>
-                    <resource>
-                        <directory>src/main/log4j</directory>
-                    </resource>
-                </resources>
-                <plugins>
-                    <plugin>
-                        <!--This plugin allows to run the example using mvn jetty:run -->
-                        <groupId>org.mortbay.jetty</groupId>
-                        <artifactId>maven-jetty-plugin</artifactId>
-                        <version>${symbol_dollar}{maven.jetty.plugin.version}</version>
-                        <configuration>
-                            <scanIntervalSeconds>10</scanIntervalSeconds>
-                            <systemProperties>
-                                <systemProperty>
-                                    <name>org.apache.commons.logging.Log</name>
-                                    <value>org.apache.commons.logging.impl.Log4JLogger</value>
-                                </systemProperty>
-                            </systemProperties>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                    <version>${symbol_dollar}{log4j.version}</version>
-                    <type>jar</type>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-    <!-- Project dependencies -->
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.myfaces.tomahawk</groupId>
-            <artifactId>tomahawk12</artifactId>
-            <version>1.1.9</version>
-            <scope>runtime</scope>    
-        </dependency>
-        
-        <dependency>
-            <groupId>javax.servlet</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/HelloWorldController.java b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java
deleted file mode 100644
index 1e31367..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/java/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 ${package};
-
-/**
- * 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";
-    }
-}
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/log4j/log4j.properties b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/log4j/log4j.properties
deleted file mode 100644
index 78352e4..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/log4j/log4j.properties
+++ /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.
-
-log4j.rootLogger=INFO, A1, A2
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-
-#log on a file on target too, to make easier check it
-log4j.appender.A2=org.apache.log4j.RollingFileAppender
-log4j.appender.A2.File=target/log4j.log
-log4j.appender.A2.MaxFileSize=1000KB
-# Keep one backup file
-log4j.appender.A2.MaxBackupIndex=1
-log4j.appender.A2.layout=org.apache.log4j.PatternLayout
-log4j.appender.A2.layout.ConversionPattern=%p %t %c - %m%n
-
-# Log level for myfaces libraries
-log4j.logger.org.apache.commons=INFO
-log4j.logger.org.apache.myfaces=TRACE
-log4j.logger.javax.faces=TRACE
-
-# Print the date in ISO 8601 format
-log4j.appender.A1.layout.ConversionPattern=%5p [%t] (%F\:%L) - %m%n
\ No newline at end of file
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 3a36fd6..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,50 +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">
-	
-	<!-- managed beans of the simple hello world app -->
-	<managed-bean>
-		<managed-bean-name>helloWorld</managed-bean-name>
-		<managed-bean-class>${package}.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 17e96b8..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,212 +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>
-
-    <!-- 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 f608fdd..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
+++ /dev/null
@@ -1,38 +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.
---%>
-
-<%@ 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 6aaca55..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,22 +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.
---%>
-<%@ 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 4f36337..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
+++ /dev/null
@@ -1,36 +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.
---%>
-
-<%@ 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>
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 34f508b..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/site/apt/index.apt
+++ /dev/null
@@ -1,18 +0,0 @@
- ------
- Myfaces HelloWorld Archetype
- ------
-
-Overview
-
-  This project defines a Maven archetype. Running the archetype plugin with this archetype will
-  create a directory tree containing the files needed to quickly get started on a new JSF 1.2
-  project which uses JSP as the templating language.
-
-Usage
-
-  Use the following maven command and then select myfaces-archetype-helloworld from the options.
-
-
-+------------------------------------------------------------------+
-mvn archetype:generate -DarchetypeCatalog=http://myfaces.apache.org
-+------------------------------------------------------------------+
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-debug/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld20-debug/pom.xml
deleted file mode 100644
index 5e14100..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-debug/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.4-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-helloworld20-debug</artifactId>
-    <packaging>jar</packaging>
-    <name>MyFaces 2.0 Basic Debug Archetype</name>
-    <description>Archetype to create a new webapp based on MyFaces 2.0, specially for debug issues</description>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/META-INF/LICENSE.txt b/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/META-INF/NOTICE.txt b/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces Maven Plugins     ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index b59d06a..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,47 +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-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
-                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                      xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
-                      name="myfaces-archetype-helloworld20-debug" partial="false">
-
-  <requiredProperties/>
-
-  <fileSets>
-      <fileSet filtered="true" packaged="true">
-          <directory>src/main/java/</directory>
-      </fileSet>
-      <fileSet filtered="false" packaged="false">
-          <directory>src/main/resources/</directory>
-      </fileSet>
-      <fileSet filtered="true" packaged="true">
-          <directory>src/test/java/</directory>
-      </fileSet>
-      <fileSet filtered="false" packaged="false">
-          <directory>src/test/resources/</directory>
-      </fileSet>
-      <fileSet filtered="false" packaged="false">
-          <directory>src/main/webapp/</directory>
-      </fileSet>
-  </fileSets>
-
-  <modules/>
-
-</archetype-descriptor>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index ece2678..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,459 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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>${artifactId}</name>
-    <description>A custom project used to debug MyFaces Core 2.0</description>
-    <url>http://www.myorganization.org</url>
-
-    <!-- Instructions 
-      This project uses myfaces-test and myfaces-impl test jar
-      to make easier create specific tests for myfaces core that
-      later could be included into myfaces codebase.
-      - Run using jetty 
-          mvn clean jetty:run
-          mvn clean -Dcontainer=jetty-mojarra jetty:run
-        Set your browser to http://localhost:8080/${artifactId}
-      - Build war and bundle JSF jars 
-          mvn clean -Pbundle-myfaces install
-          mvn clean -Pbundle-mojarra install
-      - Run using tomcat 6.0
-          mvn clean -Dcontainer=tomcat tomcat:run-war
-      - Run using tomcat 7.0 through cargo
-          mvn clean -Dcontainer=tomcat7 install cargo:run
-     -->
-
-    <properties>
-        <jsf-myfaces.version>2.0.12</jsf-myfaces.version>
-        <jsf-mojarra.version>2.0.9</jsf-mojarra.version>        
-        <jetty.maven.plugin.version>8.1.1.v20120215</jetty.maven.plugin.version>
-        <cargo.version>1.1.1</cargo.version>
-    </properties>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <!-- The following plugin is used to pack everything inside
-                 webapp folder and make it available on test jar under
-                 the path "webapp". This allows create junit tests over
-                 those files like for example, check if all facelets
-                 compile, if a view is correctly built or if render 
-                 what is expected. -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
-                <executions>
-                    <execution>
-                        <id>add-webapp-folder-as-test</id>
-                        <phase>generate-test-resources</phase>
-                        <goals>
-                            <goal>add-test-resource</goal>
-                        </goals>
-                        <configuration>
-                          <resources>
-                            <resource>
-                                <directory>src/main/webapp</directory>
-                                <targetPath>webapp</targetPath>
-                            </resource>
-                          </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            
-        </plugins>
-    </build>
-
-    <!-- Project dependencies -->
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>1.2</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-el_2.2_spec</artifactId>
-            <version>1.0.2</version>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-            <version>1.1.1</version>
-            <scope>provided</scope>
-        </dependency>
-        
-        <!-- JSF API: Add here as provided dependency and then add it
-             on jetty-maven-plugin as compile/runtime dependency.
-             The same goes for other JSF libraries. -->
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <version>${symbol_dollar}{jsf-myfaces.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.2</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.myfaces.test</groupId>
-            <artifactId>myfaces-test20</artifactId>
-            <version>1.0.4</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-impl</artifactId>
-            <version>${symbol_dollar}{jsf-myfaces.version}</version>
-            <classifier>tests</classifier>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-impl</artifactId>
-            <version>${symbol_dollar}{jsf-myfaces.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>bundle-myfaces</id>
-            <activation>
-                <property>
-                    <name>jsf</name>
-                    <value>myfaces</value>
-                </property>
-            </activation>
-            <!-- Include MyFaces jars into the war -->
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-api</artifactId>
-                    <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-impl</artifactId>
-                    <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <profile>
-            <!-- Plugin embedded jetty 8 container. 
-                 Just running use:
-                 mvn clean jetty:run
-            -->
-            <!-- For debugging use (attach debugger port 8000):
-                 mvnDebug clean jetty:run
-            -->
-            <id>jettyConfig</id>
-            <activation>
-                <property>
-                    <name>!container</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <!--This plugin allows to run the war using mvn jetty:run -->
-                        <groupId>org.mortbay.jetty</groupId>
-                        <artifactId>jetty-maven-plugin</artifactId>
-                        <version>${symbol_dollar}{jetty.maven.plugin.version}</version>
-                        <configuration>
-                            <systemProperties>
-                                <systemProperty>
-                                    <!-- optional to use the ecj compiler -->
-                                    <name>org.apache.jasper.compiler.disablejsr199</name>
-                                    <value>true</value>
-                                </systemProperty>
-                            </systemProperties>
-                            <webApp>
-                                <contextPath>/${symbol_dollar}{artifactId}</contextPath>
-                            </webApp>
-                            <scanIntervalSeconds>5</scanIntervalSeconds>
-                        </configuration>
-                        <dependencies>
-                           <!-- Tld scanning only works when JSF is included
-                                as container dependency. Add other jsf libraries
-                                here, so jetty:run goal can find and process them -->
-                            <dependency>
-                                <groupId>org.apache.myfaces.core</groupId>
-                                <artifactId>myfaces-api</artifactId>
-                                <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                                <scope>compile</scope>
-                            </dependency>
-                            <dependency>
-                                <groupId>org.apache.myfaces.core</groupId>
-                                <artifactId>myfaces-impl</artifactId>
-                                <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                                <scope>runtime</scope>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <profile>
-            <id>bundle-mojarra</id>
-            <activation>
-                <property>
-                    <name>jsf</name>
-                    <value>mojarra</value>
-                </property>
-            </activation>
-            <!-- Include Mojarra jars into the war -->
-            <dependencies>
-                <dependency>
-                    <groupId>com.sun.faces</groupId>
-                    <artifactId>jsf-api</artifactId>
-                    <version>${symbol_dollar}{jsf-mojarra.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.faces</groupId>
-                    <artifactId>jsf-impl</artifactId>
-                    <version>${symbol_dollar}{jsf-mojarra.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-            <repositories>
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/2</url>
-                </repository>
-            </repositories>
-        </profile>
-
-        <profile>
-            <!-- Plugin embedded jetty 8 container. 
-                 Just running use:
-                 mvn clean -Dcontainer=jetty-mojarra jetty:run 
-            -->
-            <!-- For debugging use (attach debugger port 8000):
-                 mvn clean -Dcontainer=jetty-mojarra jetty:run 
-            -->
-            <id>jettyConfig-mojarra</id>
-            <activation>
-                <property>
-                    <name>container</name>
-                    <value>jetty-mojarra</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <!--This plugin allows to run the war using mvn jetty:run -->
-                        <groupId>org.mortbay.jetty</groupId>
-                        <artifactId>jetty-maven-plugin</artifactId>
-                        <version>${symbol_dollar}{jetty.maven.plugin.version}</version>
-                        <configuration>
-                            <systemProperties>
-                                <systemProperty>
-                                    <!-- optional to use the ecj compiler -->
-                                    <name>org.apache.jasper.compiler.disablejsr199</name>
-                                    <value>true</value>
-                                </systemProperty>
-                            </systemProperties>
-                            <webApp>
-                                <contextPath>/${symbol_dollar}{artifactId}</contextPath>
-                            </webApp>
-                            <scanIntervalSeconds>5</scanIntervalSeconds>
-                        </configuration>
-                        <dependencies>
-                           <!-- Tld scanning only works when JSF is included
-                                as container dependency. Add other jsf libraries
-                                here, so jetty:run goal can find and process them -->
-                           <dependency>
-                               <groupId>com.sun.faces</groupId>
-                               <artifactId>jsf-api</artifactId>
-                               <version>${symbol_dollar}{jsf-mojarra.version}</version>
-                               <scope>compile</scope>
-                           </dependency>
-                           <dependency>
-                               <groupId>com.sun.faces</groupId>
-                               <artifactId>jsf-impl</artifactId>
-                               <version>${symbol_dollar}{jsf-mojarra.version}</version>
-                               <scope>runtime</scope>
-                           </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-            <repositories>
-                <repository>
-                    <id>java.net</id>
-                    <url>http://download.java.net/maven/2</url>
-                </repository>
-            </repositories>
-        </profile>
-        
-        <profile>
-            <!-- Plugin embedded tomcat 6 container. 
-                 Just running use:
-                 mvn clean -Dcontainer=tomcat tomcat:run-war 
-            -->
-            <!-- For debugging use (attach debugger port 8000):
-                 mvnDebug clean -Dcontainer=tomcat tomcat:run-war 
-            -->
-            <id>tomcat</id>
-            <activation>
-                <property>
-                    <name>container</name>
-                    <value>tomcat</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                      <groupId>org.codehaus.mojo</groupId>
-                      <artifactId>tomcat-maven-plugin</artifactId>
-                      <version>1.1</version>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-api</artifactId>
-                    <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-impl</artifactId>
-                    <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        
-        <profile>
-            <!-- Installed tomcat 7 running war file through cargo 
-                 Attach debugger on port 8000:
-                 mvn clean -Dcontainer=tomcat7 install cargo:run -->
-            <id>cargo-tomcat7</id>
-            <activation>
-                <property>
-                    <name>container</name>
-                    <value>tomcat7</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                      <groupId>org.codehaus.cargo</groupId>
-                      <artifactId>cargo-maven2-plugin</artifactId>
-                      <version>${symbol_dollar}{cargo.version}</version>
-                      <configuration>
-                        <wait>true</wait>
-                        <properties>
-                            <cargo.servlet.port>8080</cargo.servlet.port>
-                            <cargo.jvmargs>
-                              -Xdebug
-                              -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000
-                              -Xnoagent
-                              -Djava.compiler=NONE
-                            </cargo.jvmargs>
-                        </properties>
-                        <container>
-                          <containerId>tomcat7x</containerId>
-                          <zipUrlInstaller>
-                            <url>http://archive.apache.org/dist/tomcat/tomcat-7/v7.0.25/bin/apache-tomcat-7.0.25.zip</url>
-                            <!-- 
-                            <installDir>${symbol_dollar}{basedir}/tomcat7x</installDir>
-                             -->
-                            <downloadDir>${symbol_dollar}{basedir}/downloads</downloadDir>
-                            <extractDir>${symbol_dollar}{basedir}/tomcat7x</extractDir>
-                          </zipUrlInstaller>
-                        </container>
-                        <configuration>
-                          <home>${symbol_dollar}{basedir}/target/tomcat7x</home>
-                          <properties>
-                            <cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000 -Xnoagent -Djava.compiler=NONE</cargo.jvmargs>
-                          </properties>
-                        </configuration>
-                      </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-api</artifactId>
-                    <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-impl</artifactId>
-                    <version>${symbol_dollar}{jsf-myfaces.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        
-    </profiles>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java b/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java
deleted file mode 100644
index bd6397b..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java
+++ /dev/null
@@ -1,63 +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};
-
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
-
-/**
- * A typical simple backing bean, that is backed to <code>helloWorld.xhtml</code>
- */
-@ManagedBean(name = "helloWorld")
-@RequestScoped
-public class HelloWorldController
-{
-
-    //properties
-    private String name;
-
-    /**
-     * default empty constructor
-     */
-    public HelloWorldController()
-    {
-    }
-
-    /**
-     * 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 "page2.xhtml";
-    }
-
-    //-------------------getter & setter
-
-    public String getName()
-    {
-        return name;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-}
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml b/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
deleted file mode 100644
index 1922f03..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,27 +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="2.0"
-    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_2_0.xsd">
-	
-</faces-config>
-        
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 4ca59cb..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,132 +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/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"
-        version="2.5">
-
-    <description>MyProject web.xml</description>
-
-    <!-- JSF standard parameters -->
-    <context-param>
-        <description>Project stage for the application (new in 2.0). Expects one of
-            the following values: Development, Production, SystemTest, UnitTest
-        </description>
-        <param-name>javax.faces.PROJECT_STAGE</param-name>
-        <param-value>Development</param-value>
-    </context-param>
-    <context-param>
-        <description>
-            If this parameter is set to true and the submitted value of a component is
-            the empty string, the submitted value will be set to null
-        </description>
-        <param-name>javax.faces.INTERPRET_EMPTY_STRING_SUBMITTED_VALUES_AS_NULL</param-name>
-        <param-value>true</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>
-
-    <!-- MyFaces specific parameters -->
-    <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>
-
-    <!-- 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.html</welcome-file>
-    </welcome-file-list>
-
-</web-app>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml b/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml
deleted file mode 100644
index 5ba2f95..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml
+++ /dev/null
@@ -1,42 +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.
--->
-<!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:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core">
-<h:head>
-    <title>Hello World</title>
-</h:head>
-<h:body>
-    <h:outputStylesheet name="style.css" library="css"/>
-    <div id="container">
-        <h1>MyFaces Hello World</h1>
-        <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>
-    </div>
-</h:body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/home.xhtml b/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/home.xhtml
deleted file mode 100644
index 34c5b55..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/home.xhtml
+++ /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.
--->
-<!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:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core">
-<h:head>
-    <title>Hello World</title>
-</h:head>
-<h:body>
-    <h:outputStylesheet name="style.css" library="css"/>
-    <div id="container">
-        <h1>MyFaces Hello World</h1>
-        
-        <h:panelGrid columns="1">
-        
-            <h:link outcome="helloWorld" value="helloWorld"/>
-        
-        </h:panelGrid>
-    </div>
-</h:body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/index.html b/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/index.html
deleted file mode 100644
index d53f072..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/index.html
+++ /dev/null
@@ -1,24 +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.
--->
-<html>
-<head>
-    <meta http-equiv="refresh" content="0; URL=home.jsf">
-</head>
-</html>
-        
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml b/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
deleted file mode 100644
index 618d337..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
+++ /dev/null
@@ -1,37 +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.
--->
-<!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:h="http://java.sun.com/jsf/html"
-      xmlns:f="http://java.sun.com/jsf/core">
-<h:head>
-    <title>Hello World</title>
-</h:head>
-<h:body>
-    <h:outputStylesheet name="style.css" library="css"/>
-    <div id="container">
-        <h1>MyFaces Hello World</h1>
-        <h:outputText value="Hello #{helloWorld.name}. We hope you enjoy Apache MyFaces!"/>
-        <br/>
-        <h:link value="Home" outcome="helloWorld"/>
-    </div>
-</h:body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css b/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css
deleted file mode 100644
index 5d1ec09..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css
+++ /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.
- */
-
-body {
-    background-color: rgb(0, 35, 75);
-    font-family: tahoma, arial, helvetica, sans-serif;
-    font-size: 12px;
-}
-
-#container {
-    margin: 10px auto;
-    width: 900px;
-    background-color: white;
-    padding: 3px;
-}
-
-h1 {
-    font-size: 20px;
-}
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/test/java/CheckFaceletsFileTestCase.java b/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/test/java/CheckFaceletsFileTestCase.java
deleted file mode 100644
index 5176f36..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/test/java/CheckFaceletsFileTestCase.java
+++ /dev/null
@@ -1,149 +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};
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.faces.component.UIViewRoot;
-import javax.faces.context.ResponseWriter;
-
-import org.apache.myfaces.view.facelets.FaceletFactory;
-import org.apache.myfaces.view.facelets.FaceletTestCase;
-import org.apache.myfaces.view.facelets.compiler.Compiler;
-import org.apache.myfaces.view.facelets.util.FastWriter;
-import org.junit.Test;
-
-public class CheckFaceletsFileTestCase extends FaceletTestCase
-{
-    /**
-     * Check all .xhtml can be parsed by facelets compiler
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testCanCompileFaceletFiles() throws Exception
-    {
-        Compiler compiler = vdl.createCompiler(facesContext);
-        FaceletFactory factory = vdl.createFaceletFactory(facesContext, compiler);
-        
-        checkFaceletsFiles(factory, "/");
-    }
-
-    private void checkFaceletsFiles(FaceletFactory factory, String pathBase) throws Exception
-    {
-        Set<String> paths = externalContext.getResourcePaths(pathBase);
-        for (String path : paths)
-        {
-            if (path.endsWith(".xhtml"))
-            {
-                factory.getFacelet(getLocalFile(path.substring(1)));
-            }
-            else if (path.endsWith("/"))
-            {
-                checkFaceletsFiles(factory, path);
-            }
-        }
-    }
-
-
-    /**
-     * Check a if a single view can be built.
-     * 
-     * @throws Exception
-     */
-    @Test
-    public void testSingleFaceletsFile() throws Exception {
-        //Step 1: initialize beans
-        
-        //Step 2: build view
-        UIViewRoot root = facesContext.getViewRoot();
-        vdl.buildView(facesContext, root, "helloWorld.xhtml");
-        
-        //Step 3: render view
-        FastWriter fw = new FastWriter();
-        ResponseWriter rw = facesContext.getResponseWriter();
-        rw = rw.cloneWithWriter(fw);
-        facesContext.setResponseWriter(rw);
-        root.encodeAll(facesContext);
-        //System.out.println(fw);
-    }
-    
-    @Test
-    public void testCanBuildViews() throws Exception {
-        //Step 1: initialize beans
-        
-        List<String> viewPaths = new ArrayList<String>();
-        
-        Set<String> paths = externalContext.getResourcePaths("/");
-        
-        for (String path : paths)
-        {
-            // Those places are used to hold templates and composite components,
-            // ignore them.
-            if (path.startsWith("/META-INF") ||
-                path.startsWith("/WEB-INF") ||
-                path.startsWith("/resources"))
-            {
-                continue;
-            }
-            else if (path.endsWith(".xhtml")) 
-            {
-                viewPaths.add(path);
-            }
-            else if (path.endsWith("/"))
-            {
-                addViewFacelets(viewPaths, path);
-            }
-        }
-        
-        //Step 2: build view
-        for (String viewPath : viewPaths)
-        {
-            UIViewRoot root = application.getViewHandler().createView(facesContext, viewPath);
-            facesContext.setViewRoot(root);
-            vdl.buildView(facesContext, root, viewPath);
-        }
-    }
-    
-    private void addViewFacelets(List<String> viewPaths, String pathBase)
-    {
-        Set<String> paths = externalContext.getResourcePaths(pathBase);
-        for (String path : paths)
-        {
-            if (path.endsWith(".xhtml"))
-            {
-                viewPaths.add(path);
-            }
-            else if (path.endsWith("/"))
-            {
-                addViewFacelets(viewPaths, path);
-            }
-        }
-    }
-
-    
-    @Override
-    protected String getDirectory()
-    {
-        return "webapp";
-    }
-
-}
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/test/resources/webapp/README.txt b/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/test/resources/webapp/README.txt
deleted file mode 100644
index 13e8319..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/main/resources/archetype-resources/src/test/resources/webapp/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-This folder is just a hard copy of the files on src/main/webapp, to make them available on testing time using junit. Please do not edit anything here or you will lose the changes.
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/site/apt/index.apt b/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/site/apt/index.apt
deleted file mode 100644
index 667d89b..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-debug/src/site/apt/index.apt
+++ /dev/null
@@ -1,19 +0,0 @@
- ------
- Myfaces HelloWorld 2.0 Debug Archetype
- ------
-
-Overview
-
-  This project defines a Maven archetype. Running the archetype plugin with this archetype will
-  create a directory tree containing the files needed to quickly get started on a new JSF 2.0
-  project. This archetype has some special profiles to debug issues quickly with different
-  configurations.
-
-Usage
-
-  Use the following maven command and then select myfaces-archetype-helloworld20-debug from the options.
-
-
-+------------------------------------------------------------------+
-mvn archetype:generate -DarchetypeCatalog=http://myfaces.apache.org
-+------------------------------------------------------------------+
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-owb/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld20-owb/pom.xml
deleted file mode 100644
index 5fb7518..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/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.4-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-helloworld20-owb</artifactId>
-    <packaging>jar</packaging>
-    <name>MyFaces 2.0 and OWB Basic Archetype</name>
-    <description>Archetype to create a new webapp based on MyFaces 2.0 with OpenWebBeans</description>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/LICENSE.txt b/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
... 136324 lines suppressed ...

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