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

[myfaces-build-tools] tag myfaces-builder-annotations-1.0.6 created (now 5a535e7)

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

deki pushed a change to tag myfaces-builder-annotations-1.0.6
in repository https://gitbox.apache.org/repos/asf/myfaces-build-tools.git.


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

     new 5a535e7  [maven-release-plugin]  copy for tag myfaces-builder-annotations-1.0.6

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 myfaces-builder-annotations-1.0.6

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

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

commit 5a535e78b1f63b4de1331fc99ba3d40a668ef38f
Author: Leonardo Uribe <lu...@apache.org>
AuthorDate: Tue Aug 31 23:16:51 2010 +0000

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

diff --git a/other/checkstyle-rules/LICENSE.txt b/LICENSE.txt
similarity index 100%
rename from other/checkstyle-rules/LICENSE.txt
rename to LICENSE.txt
diff --git a/maven2-plugins/myfaces-xrts-plugin/NOTICE.txt b/NOTICE.txt
similarity index 100%
rename from maven2-plugins/myfaces-xrts-plugin/NOTICE.txt
rename to NOTICE.txt
diff --git a/maven2-archetypes/LICENSE.txt b/maven2-archetypes/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/maven2-archetypes/NOTICE.txt b/maven2-archetypes/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces Maven Plugins     ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/LICENSE.txt b/maven2-archetypes/myfaces-archetype-helloworld-facelets/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/pom.xml
deleted file mode 100644
index c4ca157..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-	   
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <parent>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-parent</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.myfaces.buildtools</groupId>
-  <artifactId>myfaces-archetype-helloworld-facelets</artifactId>
-  <packaging>maven-plugin</packaging>
-  <name>MyFaces Facelets Archetype</name>
-  <description>Archetype to create a new webapp based on MyFaces and Facelets</description>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/maven/archetype.xml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index efa5501..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<archetype>
-  <id>maven-archetype-myfaces-facelets</id>
-  <sources>
-    <source>src/main/java/HelloWorldBacking.java</source>
-  </sources>
-  <testSources>
-  <!-- 
-    <source>src/test/java/AppTest.java</source>
-     -->
-  </testSources>
-  <resources>
-    <resource>src/main/log4j/log4j.properties</resource>
-  	<resource>src/main/webapp/WEB-INF/examples-config.xml</resource>
-  	<resource>src/main/webapp/WEB-INF/web.xml</resource>
-  	<resource>src/main/webapp/helloWorld.xhtml</resource>
-  	<resource>src/main/webapp/index.jsp</resource>
-  	<resource>src/main/webapp/page2.xhtml</resource>
-  	<resource>src/main/webapp/template.xhtml</resource>
-  </resources>
-</archetype>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 92beff1..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <packaging>war</packaging>
-    <version>${version}</version>
-    <name>A custom project using myfaces</name>
-    <url>http://www.myorganization.org</url>
-
-    <properties>
-        <jsf-myfaces.version>1.2.7</jsf-myfaces.version>
-        <jsf-ri.version>1.2_13</jsf-ri.version>        
-        <maven.jetty.plugin.version>6.1.16</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>${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>${jsf-myfaces.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-impl</artifactId>
-                    <version>${jsf-myfaces.version}</version>
-                    <scope>compile</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>${jsf-ri.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>javax.faces</groupId>
-                    <artifactId>jsf-impl</artifactId>
-                    <version>${jsf-ri.version}</version>
-                </dependency>
-            </dependencies>
-        </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>${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>${log4j.version}</version>
-                    <type>jar</type>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-    <repositories>
-        <repository>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>apache-maven-snapshots</id>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-        </repository>
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-
-    <!-- Project dependencies -->
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.myfaces.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 c79989a..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/java/HelloWorldBacking.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package $package;
-
-/**
- * A typical simple backing bean, that is backed to <code>helloworld.jsp</code>
- * 
- * @author <a href="mailto:matzew@apache.org">Matthias We�endorf</a> 
- */
-public class HelloWorldBacking
-{
-
-    //properties
-    private String name;
-
-    /**
-     * default empty constructor
-     */
-    public HelloWorldBacking()
-    {
-    }
-
-    //-------------------getter & setter
-    public String getName()
-    {
-        return name;
-    }
-
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-    /**
-     * Method that is backed to a submit button of a form.
-     */
-    public String send()
-    {
-        //do real logic
-        return ("success");
-    }
-}
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/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 4dfab50..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/examples-config.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE faces-config PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
-  "http://java.sun.com/dtd/web-facesconfig_1_1.dtd" >
-
-<faces-config>
-
-	<application>
-		<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
-	</application>
-
-	<!-- managed beans of the simple hello world app -->
-	<managed-bean>
-		<managed-bean-name>helloWorldBacking</managed-bean-name>
-		<managed-bean-class>
-			${package}.HelloWorldBacking
-		</managed-bean-class>
-		<managed-bean-scope>request</managed-bean-scope>
-	</managed-bean>
-
-	<!-- navigation rules for helloWorld.jsp -->
-	<navigation-rule>
-		<from-view-id>/helloWorld.xhtml</from-view-id>
-		<navigation-case>
-			<from-outcome>success</from-outcome>
-			<to-view-id>/page2.xhtml</to-view-id>
-		</navigation-case>
-	</navigation-rule>
-
-	<!-- navigation rules for page2.jsp -->
-	<navigation-rule>
-		<from-view-id>/page2.xhtml</from-view-id>
-		<navigation-case>
-			<from-outcome>back</from-outcome>
-			<to-view-id>/helloWorld.xhtml</to-view-id>
-		</navigation-case>
-	</navigation-rule>
-</faces-config>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/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 47c8220..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,271 +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 51fd399..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html">
-<head>
-<title>Hello World</title>
-</head>
-<body>
-<ui:composition template="/template.xhtml">
-
-	<ui:define name="body">
-		<h:form id="form">
-			<h:panelGrid id="grid" columns="2">
-				<h:outputText id="output1" value="Please enter your name" />
-				<h:inputText id="input1" value="#{helloWorldBacking.name}"
-					required="true" />
-				<h:commandButton id="button1" value="press me"
-					action="#{helloWorldBacking.send}" />
-				<h:message id="message1" for="input1" />
-			</h:panelGrid>
-		</h:form>
-	</ui:define>
-</ui:composition>
-</body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/index.jsp
deleted file mode 100644
index a29c228..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page session="false"%>
-<%
-response.sendRedirect("helloWorld.jsf");
-%>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
deleted file mode 100644
index d5713c6..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html">
-<head>
-<title>Hello World</title>
-</head>
-<body>
-
-<f:view>
-	<h:outputText
-		value="Hello #{helloWorldBacking.name}. We hope you enjoy Apache MyFaces" />
-	<h:form id="form2">
-		<h:commandLink id="link1" action="back">
-			<h:outputText id="linkText" value="GO HOME" />
-		</h:commandLink>
-	</h:form>
-</f:view>
-</body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/template.xhtml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/template.xhtml
deleted file mode 100644
index 7cf88b1..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/template.xhtml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<title>Myfaces Example Facelets</title>
-</head>
-
-<body>
-<h1><ui:insert name="title">Myfaces Example Facelets</ui:insert></h1>
-<p><ui:insert name="body">Hello World Example!</ui:insert></p>
-</body>
-
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/pom.xml
deleted file mode 100644
index 5ab93e1..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.apache.myfaces.buildtools</groupId>
-        <artifactId>myfaces-archetype-parent</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-helloworld-portlets</artifactId>
-    <packaging>maven-plugin</packaging>
-    <name>MyFaces Portlet Archetype</name>
-    <description>Archetype to create a new portlet webapp based on myfaces</description>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/archetype.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index 87375f6..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- 
- @author Leonardo Uribe (latest modification by $Author$)
- @version $Revision$ $Date$
- 
--->
-
-<archetype>
-  <id>myfaces-archetype-helloworld-portlets</id>
-  <sources>
-    <source>src/main/java/NameBean.java</source>
-  </sources>
-  <resources>
-    <resource>src/main/log4j/log4j.properties</resource>
-    <resource>src/main/webapp/index.jsp</resource>
-    <resource>src/main/webapp/edit.jsp</resource>
-    <resource>src/main/webapp/help.jsp</resource>
-    <resource>src/main/webapp/helloworld/hello.jsp</resource>
-    <resource>src/main/webapp/helloworld/index.jsp</resource>
-    <resource>src/main/webapp/WEB-INF/web.xml</resource>
-    <resource>src/main/webapp/WEB-INF/portlet.xml</resource>
-    <resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
-    <resource>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</resource>
-  </resources>
-</archetype>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index ba97251..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <packaging>war</packaging>
-    <version>${version}</version>
-    <name>A custom project using myfaces</name>
-    <url>http://www.myorganization.org</url>
-
-    <properties>
-        <jsf-myfaces.version>1.2.7</jsf-myfaces.version>
-        <jsf-ri.version>1.2_13</jsf-ri.version>
-        <maven.jetty.plugin.version>6.1.16</maven.jetty.plugin.version>
-        <log4j.version>1.2.13</log4j.version>
-        <portlet-bridge.version>1.0.0-beta</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>${portlet-bridge.version}</version>
-        </dependency>
-        
-        <dependency>
-          <groupId>org.apache.myfaces.portlet-bridge</groupId>
-          <artifactId>portlet-bridge-impl</artifactId>
-          <version>${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>
-                            ${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>${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>${maven.jetty.plugin.version}</version>
-                      <configuration>
-                        <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
-                        <webDefaultXml>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
-                        <systemProperties>
-                            <systemProperty>
-                                <name>org.apache.pluto.embedded.portletId</name>
-                                <value>${artifactId}</value>
-                            </systemProperty>
-                            <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>${jsf-myfaces.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-impl</artifactId>
-                    <version>${jsf-myfaces.version}</version>
-                    <scope>compile</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>${jsf-ri.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>javax.faces</groupId>
-                    <artifactId>jsf-impl</artifactId>
-                    <version>${jsf-ri.version}</version>
-                </dependency>
-            </dependencies>
-        </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 1427e77..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/java/NameBean.java
+++ /dev/null
@@ -1,20 +0,0 @@
-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 fd78756..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE faces-config PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
-  "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-<faces-config xmlns="http://java.sun.com/JSF/Configuration">
-  <navigation-rule>
-    <from-view-id>*</from-view-id>
-    <navigation-case>
-      <from-outcome>helloWorld</from-outcome>
-      <to-view-id>/helloworld/index.jsp</to-view-id>
-    </navigation-case>
-  </navigation-rule>
-  <navigation-rule>
-    <from-view-id>/helloworld/index.jsp</from-view-id>
-    <navigation-case>
-      <from-outcome>sayhello</from-outcome>
-      <to-view-id>/helloworld/hello.jsp</to-view-id>
-    </navigation-case>
-  </navigation-rule>
-  <managed-bean>
-    <managed-bean-name>namebean</managed-bean-name>
-    <managed-bean-class>${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 4a409e4..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version = '1.0' encoding = 'ISO-8859-1'?>
-<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN' 'http://java.sun.com/dtd/web-app_2_3.dtd'>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-	   
--->
-<!-- The Jetty Pluto Plugin needs to have a Webapp 2.3 web-xml.  Don't know why. -->
-<web-app>
- 
-  <context-param>
-    <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
-    <param-value>.jsp</param-value>
-  </context-param>
-  
-  <!-- Listener, to allow Jetty serving MyFaces apps -->
-  <!-- TODO: is this needed anymore for jetty?  I don't think so.. -->
-  <!-- listener>
-    <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
-  </listener -->
-
-  <!-- Faces Servlet -->
-  <servlet>
-    <servlet-name>faces</servlet-name>
-    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <!-- Faces Servlet Mappings -->
-  <!-- 
-    In this demo application, I chose to use suffix mapping.  I did this because it makes urls
-    in the portlet world look nicer in the source.  The portlet url should be the same 
-    reguardless.
-  -->
-  <servlet-mapping>
-    <servlet-name>faces</servlet-name>
-    <url-pattern>*.jsf</url-pattern>
-  </servlet-mapping>
-  
-</web-app>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/edit.jsp b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/edit.jsp
deleted file mode 100644
index f7b780d..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/edit.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<f:view>
-  <html>
-    <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>index</title>
-    </head>
-    <body>
-      <h:form>
-        <h:panelGrid columns="1">
-          <h:outputText value="This is the portlet edit screen."/>
-        </h:panelGrid>
-      </h:form>
-    </body>
-  </html>
-</f:view>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/hello.jsp b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/hello.jsp
deleted file mode 100644
index 750b2fa..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/hello.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<f:view>
-  <html>
-    <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>hello</title>
-    </head>
-    <body>
-      <h:form>
-        <h:panelGrid columns="1">
-          <h:outputText value="Hello #{namebean.name}"/>
-          <h:commandButton value="return" action="helloWorld"/>
-        </h:panelGrid>
-      </h:form>
-    </body>
-  </html>
-</f:view>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/index.jsp b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/index.jsp
deleted file mode 100644
index 2b5743a..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/index.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<f:view>
-  <html>
-    <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>index</title>
-    </head>
-    <body>
-      <h:form>
-        <h:panelGrid columns="1">
-          <h:panelGrid columns="2">
-            <h:outputText value="Please enter your name: "/>
-            <h:inputText value="#{namebean.name}"/>
-          </h:panelGrid>
-          <h:commandButton value="Click Here" action="sayhello"/>
-        </h:panelGrid>
-      </h:form>
-    </body>
-  </html>
-</f:view>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/help.jsp b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/help.jsp
deleted file mode 100644
index e387c18..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/help.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<f:view>
-  <html>
-    <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>index</title>
-    </head>
-    <body>
-      <h:form>
-        <h:panelGrid columns="1">
-          <h:outputText value="This is the portlet help screen."/>
-        </h:panelGrid>
-      </h:form>
-    </body>
-  </html>
-</f:view>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/index.jsp
deleted file mode 100644
index 33e20e9..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<f:view>
-  <html>
-    <head>
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-      <title>index</title>
-    </head>
-    <body>
-      <h:form>
-        <h:panelGrid columns="1">
-          <h:outputText value="Please select:"/>
-          <h:panelGroup>
-            <ul>
-              <li>
-                <h:commandLink value="HelloWorld example" action="helloWorld"/>
-              </li>
-            </ul>
-          </h:panelGroup>
-        </h:panelGrid>
-      </h:form>
-    </body>
-  </html>
-</f:view>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/LICENSE.txt b/maven2-archetypes/myfaces-archetype-helloworld/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld/pom.xml
deleted file mode 100644
index 27ed766..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.apache.myfaces.buildtools</groupId>
-        <artifactId>myfaces-archetype-parent</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-helloworld</artifactId>
-    <packaging>maven-plugin</packaging>
-    <name>MyFaces Basic Archetype</name>
-    <description>Archetype to create a new webapp based on myfaces</description>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/archetype.xml b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index 4a71536..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/archetype.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.
- 
- @author Bruno Aranda (latest modification by $Author: grantsmith $)
- @version $Revision: 472560 $ $Date: 2006-11-08 18:45:25 +0100 (Mi, 08 Nov 2006) $
- 
--->
-
-<archetype>
-  <id>myfaces-archetype-helloworld</id>
-  <sources>
-    <source>src/main/java/HelloWorldController.java</source>
-  </sources>
-  <resources>
-    <resource>src/main/log4j/log4j.properties</resource>
-    <resource>src/main/webapp/index.jsp</resource>
-    <resource>src/main/webapp/helloWorld.jsp</resource>
-    <resource>src/main/webapp/page2.jsp</resource>
-    <resource>src/main/webapp/WEB-INF/web.xml</resource>
-    <resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
-  </resources>
-</archetype>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index cd6d447..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <packaging>war</packaging>
-    <version>${version}</version>
-    <name>A custom project using myfaces</name>
-    <url>http://www.myorganization.org</url>
-
-    <properties>
-        <jsf-myfaces.version>1.2.7</jsf-myfaces.version>
-        <jsf-ri.version>1.2_13</jsf-ri.version>        
-        <maven.jetty.plugin.version>6.1.16</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>${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>${jsf-myfaces.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-impl</artifactId>
-                    <version>${jsf-myfaces.version}</version>
-                    <scope>compile</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>${jsf-ri.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>javax.faces</groupId>
-                    <artifactId>jsf-impl</artifactId>
-                    <version>${jsf-ri.version}</version>
-                </dependency>
-            </dependencies>
-        </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>${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>${log4j.version}</version>
-                    <type>jar</type>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-    <repositories>
-        <repository>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>apache-maven-snapshots</id>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-        </repository>
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-
-    <!-- Project dependencies -->
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.myfaces.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 f1c8db4..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";
-    }
-}
\ No newline at end of file
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 4e35605..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-
-<faces-config version="1.2" 
-    xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
-	
-	<!-- managed beans of the simple hello world app -->
-	<managed-bean>
-		<managed-bean-name>helloWorld</managed-bean-name>
-		<managed-bean-class>${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 193c098..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,213 +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 1334d73..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<html>
-    <head>
-        <title>Hello World</title>
-    </head>
-    <body>
-        <f:view>
-            <h:form id="mainForm">
-              <h:panelGrid columns="2">
-                <h:outputLabel for="name" value="Please enter your name" />
-                <h:inputText id="name" value="#{helloWorld.name}" required="true"/>
-                <h:commandButton value="Press me" action="#{helloWorld.send}"/>
-                <h:messages showDetail="true" showSummary="false"/>
-              </h:panelGrid>
-            </h:form>
-        </f:view>
-    </body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/index.jsp
deleted file mode 100644
index a29c228..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page session="false"%>
-<%
-response.sendRedirect("helloWorld.jsf");
-%>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/page2.jsp b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
deleted file mode 100644
index 6d12c41..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<html>
-    <head>
-        <title>Hello World</title>
-    </head>
-    <body>
-        <f:view>
-            <h:form id="mainForm">
-                <h2><h:outputText value="Hello #{helloWorld.name}. We hope you enjoy Apache MyFaces"/></h2>
-                <h:commandLink action="back">
-                    <h:outputText value="Home"/>
-                </h:commandLink>
-            </h:form>
-        </f:view>
-    </body>
-</html>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/site/apt/index.apt b/maven2-archetypes/myfaces-archetype-helloworld/src/site/apt/index.apt
deleted file mode 100644
index cdb1b21..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/site/apt/index.apt
+++ /dev/null
@@ -1,13 +0,0 @@
- ------
- Myfaces HelloWorld Archetype
- ------
-
-Overview
-
-  This project defines a Maven archetype plugin. Running the plugin will create a directory tree
-  containing the files needed to quickly get started on a new JSF project which uses JSP as the
-  templating language.
-
-Usage
-
-  TODO: writeme
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-owb/LICENSE.txt b/maven2-archetypes/myfaces-archetype-helloworld20-owb/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-owb/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld20-owb/pom.xml
deleted file mode 100644
index a011c4d..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.apache.myfaces.buildtools</groupId>
-        <artifactId>myfaces-archetype-parent</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-helloworld20-owb</artifactId>
-    <packaging>maven-plugin</packaging>
-    <name>MyFaces 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/archetype.xml b/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index faf9fc8..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<archetype>
-    <id>myfaces-archetype-helloworld20-owb</id>
-    <sources>
-        <source>src/main/java/HelloWorldController.java</source>
-        <source>src/main/java/GreetingService.java</source>
-    </sources>
-    <resources>
-        <resource>src/main/log4j/log4j.properties</resource>
-        <resource>src/main/webapp/index.html</resource>
-        <resource>src/main/webapp/helloWorld.xhtml</resource>
-        <resource>src/main/webapp/page2.xhtml</resource>
-        <resource>src/main/webapp/WEB-INF/web.xml</resource>
-        <resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
-        <resource>src/main/webapp/resources/css/style.css</resource>
-        <resource>src/main/resources/META-INF/beans.xml</resource>
-    </resources>
-</archetype>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index a031b51..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <packaging>war</packaging>
-    <version>${version}</version>
-    <name>A custom project using MyFaces 2.0</name>
-    <url>http://www.myorganization.org</url>
-
-    <properties>
-        <jsf-myfaces.version>2.0.0-SNAPSHOT</jsf-myfaces.version>
-        <jsf-mojarra.version>2.0.1</jsf-mojarra.version>
-	<openwebbeans.version>1.0.0-M4</openwebbeans.version>
-        <maven.jetty.plugin.version>6.1.16</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-exploded -->
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>${maven.jetty.plugin.version}</version>
-                <configuration>
-                    <scanIntervalSeconds>10</scanIntervalSeconds>
-                </configuration>
-            </plugin>
-		</plugins>
-        <pluginManagement>
-            <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>
-        </pluginManagement>
-    </build>
-    
-    <profiles>
-        <profile>
-            <id>myfaces</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-api</artifactId>
-                    <version>${jsf-myfaces.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-impl</artifactId>
-                    <version>${jsf-myfaces.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <!-- Activate by adding -P mojarra when execute maven goals. -->
-            <id>mojarra</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>com.sun.faces</groupId>
-                    <artifactId>jsf-api</artifactId>
-                    <version>${jsf-mojarra.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.faces</groupId>
-                    <artifactId>jsf-impl</artifactId>
-                    <version>${jsf-mojarra.version}</version>
-                </dependency>
-            </dependencies>
-        </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>${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>${log4j.version}</version>
-                    <type>jar</type>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-    <repositories>
-        <repository>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>apache-maven-snapshots</id>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-        </repository>
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-
-    <!-- Project dependencies -->
-    <dependencies>
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-impl</artifactId>
-			<version>${openwebbeans.version}</version>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-jsf</artifactId>
-			<version>${openwebbeans.version}</version>
-			<scope>runtime</scope>
-		</dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-            <version>1.0.0-EA1-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>jsr250-api</artifactId>
-            <version>1.0</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-helloworld20-owb/src/main/resources/archetype-resources/src/main/java/GreetingService.java b/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/java/GreetingService.java
deleted file mode 100644
index 04be8c9..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/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!";
-    }
-
-}
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java b/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java
deleted file mode 100644
index cd08207..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java
+++ /dev/null
@@ -1,73 +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.inject.Inject;
-import javax.enterprise.context.RequestScoped;
-
-/**
- * A typical simple backing bean, that is backed to <code>${artifactId}.xhtml</code>
- */
-@Named("helloWorld")
-@RequestScoped
-public class HelloWorldController
-{
-
-    //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;
-    }
-
-}
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/log4j/log4j.properties b/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/log4j/log4j.properties
deleted file mode 100644
index 13c6a84..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/log4j/log4j.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one or more
-${symbol_pound} contributor license agreements.  See the NOTICE file distributed with
-${symbol_pound} this work for additional information regarding copyright ownership.
-${symbol_pound} The ASF licenses this file to You under the Apache License, Version 2.0
-${symbol_pound} (the "License"); you may not use this file except in compliance with
-${symbol_pound} the License.  You may obtain a copy of the License at
-${symbol_pound}
-${symbol_pound}      http://www.apache.org/licenses/LICENSE-2.0
-${symbol_pound}
-${symbol_pound} Unless required by applicable law or agreed to in writing, software
-${symbol_pound} distributed under the License is distributed on an "AS IS" BASIS,
-${symbol_pound} WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-${symbol_pound} See the License for the specific language governing permissions and
-${symbol_pound} limitations under the License.
-
-log4j.rootLogger=INFO, A1, A2
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-
-${symbol_pound}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
-${symbol_pound} 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
-
-${symbol_pound} Log level for myfaces libraries
-log4j.logger.org.apache.commons=INFO
-log4j.logger.org.apache.myfaces=TRACE
-log4j.logger.javax.faces=TRACE
-
-${symbol_pound} Print the date in ISO 8601 format
-log4j.appender.A1.layout.ConversionPattern=%5p [%t] (%F${symbol_escape}:%L) - %m%n
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml b/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/resources/META-INF/beans.xml
deleted file mode 100644
index f1ee02a..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/resources/META-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-helloworld20-owb/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml b/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
deleted file mode 100644
index 2f5cd79..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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-owb/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 9056292..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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>
-
-	<!-- Listener for OpenWebBeans configuration -->
-    <listener>
-        <listener-class>
-            org.apache.webbeans.servlet.WebBeansConfigurationListener
-        </listener-class>
-    </listener>
-
-    <!-- Faces Servlet -->
-    <servlet>
-        <servlet-name>Faces Servlet</servlet-name>
-        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <!-- Faces Servlet Mapping -->
-    <servlet-mapping>
-        <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>*.jsf</url-pattern>
-    </servlet-mapping>
-
-    <!-- Welcome files -->
-    <welcome-file-list>
-        <welcome-file>index.html</welcome-file>
-    </welcome-file-list>
-
-</web-app>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml b/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml
deleted file mode 100644
index a3b88d9..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml
+++ /dev/null
@@ -1,27 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="${symbol_pound}{helloWorld.name}" required="true"/>
-                <h:commandButton value="Press me" action="${symbol_pound}{helloWorld.send}"/>
-                <h:messages showDetail="true" showSummary="false"/>
-            </h:panelGrid>
-        </h:form>
-    </div>
-</h:body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/webapp/index.html b/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/webapp/index.html
deleted file mode 100644
index 12af943..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/webapp/index.html
+++ /dev/null
@@ -1,8 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<html>
-<head>
-    <meta http-equiv="refresh" content="0; URL=helloWorld.jsf">
-</head>
-</html>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml b/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
deleted file mode 100644
index cfc2cba..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
+++ /dev/null
@@ -1,22 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="${symbol_pound}{helloWorld.greeting}"/>
-        <br/>
-        <h:link value="Home" outcome="helloWorld"/>
-    </div>
-</h:body>
-</html>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css b/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css
deleted file mode 100644
index c6130a9..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css
+++ /dev/null
@@ -1,16 +0,0 @@
-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;
-}
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/site/apt/index.apt b/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/site/apt/index.apt
deleted file mode 100644
index 53679d9..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/site/apt/index.apt
+++ /dev/null
@@ -1,14 +0,0 @@
- ------
- Myfaces HelloWorld 2.0 OpenWebBeans Archetype
- ------
-
-Overview
-
-  This project defines a Maven archetype plugin. Running the plugin will create a directory tree
-  containing the files needed to quickly get started on a new MyFaces 2.0 project which uses
-  Facelets as the templating language. Managed beans are defined with JSR-299/JSR-330 annotations
-  with Apache OpenWebBeans as the CDI implementation.
-
-Usage
-
-  TODO: writeme
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20/LICENSE.txt b/maven2-archetypes/myfaces-archetype-helloworld20/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20/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/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld20/pom.xml
deleted file mode 100644
index 2bed0fb..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.apache.myfaces.buildtools</groupId>
-        <artifactId>myfaces-archetype-parent</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-helloworld20</artifactId>
-    <packaging>maven-plugin</packaging>
-    <name>MyFaces 2.0 Basic Archetype</name>
-    <description>Archetype to create a new webapp based on MyFaces 2.0</description>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/archetype.xml b/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index dc0ec5e..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<archetype>
-    <id>myfaces-archetype-helloworld20</id>
-    <sources>
-        <source>src/main/java/HelloWorldController.java</source>
-    </sources>
-    <resources>
-        <resource>src/main/log4j/log4j.properties</resource>
-        <resource>src/main/webapp/index.html</resource>
-        <resource>src/main/webapp/helloWorld.xhtml</resource>
-        <resource>src/main/webapp/page2.xhtml</resource>
-        <resource>src/main/webapp/WEB-INF/web.xml</resource>
-        <resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
-        <resource>src/main/webapp/resources/css/style.css</resource>
-    </resources>
-</archetype>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 4cf3a71..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <packaging>war</packaging>
-    <version>${version}</version>
-    <name>A custom project using MyFaces 2.0</name>
-    <url>http://www.myorganization.org</url>
-
-    <properties>
-        <jsf-myfaces.version>2.0.0-SNAPSHOT</jsf-myfaces.version>
-        <jsf-mojarra.version>2.0.1</jsf-mojarra.version>        
-        <maven.jetty.plugin.version>6.1.16</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-exploded -->
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>${maven.jetty.plugin.version}</version>
-                <configuration>
-                    <scanIntervalSeconds>10</scanIntervalSeconds>
-                </configuration>
-            </plugin>
-		</plugins>
-        <pluginManagement>
-            <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>
-        </pluginManagement>
-    </build>
-    
-    <profiles>
-        <profile>
-            <id>myfaces</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-api</artifactId>
-                    <version>${jsf-myfaces.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-impl</artifactId>
-                    <version>${jsf-myfaces.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <!-- Activate by adding -P mojarra when execute maven goals. -->
-            <id>mojarra</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>com.sun.faces</groupId>
-                    <artifactId>jsf-api</artifactId>
-                    <version>${jsf-mojarra.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>com.sun.faces</groupId>
-                    <artifactId>jsf-impl</artifactId>
-                    <version>${jsf-mojarra.version}</version>
-                </dependency>
-            </dependencies>
-        </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>${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>${log4j.version}</version>
-                    <type>jar</type>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-    <repositories>
-        <repository>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>apache-maven-snapshots</id>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-        </repository>
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-
-    <!-- Project dependencies -->
-    <dependencies>
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.0</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java b/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java
deleted file mode 100644
index 1d20744..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/java/HelloWorldController.java
+++ /dev/null
@@ -1,66 +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;
-
-/**
- * A typical simple backing bean, that is backed to <code>${artifactId}.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;
-    }
-
-}
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/log4j/log4j.properties b/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/log4j/log4j.properties
deleted file mode 100644
index 13c6a84..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/log4j/log4j.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-${symbol_pound} Licensed to the Apache Software Foundation (ASF) under one or more
-${symbol_pound} contributor license agreements.  See the NOTICE file distributed with
-${symbol_pound} this work for additional information regarding copyright ownership.
-${symbol_pound} The ASF licenses this file to You under the Apache License, Version 2.0
-${symbol_pound} (the "License"); you may not use this file except in compliance with
-${symbol_pound} the License.  You may obtain a copy of the License at
-${symbol_pound}
-${symbol_pound}      http://www.apache.org/licenses/LICENSE-2.0
-${symbol_pound}
-${symbol_pound} Unless required by applicable law or agreed to in writing, software
-${symbol_pound} distributed under the License is distributed on an "AS IS" BASIS,
-${symbol_pound} WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-${symbol_pound} See the License for the specific language governing permissions and
-${symbol_pound} limitations under the License.
-
-log4j.rootLogger=INFO, A1, A2
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-
-${symbol_pound}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
-${symbol_pound} 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
-
-${symbol_pound} Log level for myfaces libraries
-log4j.logger.org.apache.commons=INFO
-log4j.logger.org.apache.myfaces=TRACE
-log4j.logger.javax.faces=TRACE
-
-${symbol_pound} Print the date in ISO 8601 format
-log4j.appender.A1.layout.ConversionPattern=%5p [%t] (%F${symbol_escape}:%L) - %m%n
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml b/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
deleted file mode 100644
index 53c463f..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 6bec9cb..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?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>*.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/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml b/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml
deleted file mode 100644
index a3b88d9..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml
+++ /dev/null
@@ -1,27 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version="1.0" encoding="UTF-8"?>
-<!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="${symbol_pound}{helloWorld.name}" required="true"/>
-                <h:commandButton value="Press me" action="${symbol_pound}{helloWorld.send}"/>
-                <h:messages showDetail="true" showSummary="false"/>
-            </h:panelGrid>
-        </h:form>
-    </div>
-</h:body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/index.html b/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/index.html
deleted file mode 100644
index 12af943..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/index.html
+++ /dev/null
@@ -1,8 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<html>
-<head>
-    <meta http-equiv="refresh" content="0; URL=helloWorld.jsf">
-</head>
-</html>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml b/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
deleted file mode 100644
index 72bd786..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
+++ /dev/null
@@ -1,22 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 ${symbol_pound}{helloWorld.name}. We hope you enjoy Apache MyFaces!"/>
-        <br/>
-        <h:link value="Home" outcome="helloWorld"/>
-    </div>
-</h:body>
-</html>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css b/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css
deleted file mode 100644
index c6130a9..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20/src/main/resources/archetype-resources/src/main/webapp/resources/css/style.css
+++ /dev/null
@@ -1,16 +0,0 @@
-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;
-}
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld20/src/site/apt/index.apt b/maven2-archetypes/myfaces-archetype-helloworld20/src/site/apt/index.apt
deleted file mode 100644
index 792d965..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld20/src/site/apt/index.apt
+++ /dev/null
@@ -1,13 +0,0 @@
- ------
- Myfaces HelloWorld 2.0 Archetype
- ------
-
-Overview
-
-  This project defines a Maven archetype plugin. Running the plugin will create a directory tree
-  containing the files needed to quickly get started on a new MyFaces 2.0 project which uses
-  Facelets as the templating language.
-
-Usage
-
-  TODO: writeme
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/LICENSE.txt b/maven2-archetypes/myfaces-archetype-jsfcomponents/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/pom.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/pom.xml
deleted file mode 100644
index 46b5b88..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <parent>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-parent</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
-  </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-jsfcomponents</artifactId>
-    <packaging>maven-plugin</packaging>
-    <name>JSF Component Library Archetype</name>
-    <description>Archetype to create a libary project of JSF components</description>
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/archetype.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index 249620f..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- 
- @author Bruno Aranda (latest modification by $Author: grantsmith $)
- @version $Revision: 472560 $ $Date: 2006-11-08 18:45:25 +0100 (Mi, 08 Nov 2006) $
- 
--->
-
-<archetype>
-    <id>myfaces-archetype-jsfcomponents</id>
-    <resources>
-        <resource>examples/src/main/resources/org/myorganization/component/example/build.properties</resource>
-        <resource>examples/src/main/log4j/log4j.properties</resource>
-        <resource>examples/src/main/java/org/myorganization/component/example/SayHelloBean.java</resource>
-        <resource>examples/src/main/webapp/sayhello.jsp</resource>
-        <resource>examples/src/main/webapp/converterDemo.jsp</resource>
-        <resource>examples/src/main/webapp/converterDemoResult.jsp</resource>
-        <resource>examples/src/main/webapp/validatorDemo.jsp</resource>
-        <resource>examples/src/main/webapp/validatorDemoResult.jsp</resource>
-        <resource>examples/src/main/webapp/index.jsp</resource>
-        <resource>examples/src/main/webapp/WEB-INF/examples-config.xml</resource>
-        <resource>examples/src/main/webapp/WEB-INF/web.xml</resource>
-        <resource>examples/src/main/webapp/home.jsp</resource>
-        <resource>examples/pom.xml</resource>
-        <resource>core/src/main/resources/META-INF/componentClass12.vm</resource>
-        <resource>core/src/main/resources/META-INF/tagClass12.vm</resource>
-        <resource>core/src/main/resources/META-INF/tagValidatorClass12.vm</resource>
-        <resource>core/src/main/resources/META-INF/tagConverterClass12.vm</resource>
-        <resource>core/src/main/resources/META-INF/validatorClass12.vm</resource>
-        <resource>core/src/main/resources/META-INF/mycomponents.tld.vm</resource>
-        <resource>core/src/main/java/org/myorganization/component/sayhello/AbstractSayHello.java</resource>
-        <resource>core/src/main/java/org/myorganization/component/sayhello/SayHelloRenderer.java</resource>
-        <resource>core/src/main/java/org/myorganization/converter/PhoneNumber.java</resource>
-        <resource>core/src/main/java/org/myorganization/converter/PhoneNumberConverter.java</resource>
-        <resource>core/src/main/java/org/myorganization/validator/AbstractOddNumberValidator.java</resource>
-        <resource>core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java</resource>
-        <resource>core/src/test/java/org/myorganization/converter/PhoneNumberConverterTest.java</resource>
-        <resource>core/src/test/java/org/myorganization/validator/OddNumberValidatorTest.java</resource>
-        <resource>core/pom.xml</resource>
-    </resources>
-</archetype>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/pom.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/pom.xml
deleted file mode 100644
index 63bd056..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/pom.xml
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>${artifactId}-core</artifactId>
-    <packaging>jar</packaging>
-    <name>My JSF Components Library</name>
-
-    <description>
-        This is my super jsf components library.
-    </description>
-
-    <parent>
-        <groupId>${groupId}</groupId>
-        <artifactId>${artifactId}-project</artifactId>
-        <version>${version}</version>
-    </parent>
-
-    <properties>
-        <shortname>mycomponents</shortname>
-    </properties>
-
-    <dependencies>
-
-        <!-- compile -->
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.commons</groupId>
-            <artifactId>myfaces-validators12</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.myfaces.commons</groupId>
-            <artifactId>myfaces-converters12</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- provided dependencies -->
-
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <version>1.2.7</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>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>
-    
-        <!-- test dependencies -->
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.2</version>
-            <scope>test</scope>
-        </dependency>
-    
-        <dependency>
-            <groupId>org.apache.shale</groupId>
-            <artifactId>shale-test</artifactId>
-            <version>1.0.5</version>
-            <scope>test</scope>
-        </dependency>        
-
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <excludes>
-                       <exclude>**/*.vm</exclude>
-                </excludes>
-            </resource>    
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.myfaces.buildtools</groupId>
-                <artifactId>myfaces-builder-plugin</artifactId>
-                <version>1.0.3</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>build-metadata</goal>
-                            <goal>make-components</goal>
-                            <goal>make-tags</goal>
-                            <goal>make-validators</goal>
-                            <goal>make-converter-tags</goal>
-                            <goal>make-validator-tags</goal>
-                        </goals>
-                        <configuration>
-                            <jsfVersion>1.2</jsfVersion>
-                        </configuration>
-                    </execution>
-                    <execution>
-                      <id>makefacesconfig</id>
-                      <configuration>
-                          <xmlFile>META-INF/faces-config.xml</xmlFile>
-                      </configuration>
-                      <goals>
-                          <goal>make-config</goal>
-                      </goals>
-                    </execution>
-                    <execution>
-                        <id>maketld</id>
-                        <configuration>
-                            <xmlFile>META-INF/${shortname}.tld</xmlFile>
-                            <templateFile>mycomponents.tld.vm</templateFile>
-                            <params>
-                               <shortname>${shortname}</shortname>
-                               <uri>http://www.myorganitzation.org/${shortname}</uri>
-                               <displayname>Custom tag library.</displayname>
-                               <description>Enhanced standard JSP actions and custom MyFaces actions.</description>
-                            </params>
-                        </configuration>
-                        <goals>
-                            <goal>make-config</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.4</version>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.1</version>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.4.3</version>
-            </plugin>
-        </plugins>
-    </reporting>
-
-    <profiles>
-        <profile>
-            <id>generate-site</id>
-            <reporting>
-                <plugins>
-                    <plugin>
-                        <groupId>net.sourceforge.maven-taglib</groupId>
-                        <artifactId>maven-taglib-plugin</artifactId>
-                        <version>2.3.1</version>
-                        <configuration>
-                            <taglib.src.dir>\${basedir}/target/classes/META-INF</taglib.src.dir>
-                            <tldDocDir>\${basedir}/target/site/tlddoc</tldDocDir>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </reporting>
-        </profile>
-        <profile>
-            <id>generate-assembly</id>
-            <activation>
-              <property>
-                <name>performRelease</name>
-                <value>true</value>
-              </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.4</version>
-                        <executions>
-                            <execution>
-                                <id>attach-javadoc</id>
-                                <goals><goal>jar</goal></goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>net.sourceforge.maven-taglib</groupId>
-                        <artifactId>maven-taglib-plugin</artifactId>
-                        <version>2.3.1</version>
-                        <configuration>
-                            <taglib.src.dir>\${basedir}/target/classes/META-INF</taglib.src.dir>
-                            <tldDocDir>\${basedir}/target/site/tlddoc</tldDocDir>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>attach-javadoc</id>
-                                <goals><goal>taglibdocjar</goal></goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/AbstractSayHello.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/AbstractSayHello.java
deleted file mode 100644
index f84f814..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/AbstractSayHello.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.myorganization.component.sayhello;
-
-import javax.faces.component.UIOutput;
-
-/**
- * @JSFComponent
- *   name = "mycomponents:sayHello"
- *   class = "org.myorganization.component.sayhello.SayHello"
- *   tagClass = "org.myorganization.component.sayhello.SayHelloTag"
- */
-public abstract class AbstractSayHello extends UIOutput
-{
-    public static final String COMPONENT_TYPE = "org.myorganization.SayHello";
-    public static final String DEFAULT_RENDERER_TYPE = "org.myorganization.SayHelloRenderer";
-    public static final String COMPONENT_FAMILY = "javax.faces.Output";
-
-    /**
-     * User's first name.
-     * 
-     * @JSFProperty
-     */
-    public abstract String getFirstName();
-
-
-    /**
-     * User's last name.
-     * 
-     * @JSFProperty
-     */
-    public abstract String getLastName();
-    
-    /**
-     * Rendered property.
-     * 
-     * @JSFProperty
-     *     defaultValue="true"     
-     */
-     public abstract boolean isRendered();                   
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHelloRenderer.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHelloRenderer.java
deleted file mode 100644
index 8d4690c..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHelloRenderer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.myorganization.component.sayhello;
-
-import java.io.IOException;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.faces.render.Renderer;
-
-/**
- * @JSFRenderer
- *   renderKitId = "HTML_BASIC" 
- *   family = "javax.faces.Output"
- *   type = "org.myorganization.SayHelloRenderer"
- */
-public class SayHelloRenderer extends Renderer
-{
-
-    public void decode(FacesContext facesContext, UIComponent uiComponent)
-    {
-        super.decode(facesContext, uiComponent);
-        // nothing to decode
-    }
-
-    public void encodeBegin(FacesContext facesContext, UIComponent uiComponent) throws IOException
-    {
-        super.encodeBegin(facesContext, uiComponent);
-        // no need to use encodeBegin.
-    }
-
-    public void encodeChildren(FacesContext facesContext, UIComponent uiComponent) throws IOException
-    {
-        super.encodeChildren(facesContext, uiComponent);
-        // this component does not have children
-    }
-
-    public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException
-    {
-        super.encodeEnd(facesContext, uiComponent);
-
-        if (!uiComponent.isRendered())
-        {
-            return;
-        }
-
-        ResponseWriter writer = facesContext.getResponseWriter();
-
-        SayHello sayHello = (SayHello) uiComponent;
-
-        String firstName = sayHello.getFirstName();
-        String lastName = sayHello.getLastName();
-
-        writer.write("Hello ");
-
-        if (firstName != null)
-        {
-            writer.write(firstName);
-        }
-
-        if (lastName != null)
-        {
-            writer.write(" "+lastName);
-        }
-
-        writer.write("!");
-    }
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/converter/PhoneNumber.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/converter/PhoneNumber.java
deleted file mode 100644
index ec80368..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/converter/PhoneNumber.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.myorganization.converter;
-
-public class PhoneNumber
-{
-    private String areaCode;
-    private String number;
-    
-    public PhoneNumber(String number) 
-    {
-        this.number = number;
-    }
-    
-    public PhoneNumber(String areaCode, String number) 
-    {
-        this(number);
-        this.areaCode = areaCode;
-    }
-    
-    public String getAreaCode()
-    {
-        return areaCode;
-    }
-    public void setAreaCode(String areaCode)
-    {
-        this.areaCode = areaCode;
-    }
-    public String getNumber()
-    {
-        return number;
-    }
-    public void setNumber(String number)
-    {
-        this.number = number;
-    }
-    
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/converter/PhoneNumberConverter.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/converter/PhoneNumberConverter.java
deleted file mode 100644
index 3727ca2..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/converter/PhoneNumberConverter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.myorganization.converter;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.convert.ConverterException;
-
-/**
- * @JSFConverter
- *   name = "mycomponents:phoneNumberConverter"
- *   tagClass = "org.myorganization.converter.PhoneNumberConverterTag"
- */
-public class PhoneNumberConverter
-        implements Converter
-{
-    public static final String CONVERTER_ID = "javax.faces.PhoneNumber";
-    
-    public Object getAsObject(FacesContext context, UIComponent component, String value)
-            throws ConverterException
-    {
-        String [] strPhone = value.split("-");
-        PhoneNumber objPhone = null;
-        if(strPhone.length == 2) 
-        {
-            objPhone = new PhoneNumber(strPhone[0], strPhone[1]);
-        } 
-        else if(strPhone.length == 1)
-        {
-            objPhone = new PhoneNumber(strPhone[0]);
-        }
-        
-        return objPhone;
-    }
-
-    public String getAsString(FacesContext context, UIComponent component, Object value)
-            throws ConverterException
-    {
-        if(value != null)
-        {
-            PhoneNumber phone = (PhoneNumber)value;
-            return phone.getAreaCode() + "-" + phone.getNumber();
-        }
-        
-        return null;
-    }
-
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/validator/AbstractOddNumberValidator.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/validator/AbstractOddNumberValidator.java
deleted file mode 100644
index 40f9018..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/validator/AbstractOddNumberValidator.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.myorganization.validator;
-
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.validator.Validator;
-import javax.faces.validator.ValidatorException;
-
-import org.apache.myfaces.commons.validator.ValidatorBase;
-
-/**
- * @JSFValidator
- *   name = "mycomponents:validateOddNum"
- *   class = "org.myorganization.validator.OddNumberValidator"
- *   tagClass = "org.myorganization.validator.OddNumberValidatorTag"
- */
-public abstract class AbstractOddNumberValidator extends ValidatorBase
-{
-    public static final String VALIDATOR_ID = "org.myorganization.validator.OddNumberValidator";
-    
-    public void validate(FacesContext arg0, UIComponent component, Object value)
-            throws ValidatorException
-    {
-        if(!(value instanceof Integer)) {
-            throw new ValidatorException(new FacesMessage("Please enter an integer."));
-        }
-        
-        int intVal = ((Integer)value).intValue();
-        if(intVal % 2 == 0) {
-            throw new ValidatorException(new FacesMessage("Please enter an odd number."));
-        }
-    }    
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/componentClass12.vm b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/componentClass12.vm
deleted file mode 100644
index 8b120aa..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/componentClass12.vm
+++ /dev/null
@@ -1,253 +0,0 @@
-#literal()
-## Velocity template used to generate JSF1.2-compatible component classes
-## from component meta-data.
-##
-## Note that there are two types of component generation:
-##  * "subclass mode" (use annotated class as a parent class)
-##  * "template mode" (use annotated class as a template)
-## This template file is used for both.
-##
-## Variable $component refers to a ComponentMeta object to process
-## Variable $utils refers to an instance of MyfacesUtils.
-##
-## When "template mode" is being used then variable $innersource
-## holds a String containing all the non-abstract functions defined
-## in the annotated class.
-##
-## The java package of the generated class is always the same as
-## the package in which the annotated class exists.
-##
-/*
- *  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 ${component.packageName};
-
-import javax.el.ValueExpression;
-import javax.faces.context.FacesContext;
-$utils.importTagClasses($component)
-
-#if ($component.isTemplate())
-#set ($generatedClassParent = $component.sourceClassParentClassName)
-#else
-#set ($generatedClassParent = $component.sourceClassName)
-#end
-// Generated from class ${component.sourceClassName}.
-//
-// WARNING: This file was automatically generated. Do not edit it directly,
-//          or you will lose your changes.
-public class ${utils.getClassFromFullClass($component.className)} extends $generatedClassParent
-#if ($component.implements)
-    implements $component.implements
-#end
-{
-#if ($component.serialuid)
-    private static final long serialVersionUID = ${component.serialuid}; 
-#end  
-
-    static public final String COMPONENT_FAMILY =
-        "$component.family";
-    static public final String COMPONENT_TYPE =
-        "$component.type";
-#if ($component.rendererType)
-#if (!($component.rendererType == ""))
-    static public final String DEFAULT_RENDERER_TYPE = 
-        "$component.rendererType";
-#end
-#end
-
-#if ($innersource)
-    //BEGIN CODE COPIED FROM $component.sourceClassName 
-$innersource
-    //END CODE COPIED FROM $component.sourceClassName
-#end
-
-    public ${utils.getClassFromFullClass($component.className)}()
-    {
-#if ($component.rendererType)
-#if ($component.rendererType == "")
-        setRendererType(null);
-#else
-        setRendererType("$component.rendererType");
-#end
-#else
-        setRendererType(null);
-#end
-    }
-
-## On myfaces 1.1 the family is inherited, so this could be commented
-## On other this should not be commented    
-    public String getFamily()
-    {
-        return COMPONENT_FAMILY;
-    }
-    
-#set ($propertyList = ${component.propertyComponentList})
-
-#foreach( $property in $propertyList )
-#set ($field = $property.fieldName)
-#set ($type = $utils.getClassFromFullClass($property.className))
-#if($utils.getDefaultValueField($property)) 
-#set ($defaultValue = $utils.getDefaultValueField($property))
-#else
-#set ($defaultValue = false)
-#end
-    // Property: $property.name
-#if ($property.isLiteralOnly() || $property.isTagExcluded() )
-    private $type $field #if($defaultValue) = $defaultValue;#{else};#{end}
-
-     
-#else
-    private $type $field;
-    
-#end
-#if($utils.isPrimitiveClass($type) && !$property.isTagExcluded() )
-    private boolean ${field}Set;
-    
-#if ($property.isSetMethod())
-    $property.setMethodScope boolean $utils.getPrefixedPropertyName("isSet", $property.name)()
-    {
-        return ${field}Set;
-    }
-#end
-#end
-#if($property.isLocalMethod())
-#if("boolean" == $type)
-#set ($methodName = $utils.getPrefixedPropertyName("isLocal", $property.name))
-#else
-#set ($methodName = $utils.getPrefixedPropertyName("getLocal", $property.name))
-#end
-    final $property.localMethodScope $type ${methodName}()
-    {
-        return $field;
-    }
-     
-#end
-    public $type $utils.getMethodReaderFromProperty($property.name, $type)()
-    {
-#if ($property.isTagExcluded() || $property.isLiteralOnly())
-        return $field;
-#else
-#if ($utils.isPrimitiveClass($type))
-        if (${field}Set)
-#else
-        if ($field != null)
-#end
-        {
-            return $field;
-        }
-        ValueExpression vb = getValueExpression("$property.name");
-        if (vb != null)
-        {
-#if ($utils.isPrimitiveClass($type))
-            return ($utils.castIfNecessary($type) vb.getValue(getFacesContext().getELContext())).${type}Value();
-#else
-#set ($pritype = $utils.getPrimitiveType($property.className))
-#if ($utils.isPrimitiveClass($pritype))
-            Object value = vb == null ? null : vb.getValue(getFacesContext().getELContext());
-            if (!(value instanceof $type)){
-                value = ${type}.valueOf(value.toString());
-            }            
-            return $utils.castIfNecessary($type) value;
-#else
-            return $utils.castIfNecessary($type) vb.getValue(getFacesContext().getELContext());
-#end
-#end
-        }
-#if ($defaultValue)
-        return $defaultValue; 
-#elseif ($utils.isPrimitiveClass($type))
-        return $utils.primitiveDefaultValue($type);
-#else       
-        return null;
-#end
-#end
-    }
-
-    public void $utils.getPrefixedPropertyName("set", $property.name)($type $utils.getVariableFromName($property.name))
-    {
-        this.$field = $utils.getVariableFromName($property.name);
-#if ($utils.isPrimitiveClass($type) && !$property.isTagExcluded() )
-        this.${field}Set = true;        
-#end
-    }
-#end
-
-    public Object saveState(FacesContext facesContext)
-    {
-#set ($primitiveCount = $propertyList.size() + 1)
-#foreach( $property in $propertyList )
-#if($utils.isPrimitiveClass($property.className))
-#set ($primitiveCount = $primitiveCount + 1)
-#end
-#end
-        Object[] values = new Object[$primitiveCount];
-        values[0] = super.saveState(facesContext);
-#set ($arrayIndex = 0)
-#foreach( $property in $propertyList )
-#set ($field = $property.fieldName)
-#set ($type = $property.className)
-#set ($arrayIndex = $arrayIndex + 1)
-#if ($property.jspName == "validator" && $property.isMethodBinding() )
-        values[$arrayIndex] = saveAttachedState(facesContext,${field}List);
-#elseif ( $property.isStateHolder() )## || $utils.isConverter($type)
-        values[$arrayIndex] = saveAttachedState(facesContext,$field);
-#elseif($utils.isPrimitiveClass($type))
-        values[$arrayIndex] = ${utils.getBoxedClass($type)}.valueOf($field);
-#else
-        values[$arrayIndex] = $field;
-#end
-#if($utils.isPrimitiveClass($type) && !$property.isTagExcluded())
-#set ($arrayIndex = $arrayIndex + 1)
-        values[$arrayIndex] = Boolean.valueOf(${field}Set);
-#end
-#end
-        return values; 
-    }
-
-    public void restoreState(FacesContext facesContext, Object state)
-    {
-        Object[] values = (Object[])state;
-        super.restoreState(facesContext,values[0]);
-#set ($arrayIndex = 0)
-#foreach( $property in $propertyList )
-#set ($field = $property.fieldName)
-#set ($type = $property.className)
-#set ($arrayIndex = $arrayIndex + 1)
-#if ( $property.isStateHolder() )
-#if ($property.jspName == "validator" && $property.isMethodBinding() )
-        ${field}List = (List<Validator>) restoreAttachedState(facesContext,values[$arrayIndex]);
-#elseif ($utils.isList($type))
-        $field = (List) restoreAttachedState(facesContext,values[$arrayIndex]);
-#else
-        $field = $utils.castIfNecessary($type) restoreAttachedState(facesContext,values[$arrayIndex]); 
-#end
-#elseif ($utils.isConverter($type)) 
-        $field = (Converter) restoreAttachedState(facesContext,values[$arrayIndex]);
-#elseif ($utils.isPrimitiveClass($type))
-        $field = ($utils.castIfNecessary($type) values[$arrayIndex]).${type}Value();
-#else
-        $field = $utils.castIfNecessary($type) values[$arrayIndex];
-#end
-#if($utils.isPrimitiveClass($type) && !$property.isTagExcluded() )
-#set ($arrayIndex = $arrayIndex + 1)
-        ${field}Set = ((Boolean) values[$arrayIndex]).booleanValue();
-#end
-#end
-    }
-}
-#end
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/faces-config.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/faces-config.xml
deleted file mode 100644
index b1af4fc..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/faces-config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config xmlns="http://java.sun.com/JSF/Configuration">
-
-  <!-- components -->
-
-  <component>
-    <component-type>org.myorganization.SayHello</component-type>
-    <component-class>org.myorganization.component.sayhello.SayHello</component-class>
-  </component>
-
-
-  <!-- renderkit -->
-
-  <render-kit>
-
-    <renderer>
-      <component-family>javax.faces.Output</component-family>
-      <renderer-type>org.myorganization.SayHelloRenderer</renderer-type>
-      <renderer-class>org.myorganization.component.sayhello.SayHelloRenderer</renderer-class>
-    </renderer>
-
-  </render-kit>
-
-</faces-config>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/mycomponents.taglib.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/mycomponents.taglib.xml
deleted file mode 100644
index 847bd10..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/mycomponents.taglib.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE facelet-taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
-  "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
-<facelet-taglib>
-	<namespace>http://www.myorganitzation.org/mycomponents</namespace>
-	
-	<tag>
-		<tag-name>sayHello</tag-name>
-		<component>
-			<component-type>org.myorganization.SayHello</component-type>
-			<renderer-type>org.myorganization.SayHelloRenderer</renderer-type>
-		</component>
-	</tag>
-</facelet-taglib> 
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/mycomponents.tld.vm b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/mycomponents.tld.vm
deleted file mode 100644
index 3083318..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/mycomponents.tld.vm
+++ /dev/null
@@ -1,227 +0,0 @@
-#literal()
-<?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.
--->
-<taglib 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/web-jsptaglibrary_2_1.xsd" 
-        version="2.1">
-  <tlib-version>1.1.7</tlib-version>
-   <short-name>$shortname</short-name>
-   <uri>$uri</uri>
-   <display-name>$displayname</display-name>
-   <description>$description</description>
-
-$baseContent
-
-    <!-- Component Tags -->
-#set ($componentList = ${model.getComponents()})
-#foreach( $component in $componentList )
-#if ($modelIds.contains($component.modelId) 
-    && ($component.name))
-#if ($utils.getTagPrefix($component.name) == $shortname) 
-   <tag>
-      <name>$utils.getTagName($component.name)</name>
-      <tag-class>$component.tagClass</tag-class>
-#if ($component.bodyContent)
-      <body-content>$component.bodyContent</body-content>
-#else
-      <body-content>JSP</body-content>
-#end
-      <description><![CDATA[$component.longDescription]]></description>
-      
-#set ($propertyList = ${component.propertyList})
-#foreach( $property in $propertyList )
-#if (!$property.isTagExcluded())
-      <attribute>
-         <name>$property.jspName</name>
-#if ($property.isRequired())
-         <required>$property.isRequired()</required>
-#end
-#if ($property.isMethodExpression() || $property.isMethodBinding())
-#if ($property.getMethodBindingSignature())
-        <deferred-method>
-#set ($sig = $property.getMethodBindingSignature())
-            <method-signature>$sig.returnType myMethod( $sig.parameterTypesAsString )</method-signature>
-
-        </deferred-method>
-#else
-## This is a very special case. If a property is MethodBinding or MethodExpression
-## this should have a signature. If not, for allow multiple MethodBinding
-## simulate a ValueExpression and write a custom code like in 
-## org.apache.myfaces.custom.suggestajax.AbstractSuggestAjaxTag
-         <deferred-value/>
-#end
-#elseif ($property.isLiteralOnly())
-         <rtexprvalue>false</rtexprvalue>
-#else
-#set ($type = $utils.getClassFromFullClass($property.className))
-#if ($type == "String")
-         <deferred-value></deferred-value>
-#else
-         <deferred-value>
-             <type>$property.className</type>
-         </deferred-value>
-#end
-#end
-#if ($property.longDescription)
-         <description><![CDATA[$property.longDescription]]></description>
-#else
-         <description><![CDATA[]]></description>
-#end
-      </attribute>
-#end
-#end
-   </tag>
-#end
-#end
-#end
-   <!-- Converter tags -->
-#set ($componentList = ${model.getConverters()})
-#foreach( $component in $componentList )
-#if ($modelIds.contains($component.modelId) 
-    && ($component.name))
-#if ($utils.getTagPrefix($component.name) == $shortname) 
-   <tag>
-      <name>$utils.getTagName($component.name)</name>
-      <tag-class>$component.tagClass</tag-class>
-#if ($component.bodyContent)
-      <body-content>$component.bodyContent</body-content>
-#else
-      <body-content>empty</body-content>
-#end
-      <description><![CDATA[$component.longDescription]]></description>
-      
-#set ($propertyList = ${component.propertyList})
-#foreach( $property in $propertyList )
-#if (!$property.isTagExcluded())
-      <attribute>
-         <name>$property.name</name>
-#if ($property.isRequired())
-         <required>$property.isRequired()</required>
-#end
-#if ($property.isLiteralOnly())
-         <rtexprvalue>false</rtexprvalue>
-#else
-#set ($type = $utils.getClassFromFullClass($property.className))
-#if ($type == "String")
-         <deferred-value></deferred-value>
-#else
-         <deferred-value>
-             <type>$property.className</type>
-         </deferred-value>
-#end
-#end
-#if ($property.longDescription)
-         <description><![CDATA[$property.longDescription]]></description>
-#else
-         <description><![CDATA[]]></description>
-#end
-      </attribute>
-#end
-#end
-   </tag>
-#end
-#end
-#end
-   <!-- Validator tags -->
-#set ($componentList = ${model.getValidators()})
-#foreach( $component in $componentList )
-#if ($modelIds.contains($component.modelId) 
-    && ($component.name))
-#if ($utils.getTagPrefix($component.name) == $shortname) 
-   <tag>
-      <name>$utils.getTagName($component.name)</name>
-      <tag-class>$component.tagClass</tag-class>
-#if ($component.bodyContent)
-      <body-content>$component.bodyContent</body-content>
-#else
-      <body-content>empty</body-content>
-#end
-      <description><![CDATA[$component.longDescription]]></description>
-      
-#set ($propertyList = ${component.propertyList})
-#foreach( $property in $propertyList )
-#if (!$property.isTagExcluded())
-      <attribute>
-         <name>$property.name</name>
-#if ($property.isRequired())
-         <required>$property.isRequired()</required>
-#end
-#if ($property.isLiteralOnly())
-         <rtexprvalue>false</rtexprvalue>
-#else
-#set ($type = $utils.getClassFromFullClass($property.className))
-#if ($type == "String")
-         <deferred-value></deferred-value>
-#else
-         <deferred-value>
-             <type>$property.className</type>
-         </deferred-value>
-#end
-#end
-#if ($property.longDescription)
-         <description><![CDATA[$property.longDescription]]></description>
-#else
-         <description><![CDATA[]]></description>
-#end
-      </attribute>
-#end
-#end
-   </tag>
-#end
-#end
-#end
-   <!-- Single Tags -->
-#set ($tagList = $model.getTags())
-#foreach( $tag in $tagList )
-#if ($modelIds.contains($tag.modelId))
-   <tag>
-      <name>$utils.getTagName($tag.name)</name>
-      <tag-class>$tag.className</tag-class>
-      <body-content>$tag.bodyContent</body-content>
-      <description><![CDATA[$tag.longDescription]]></description>
-#set ($attributeList = ${tag.attributeList})
-#foreach( $attribute in $attributeList )
-      <attribute>
-         <name>$attribute.name</name>
-         <required>$attribute.isRequired()</required>
-#set ($type = $utils.getClassFromFullClass($attribute.className))
-#if ($type == "ValueExpression")
-         <deferred-value></deferred-value>
-#else
-         <rtexprvalue>$attribute.isRtexprvalue()</rtexprvalue>
-#if ($attribute.className)         
-         <type>$attribute.className</type>
-#else
-         <type>java.lang.String</type>
-#end
-#end
-#if ($property.longDescription)
-         <description><![CDATA[$property.longDescription]]></description>
-#else
-         <description><![CDATA[]]></description>
-#end
-      </attribute>
-#end
-   </tag>
-#end
-#end
-</taglib>
-#end
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/tagClass12.vm b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/tagClass12.vm
deleted file mode 100644
index 68c569d..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/tagClass12.vm
+++ /dev/null
@@ -1,172 +0,0 @@
-#literal()
-// WARNING: This file was automatically generated. Do not edit it directly,
-//          or you will lose your changes.
-/*
- *  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 ${component.tagPackage};
-
-import javax.faces.component.UIComponent;
-import javax.el.ValueExpression;
-import javax.el.MethodExpression;
-import javax.faces.context.FacesContext;
-$utils.importTagClasses12($component)
-
-public class $utils.getClassFromFullClass($component.tagClass)
-#if (${component.tagSuperclass})
-    extends ${component.tagSuperclass}
-#else
-    extends javax.faces.webapp.UIComponentTag
-#end
-{
-    public $utils.getClassFromFullClass($component.tagClass)()
-    {    
-    }
-    
-    public String getComponentType()
-    {
-#if ($component.type)
-        return "$component.type";
-#else
-        return null;
-#end
-    }
-
-    public String getRendererType()
-    {
-#if ($component.rendererType && !($component.rendererType == ""))
-        return "$component.rendererType";
-#else
-        return null;
-#end
-    }
-
-#set ($propertyList = ${component.propertyTagList})
-#foreach( $property in $propertyList )
-#set ($field = $property.fieldName)
-#set ($type = $utils.getJspPropertyType12($property))
- 
-    private $type $field;
-    
-#set ($var = $utils.getVariableFromName($property.name))
-    public void $utils.getPrefixedPropertyName("set", $property.jspName)($type $var)
-    {
-        $field = $var;
-    }
-#end
-
-    protected void setProperties(UIComponent component)
-    {
-        if (!(component instanceof $component.className))
-        {
-            throw new IllegalArgumentException("Component "+
-                component.getClass().getName() +" is no $component.className");
-        }
-        
-        $component.className comp = ($component.className) component;
-        
-        super.setProperties(component);
-        
-        FacesContext context = getFacesContext();
-
-#foreach( $property in $propertyList )##            1
-#set ($field = $property.fieldName)
-#set ($type = $utils.getJspPropertyType12($property))
-#if ($utils.isConverter($property.className))##                   2
-        if ($field != null)
-        {
-            if (!${field}.isLiteralText())
-            {
-                comp.setValueExpression("$property.name", $field);
-            }
-            else
-            {
-                String s = ${field}.getExpressionString();
-                if (s != null)
-                {            
-                    Converter converter = getFacesContext().getApplication().createConverter(s);
-                    comp.setConverter(converter);
-                }
-            }
-        }
-#elseif ($property.isMethodBinding())##                 2
-        if ($field != null)
-        {
-#if ($property.jspName == "actionListener")
-            comp.addActionListener(new MethodExpressionActionListener($field));
-#elseif ($property.jspName == "valueChangeListener")
-            comp.addValueChangeListener(new MethodExpressionValueChangeListener($field));
-#elseif ($property.jspName == "validator")
-            comp.addValidator(new MethodExpressionValidator($field));
-#elseif ($utils.isStringMethodBindingReturnType($property.methodBindingSignature))##3
-            MethodBinding mb;
-            if (isValueReference($field))
-            {
-                mb = context.getApplication().createMethodBinding(
-                    $field, $utils.getSignatureParams($property.methodBindingSignature));            
-            }
-            else
-            {
-                throw new IllegalStateException("Invalid expression " + $field);
-            }
-            comp.${utils.getPrefixedPropertyName("set",$property.name)}(mb);
-#else##                                                 3
-            MethodBinding mb = context.getApplication().createMethodBinding(
-                $field, $utils.getSignatureParams($property.methodBindingSignature));
-            comp.${utils.getPrefixedPropertyName("set",$property.name)}(mb);
-#end##                                                  3
-        }
-#elseif ($property.isMethodExpression())##            2
-        if ($field != null)
-        {
-#if ($property.jspName == "action")
-            comp.setActionExpression($field);
-#elseif ($property.jspName == "actionListener")
-            comp.addActionListener(new MethodExpressionActionListener($field));
-#else
-            comp.${utils.getPrefixedPropertyName("set",$property.name)}($field);
-#end        
-        }        
-#else##                                               2
-        if ($field != null)
-        {
-#if ($property.isLiteralOnly())##                         3
-            comp.getAttributes().put("$property.name", $field);
-#else##                                                 3
-            comp.setValueExpression("$property.name", $field);
-#end##                                                  3
-        } 
-#end##                                                2
-#end##                                              1
-    }
-
-    public void release()
-    {
-        super.release();
-#foreach( $property in $propertyList )
-#set ($field = $property.fieldName)
-#if($utils.getJspPropertyType12($property) == "boolean")
-#set ($empty = "false")
-#else
-#set ($empty = "null")
-#end
-        $field = $empty;
-#end
-    }
-}
-#end
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/tagConverterClass12.vm b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/tagConverterClass12.vm
deleted file mode 100644
index 6d110f3..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/tagConverterClass12.vm
+++ /dev/null
@@ -1,169 +0,0 @@
-#literal()
-// WARNING: This file was automatically generated. Do not edit it directly,
-//          or you will lose your changes.
-/*
- *  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 $utils.getPackageFromFullClass($converter.tagClass);
-
-import javax.faces.context.FacesContext;
-import javax.el.ELContext;
-import javax.faces.convert.Converter;
-import javax.el.ValueExpression;
-import javax.faces.webapp.UIComponentTag;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-$utils.importTagClasses($converter)
-
-public class $utils.getClassFromFullClass($converter.tagClass)
-#if (${converter.tagSuperclass})
-    extends ${converter.tagSuperclass}
-#else
-    extends org.apache.myfaces.commons.converter.ConverterTag
-#end
-{
-#if ($converter.serialuidtag)
-    private static final long serialVersionUID = ${converter.serialuidtag}; 
-#end  
-
-    public $utils.getClassFromFullClass($converter.tagClass)()
-    {
-        setConverterIdString("$converter.converterId");
-    }
-#set ($propertyList = ${converter.propertyTagList})
-#foreach( $property in $propertyList )
-#set ($field = $property.fieldName)
-#set ($type = $utils.getJspPropertyType12($property))
- 
-    private $type $field;
-    
-#set ($var = $utils.getVariableFromName($property.name))
-    public void $utils.getPrefixedPropertyName("set", $property.jspName)($type $var)
-    {
-        $field = $var;
-    }
-#end
-
-    public void setPageContext(PageContext context) {
-        super.setPageContext(context);
-        setConverterIdString("$converter.converterId");
-    }
-
-    protected Converter createConverter() throws JspException {
-    
-        ELContext elContext = FacesContext.getCurrentInstance().getELContext();            
-        $converter.className converter = ($converter.className)super.createConverter();
-#foreach( $property in $propertyList )
-#set ($field = $property.fieldName)
-#set ($type = $utils.getJspPropertyType12($property))
-#set ($className = $utils.getPrimitiveType($property.className))
-        if ($field != null)
-        {
-            if (${field}.isLiteralText())
-            {
-#if ($utils.isPrimitiveClass($property.className))
-                String ${field}Value = ${field}.getExpressionString();
-                if (${field}Value != null)
-                    converter.${utils.getPrefixedPropertyName("set",$property.name)}(${utils.getBoxedClass($className)}.valueOf(${field}Value).${property.className}Value());
-#elseif ($utils.isPrimitiveClass($className))
-                String ${field}Value = ${field}.getExpressionString();
-                if (${field}Value != null)
-                    converter.${utils.getPrefixedPropertyName("set",$property.name)}(${utils.getBoxedClass($className)}.valueOf(${field}Value));
-                else
-                    converter.${utils.getPrefixedPropertyName("set",$property.name)}(null);
-#elseif ($utils.getClassFromFullClass($property.className) == "String")
-                converter.${utils.getPrefixedPropertyName("set",$property.name)}(${field}.getExpressionString());
-#elseif ($utils.getClassFromFullClass($property.className) == "Object")
-                converter.${utils.getPrefixedPropertyName("set",$property.name)}(${field}.getExpressionString());
-#elseif ($utils.getClassFromFullClass($property.className) == "Locale")
-                converter.${utils.getPrefixedPropertyName("set",$property.name)}(
-                    org.apache.myfaces.shared_tomahawk.util.LocaleUtils.converterTagLocaleFromString(${field}.getExpressionString()));
-#elseif ($utils.getClassFromFullClass($property.className) == "Class")
-                try
-                {
-                    converter.${utils.getPrefixedPropertyName("set",$property.name)}(
-                    org.apache.myfaces.shared_tomahawk.util.ClassUtils.classForName(${field}.getExpressionString()));
-                }
-                catch (ClassNotFoundException e)
-                {
-                    throw new JspException(e);
-                }
-#elseif ($utils.getClassFromFullClass($property.className) == "TimeZone")
-                converter.${utils.getPrefixedPropertyName("set",$property.name)}(
-                    java.util.TimeZone.getTimeZone(${field}.getExpressionString()));                
-#else
-                converter.${utils.getPrefixedPropertyName("set",$property.name)}(($property.className) ${field}.getValue(elContext));
-#end
-            }
-            else
-            {
-#if ($utils.isPrimitiveClass($property.className))
-                Object ${field}Value = ${field}.getValue(elContext);
-                if (${field}Value != null)
-                    converter.${utils.getPrefixedPropertyName("set",$property.name)}( ((${utils.getBoxedClass($className)}) ${field}Value ).${property.className}Value());
-#elseif ($utils.isPrimitiveClass($className))
-                converter.${utils.getPrefixedPropertyName("set",$property.name)}( (${utils.getBoxedClass($className)}) ${field}.getValue(elContext) );
-#elseif ($utils.getClassFromFullClass($property.className) == "Locale")
-                Object ${field}Value = ${field}.getValue(elContext);
-                if (${field}Value == null)
-                {
-                    ${field}Value = FacesContext.getCurrentInstance().getViewRoot().getLocale();                
-                }
-                if(!(${field}Value instanceof java.util.Locale))
-                {
-                    ${field}Value = org.apache.myfaces.shared_tomahawk.util.LocaleUtils.converterTagLocaleFromString(${field}.getExpressionString());                    
-                }
-                converter.${utils.getPrefixedPropertyName("set",$property.name)}((java.util.Locale)${field}Value);                
-#elseif ($utils.getClassFromFullClass($property.className) == "TimeZone")
-                Object ${field}Value = ${field}.getValue(elContext);
-                if(${field}Value instanceof java.util.TimeZone)
-                {
-                    converter.${utils.getPrefixedPropertyName("set",$property.name)}(
-                        (java.util.TimeZone) ${field}Value);
-                }
-                else
-                {
-                    converter.${utils.getPrefixedPropertyName("set",$property.name)}(
-                        java.util.TimeZone.getTimeZone(${field}Value.toString()));
-                }
-#elseif ($utils.getClassFromFullClass($property.className) == "String")
-                converter.${utils.getPrefixedPropertyName("set",$property.name)}( (String) ${field}.getValue(elContext));
-#else
-                converter.${utils.getPrefixedPropertyName("set",$property.name)}(($property.className) ${field}.getValue(elContext));
-#end
-            }
-        }
-#end
-        return converter;
-    }
-
-    public void release()
-    {
-        super.release();
-#foreach( $property in $propertyList )
-#set ($field = $property.fieldName)
-#if($utils.getJspPropertyType12($property) == "boolean")
-#set ($empty = "false")
-#else
-#set ($empty = "null")
-#end
-        $field = $empty;
-#end
-    }
-}
-#end
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/tagValidatorClass12.vm b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/tagValidatorClass12.vm
deleted file mode 100644
index c00a3c4..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/tagValidatorClass12.vm
+++ /dev/null
@@ -1,160 +0,0 @@
-#literal()
-// WARNING: This file was automatically generated. Do not edit it directly,
-//          or you will lose your changes.
-/*
- *  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 $utils.getPackageFromFullClass($validator.tagClass);
-
-import javax.faces.context.FacesContext;
-import javax.el.ValueExpression;
-import javax.faces.validator.Validator;
-import javax.faces.application.Application;
-import javax.servlet.jsp.JspException;
-$utils.importTagClasses($validator)
-
-public class $utils.getClassFromFullClass($validator.tagClass)
-#if (${validator.tagSuperclass})
-    extends ${validator.tagSuperclass}
-#else
-    extends org.apache.myfaces.commons.validator.ValidatorBaseTag
-#end
-{
-#if ($validator.serialuidtag)
-    private static final long serialVersionUID = ${validator.serialuidtag}; 
-#end  
-
-    public $utils.getClassFromFullClass($validator.tagClass)()
-    {    
-    }    
-#set ($propertyList = ${validator.propertyTagList})
-#foreach( $property in $propertyList )
-#set ($field = $property.fieldName)
-#set ($type = $utils.getJspPropertyType12($property))
- 
-    private $type $field;
-    
-#set ($var = $utils.getVariableFromName($property.name))
-    public void $utils.getPrefixedPropertyName("set", $property.jspName)($type $var)
-    {
-        $field = $var;
-    }
-#end
-
-    protected Validator createValidator() throws JspException {
-        String validatorId = "$validator.validatorId";
-        Application appl = FacesContext.getCurrentInstance().getApplication();
-        Validator validator = (Validator)appl.createValidator(validatorId);
-        _setProperties(validator);
-        return validator;
-    }
-    
-    protected void _setProperties(Validator val) throws JspException {
-        super._setProperties(val);    
-        FacesContext facesContext = FacesContext.getCurrentInstance();
-
-        $validator.className validator = ($validator.className) val;
-#foreach( $property in $propertyList )
-#set ($field = $property.fieldName)
-#set ($type = $utils.getJspPropertyType12($property))
-#set ($className = $utils.getPrimitiveType($property.className))
-        if ($field != null)
-        {
-#if ($property.isLiteralOnly())
-#if ($utils.isPrimitiveClass($property.className))
-                validator.${utils.getPrefixedPropertyName("set",$property.name)}(${utils.getBoxedClass($className)}.valueOf($field).${property.className}Value());
-#elseif ($utils.isPrimitiveClass($className))
-                validator.${utils.getPrefixedPropertyName("set",$property.name)}(${utils.getBoxedClass($className)}.valueOf($field));
-#else
-                validator.${utils.getPrefixedPropertyName("set",$property.name)}($field);
-#end
-#else        
-            if (!${field}.isLiteralText())
-            {
-                validator.setValueExpression("$property.name", $field);
-            }
-            else
-            {
-#if ($utils.isPrimitiveClass($property.className))
-                Object ${field}Value = ${field}.getValue(facesContext.getELContext());
-                if (${field}Value != null){
-                    if (${field}Value instanceof ${utils.getBoxedClass($className)}){
-                        validator.${utils.getPrefixedPropertyName("set",$property.name)}(
-                            ((${utils.getBoxedClass($className)})${field}Value).${property.className}Value());                        
-                    }
-                    else
-                    {
-                        validator.${utils.getPrefixedPropertyName("set",$property.name)}(
-                            ${utils.getBoxedClass($className)}.valueOf(${field}Value.toString()).${property.className}Value());
-                    }                    
-                }
-#elseif ($utils.isPrimitiveClass($className))
-                Object ${field}Value = ${field}.getValue(facesContext.getELContext());
-                if (${field}Value != null){
-                    if (${field}Value instanceof ${utils.getBoxedClass($className)}){
-                        validator.${utils.getPrefixedPropertyName("set",$property.name)}(
-                            ((${utils.getBoxedClass($className)})${field}Value));                        
-                    }
-                    else
-                    {
-                        validator.${utils.getPrefixedPropertyName("set",$property.name)}(
-                            ${utils.getBoxedClass($className)}.valueOf(${field}Value.toString()));
-                    }                    
-                }
-#elseif ($utils.getClassFromFullClass($property.className) == "String")
-                Object ${field}Value = ${field}.getValue(facesContext.getELContext());
-                if (${field}Value != null)
-                {
-                    validator.${utils.getPrefixedPropertyName("set",$property.name)}(
-                        ($property.className)  ${field}Value.toString());                
-                }
-#elseif ($property.className == "java.lang.String[]")
-                try
-                {
-                    String[] value = org.apache.myfaces.commons.util.TagUtils.getStringArray(${field}.getValue(facesContext.getELContext()));
-                    validator.${utils.getPrefixedPropertyName("set",$property.name)}(value);
-                }
-                catch (java.text.ParseException pe)
-                {
-                  throw new JspException(
-                    pe.getMessage() + ": " + "Position " + pe.getErrorOffset());
-                }
-#else
-                validator.${utils.getPrefixedPropertyName("set",$property.name)}(($property.className)  ${field}.getValue(facesContext.getELContext()));
-#end
-            }
-#end
-        }
-#end
-    }
-
-    public void release()
-    {
-        super.release();
-#foreach( $property in $propertyList )
-#set ($field = $property.fieldName)
-#if($utils.getJspPropertyType12($property) == "boolean")
-#set ($empty = "false")
-#else
-#set ($empty = "null")
-#end
-        $field = $empty;
-#end
-    }
-}
-#end
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/validatorClass12.vm b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/validatorClass12.vm
deleted file mode 100644
index b606ff1..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/validatorClass12.vm
+++ /dev/null
@@ -1,217 +0,0 @@
-#literal()
-## Velocity template used to generate JSF1.2-compatible validator classes
-## from validator meta-data.
-##
-## Note that there are only one type of validator generation:
-##  * "subclass mode" (use annotated class as a parent class)
-##
-## Variable $validator refers to a ValidatorMeta object to process
-## Variable $utils refers to an instance of MyfacesUtils.
-##
-##
-## The java package of the generated class is always the same as
-## the package in which the annotated class exists.
-##
-/*
- *  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 ${validator.packageName};
-
-import javax.el.ValueExpression;
-import javax.faces.context.FacesContext;
-$utils.importTagClasses($validator)
-
-#if ($validator.isTemplate())
-#set ($generatedClassParent = $validator.sourceClassParentClassName)
-#else
-#set ($generatedClassParent = $validator.sourceClassName)
-#end
-// Generated from class ${validator.sourceClassName}.
-//
-// WARNING: This file was automatically generated. Do not edit it directly,
-//          or you will lose your changes.
-public class ${utils.getClassFromFullClass($validator.className)} extends $generatedClassParent
-#if ($validator.implements)
-    implements $validator.implements
-#end
-{
-
-#if ($validator.validatorId)
-    static public final String VALIDATOR_ID = 
-        "$validator.validatorId";
-#end
-
-    public ${utils.getClassFromFullClass($validator.className)}()
-    {
-    }
-    
-#set ($propertyList = ${validator.propertyValidatorList})
-
-#foreach( $property in $propertyList )
-#set ($field = $property.fieldName)
-#set ($type = $utils.getClassFromFullClass($property.className))
-#if($utils.getDefaultValueField($property)) 
-#set ($defaultValue = $utils.getDefaultValueField($property))
-#else
-#set ($defaultValue = false)
-#end
-    // Property: $property.name
-#if ($property.isLiteralOnly() || $property.isTagExcluded() )
-    private $type $field #if($defaultValue) = $defaultValue;#{else};#{end}
-
-     
-#else
-    private $type $field;
-    
-#end
-#if($utils.isPrimitiveClass($type) && !$property.isTagExcluded() )
-    private boolean ${field}Set;
-    
-#if ($property.isSetMethod())
-    $property.setMethodScope boolean $utils.getPrefixedPropertyName("isSet", $property.name)()
-    {
-        return ${field}Set;
-    }
-#end
-#end
-#if($property.isLocalMethod())
-#if("boolean" == $type)
-#set ($methodName = $utils.getPrefixedPropertyName("isLocal", $property.name))
-#else
-#set ($methodName = $utils.getPrefixedPropertyName("getLocal", $property.name))
-#end
-    final $property.localMethodScope $type ${methodName}()
-    {
-        return $field;
-    }
-     
-#end
-    public $type $utils.getMethodReaderFromProperty($property.name, $type)()
-    {
-#if ($property.isTagExcluded() || $property.isLiteralOnly())
-        return $field;
-#else
-#if ($utils.isPrimitiveClass($type))
-        if (${field}Set)
-#else
-        if ($field != null)
-#end
-        {
-            return $field;
-        }
-        ValueExpression vb = getValueExpression("$property.name");
-        if (vb != null)
-        {
-#if ($utils.isPrimitiveClass($type))
-            return ($utils.castIfNecessary($type) vb.getValue(getFacesContext().getELContext())).${type}Value();
-#else
-#set ($pritype = $utils.getPrimitiveType($property.className))
-#if ($utils.isPrimitiveClass($pritype))
-            Object value = vb == null ? null : vb.getValue(getFacesContext().getELContext());
-            if (!(value instanceof $type)){
-                value = ${type}.valueOf(value.toString());
-            }            
-            return $utils.castIfNecessary($type) value;
-#else
-            return $utils.castIfNecessary($type) vb.getValue(getFacesContext().getELContext());
-#end
-#end
-        }
-#if ($defaultValue)
-        return $defaultValue; 
-#elseif ($utils.isPrimitiveClass($type))
-        return $utils.primitiveDefaultValue($type);
-#else       
-        return null;
-#end
-#end
-    }
-
-    public void $utils.getPrefixedPropertyName("set", $property.name)($type $utils.getVariableFromName($property.name))
-    {
-        this.$field = $utils.getVariableFromName($property.name);
-#if ($utils.isPrimitiveClass($type) && !$property.isTagExcluded() )
-        this.${field}Set = true;        
-#end
-    }
-#end
-
-    public Object saveState(FacesContext facesContext)
-    {
-#set ($primitiveCount = $propertyList.size() + 1)
-#foreach( $property in $propertyList )
-#if($utils.isPrimitiveClass($property.className))
-#set ($primitiveCount = $primitiveCount + 1)
-#end
-#end
-        Object[] values = new Object[$primitiveCount];
-        values[0] = super.saveState(facesContext);
-#set ($arrayIndex = 0)
-#foreach( $property in $propertyList )
-#set ($field = $property.fieldName)
-#set ($type = $property.className)
-#set ($arrayIndex = $arrayIndex + 1)
-#if ($property.jspName == "validator" && $property.isMethodBinding() )
-        values[$arrayIndex] = saveAttachedState(facesContext,${field}List);
-#elseif ( $property.isStateHolder() )## || $utils.isConverter($type)
-        values[$arrayIndex] = saveAttachedState(facesContext,$field);
-#elseif($utils.isPrimitiveClass($type))
-        values[$arrayIndex] = ${utils.getBoxedClass($type)}.valueOf($field);
-#else
-        values[$arrayIndex] = $field;
-#end
-#if($utils.isPrimitiveClass($type) && !$property.isTagExcluded())
-#set ($arrayIndex = $arrayIndex + 1)
-        values[$arrayIndex] = Boolean.valueOf(${field}Set);
-#end
-#end
-        return values; 
-    }
-
-    public void restoreState(FacesContext facesContext, Object state)
-    {
-        Object[] values = (Object[])state;
-        super.restoreState(facesContext,values[0]);
-#set ($arrayIndex = 0)
-#foreach( $property in $propertyList )
-#set ($field = $property.fieldName)
-#set ($type = $property.className)
-#set ($arrayIndex = $arrayIndex + 1)
-#if ( $property.isStateHolder() )
-#if ($property.jspName == "validator" && $property.isMethodBinding() )
-        ${field}List = (List<Validator>) restoreAttachedState(facesContext,values[$arrayIndex]);
-#elseif ($utils.isList($type))
-        $field = (List) restoreAttachedState(facesContext,values[$arrayIndex]);
-#else
-        $field = $utils.castIfNecessary($type) restoreAttachedState(facesContext,values[$arrayIndex]); 
-#end
-#elseif ($utils.isConverter($type)) 
-        $field = (Converter) restoreAttachedState(facesContext,values[$arrayIndex]);
-#elseif ($utils.isPrimitiveClass($type))
-        $field = ($utils.castIfNecessary($type) values[$arrayIndex]).${type}Value();
-#else
-        $field = $utils.castIfNecessary($type) values[$arrayIndex];
-#end
-#if($utils.isPrimitiveClass($type) && !$property.isTagExcluded() )
-#set ($arrayIndex = $arrayIndex + 1)
-        ${field}Set = ((Boolean) values[$arrayIndex]).booleanValue();
-#end
-#end
-    }
-}
-#end
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java
deleted file mode 100644
index 3bbe42a..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.myorganization.component.sayhello;
-
-import junit.framework.Test;
-import org.apache.shale.test.base.AbstractJsfTestCase;
-import org.apache.shale.test.mock.MockRenderKitFactory;
-import org.apache.shale.test.mock.MockResponseWriter;
-
-import java.io.IOException;
-import java.io.StringWriter;
-
-/**
- * Class to test the behaviour of the SayHello renderer
- */
-public class SayHelloRendererTest extends AbstractJsfTestCase
-{
-
-    public static Test suite()
-    {
-        return null;
-    }
-
-    private MockResponseWriter writer ;
-    private SayHello sayHello;
-
-    public SayHelloRendererTest(String name)
-    {
-        super(name);
-    }
-
-    public void setUp() throws Exception
-    {
-        super.setUp();
-
-        sayHello = new SayHello();
-        sayHello.setFirstName("John");
-        sayHello.setLastName("Smith");
-
-        writer = new MockResponseWriter(new StringWriter(), null, null);
-        facesContext.setResponseWriter(writer);
-        // TODO remove these two lines once shale-test goes alpha, see MYFACES-1155
-        facesContext.getViewRoot().setRenderKitId(MockRenderKitFactory.HTML_BASIC_RENDER_KIT);
-        facesContext.getRenderKit().addRenderer(
-                sayHello.getFamily(),
-                sayHello.getRendererType(),
-                new SayHelloRenderer());
-    }
-
-    public void tearDown() throws Exception
-    {
-        super.tearDown();
-        sayHello = null;
-        writer = null;
-    }
-
-    public void testEncodeEnd()  throws Exception
-    {
-        sayHello.encodeEnd(facesContext);
-        facesContext.renderResponse();
-
-        String output = writer.getWriter().toString();
-
-        assertEquals("Hello John Smith!", output);
-        assertNotSame("Bye John Smith!", output);
-    }
-
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/converter/PhoneNumberConverterTest.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/converter/PhoneNumberConverterTest.java
deleted file mode 100644
index 5554020..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/converter/PhoneNumberConverterTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.myorganization.converter;
-
-import java.io.StringWriter;
-
-import javax.faces.component.html.HtmlInputText;
-
-import junit.framework.Test;
-
-import org.apache.shale.test.base.AbstractJsfTestCase;
-import org.apache.shale.test.mock.MockResponseWriter;
-
-public class PhoneNumberConverterTest extends AbstractJsfTestCase
-{
-    public static Test suite()
-    {
-        return null;
-    }
-
-    private MockResponseWriter writer ;
-    private PhoneNumberConverter phoneNumConverter;
-
-    public PhoneNumberConverterTest(String name)
-    {
-        super(name);
-    }
-
-    public void setUp() throws Exception
-    {
-        super.setUp();
-
-        phoneNumConverter = new PhoneNumberConverter();
-        writer = new MockResponseWriter(new StringWriter(), null, null);
-        facesContext.setResponseWriter(writer);
-    }
-
-    public void tearDown() throws Exception
-    {
-        super.tearDown();
-        phoneNumConverter = null;
-        writer = null;
-    }
-
-    public void testNumOnly() throws Exception
-    {
-        Object obj = phoneNumConverter.getAsObject(facesContext, new HtmlInputText(), "6373824");
-        assertNotNull(obj);
-        PhoneNumber phoneNum = (PhoneNumber) obj;
-        assertEquals(phoneNum.getNumber(), "6373824");
-    }
-    
-    public void testAreaCodeNum() throws Exception
-    {
-        Object obj = phoneNumConverter.getAsObject(facesContext, new HtmlInputText(), "09-6373824");
-        assertNotNull(obj);
-        PhoneNumber phoneNum = (PhoneNumber) obj;
-        assertEquals(phoneNum.getAreaCode(), "09");
-        assertEquals(phoneNum.getNumber(), "6373824");
-    }
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/validator/OddNumberValidatorTest.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/validator/OddNumberValidatorTest.java
deleted file mode 100644
index 11192ce..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/validator/OddNumberValidatorTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.myorganization.validator;
-
-import java.io.StringWriter;
-
-import javax.faces.component.html.HtmlInputText;
-import javax.faces.validator.ValidatorException;
-
-import junit.framework.Test;
-
-import org.apache.shale.test.base.AbstractJsfTestCase;
-import org.apache.shale.test.mock.MockResponseWriter;
-
-public class OddNumberValidatorTest extends AbstractJsfTestCase
-{
-
-    public static Test suite()
-    {
-        return null;
-    }
-
-    private MockResponseWriter writer ;
-    private OddNumberValidator oddNumValidator;
-
-    public OddNumberValidatorTest(String name)
-    {
-        super(name);
-    }
-
-    public void setUp() throws Exception
-    {
-        super.setUp();
-
-        oddNumValidator = new OddNumberValidator();
-        writer = new MockResponseWriter(new StringWriter(), null, null);
-        facesContext.setResponseWriter(writer);
-    }
-
-    public void tearDown() throws Exception
-    {
-        super.tearDown();
-        oddNumValidator = null;
-        writer = null;
-    }
-
-    public void testOddNumInput() throws Exception
-    {
-        boolean noExceptionsThrown = true;
-        try 
-        {
-            oddNumValidator.validate(facesContext, new HtmlInputText(), new Integer(3));
-        } 
-        catch(ValidatorException ve) 
-        {
-            noExceptionsThrown = false;
-        }
-        assertTrue(noExceptionsThrown);
-    }
-    
-    public void testEvenNumInput() throws Exception
-    {
-        boolean noExceptionsThrown = true;
-        try 
-        {
-            oddNumValidator.validate(facesContext, new HtmlInputText(), new Integer(8));
-        } 
-        catch(ValidatorException ve) 
-        {
-            noExceptionsThrown = false;
-        }
-        assertFalse(noExceptionsThrown);
-    }
-    
-    
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml
deleted file mode 100644
index dc5ad84..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml
+++ /dev/null
@@ -1,203 +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.
--->
-<!-- This is the project descriptor for the examples of my components -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>${artifactId}-examples</artifactId>
-    <packaging>war</packaging>
-    <name>My Components Examples</name>
-
-    <parent>
-        <groupId>${groupId}</groupId>
-        <artifactId>${artifactId}-project</artifactId>
-        <version>${version}</version>
-    </parent>
-
-    <properties>
-        <jsf-myfaces.version>1.2.7</jsf-myfaces.version>
-        <jsf-ri.version>1.2_13</jsf-ri.version>        
-        <maven.jetty.plugin.version>6.1.16</maven.jetty.plugin.version>
-        <log4j.version>1.2.13</log4j.version>
-    </properties>
-    
-    <dependencies>
-           <dependency>
-               <groupId>${groupId}</groupId>
-               <artifactId>${artifactId}-core</artifactId>
-               <version>${project.version}</version>
-           </dependency>
-           <dependency>
-               <groupId>commons-logging</groupId>
-               <artifactId>commons-logging</artifactId>
-               <version>1.1.1</version>
-               <scope>compile</scope>
-           </dependency>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>jstl</artifactId>
-                <version>1.2</version>
-                <scope>runtime</scope>
-            </dependency>           
-           
-       </dependencies>
-
-    <repositories>
-        <!-- Repository for jstl 1.2 -->
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository> 
-    </repositories>
-
-    <profiles>
-        <!-- By default the war examples use myfaces! :) -->
-        <profile>
-            <id>myfaces</id>
-            <activation>
-                <property>
-                    <name>!jsf</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-api</artifactId>
-                    <version>${jsf-myfaces.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-impl</artifactId>
-                    <version>${jsf-myfaces.version}</version>
-                    <!-- Sandbox examples must only have runtime dependency to myfaces-impl
-                 so that it will be automatically added to war. But there must not be
-                 any compile dependency on impl so that is is always possible to use
-                 other JSF implementations. -->
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-
-            <properties>
-                <jsf_implementation>MyFaces</jsf_implementation>
-            </properties>
-        </profile>
-
-        <!-- To use the examples using the Sun's JSF Reference Implementation: -Djsf=ri -->
-        <profile>
-            <id>jsfri</id>
-            <activation>
-                <property>
-                    <name>jsf</name>
-                    <value>ri</value>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>javax.faces</groupId>
-                    <artifactId>jsf-api</artifactId>
-                    <version>${jsf-ri.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>javax.faces</groupId>
-                    <artifactId>jsf-impl</artifactId>
-                    <version>${jsf-ri.version}</version>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-
-            <repositories>
-                <repository>
-                    <id>java.net</id>
-                    <name>java.net Maven 1 Repository</name>
-                    <url>https://maven-repository.dev.java.net/nonav/repository</url>
-                    <layout>legacy</layout>
-                </repository>
-            </repositories>
-
-            <properties>
-                <jsf_implementation>JSF-RI</jsf_implementation>
-            </properties>
-        </profile>
-        <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>${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>${log4j.version}</version>
-                    <type>jar</type>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <!--This plugin allows to run the example using mvn jetty:run -->
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>${maven.jetty.plugin.version}</version>
-                <configuration>
-                    <scanIntervalSeconds>10</scanIntervalSeconds>
-                </configuration>
-            </plugin>
-        </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/java/org/myorganization/component/example/SayHelloBean.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/java/org/myorganization/component/example/SayHelloBean.java
deleted file mode 100644
index d3c475f..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/java/org/myorganization/component/example/SayHelloBean.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.myorganization.component.example;
-
-import javax.faces.event.ActionEvent;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.myorganization.converter.PhoneNumber;
-
-/**
- * Managed bean for the sayHello page example
- */
-public class SayHelloBean
-{
-
-    private static final Log log = LogFactory.getLog(SayHelloBean.class);
-
-    private String firstName;
-    private String lastName;
-    private boolean renderGreeting;
-    private Integer oddNumber;
-    private PhoneNumber phoneNumber;
-
-    public SayHelloBean()
-    {
-        this.renderGreeting = false;
-    }
-
-    public void sayIt(ActionEvent evt)
-    {
-        renderGreeting = true;
-
-        if (log.isInfoEnabled())
-        {
-            log.info("The name to say hello is '"+firstName+"' and the last name is '"+lastName+"'.");
-        }
-    }
-
-
-    public String getFirstName()
-    {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName)
-    {
-        this.firstName = firstName;
-    }
-
-    public String getLastName()
-    {
-        return lastName;
-    }
-
-    public void setLastName(String lastName)
-    {
-        this.lastName = lastName;
-    }
-
-
-    public boolean isRenderGreeting()
-    {
-        return renderGreeting;
-    }
-
-    public void setRenderGreeting(boolean renderGreeting)
-    {
-        this.renderGreeting = renderGreeting;
-    }
-
-    public Integer getOddNumber()
-    {
-        return oddNumber;
-    }
-
-    public void setOddNumber(Integer oddNumber)
-    {
-        this.oddNumber = oddNumber;
-    }
-    
-    public String submitOddNumber() {
-        return "display_number";
-    }
-    
-    public String submitPhoneNumber() {
-        return "display_phone";
-    }
-
-    public PhoneNumber getPhoneNumber()
-    {
-        return phoneNumber;
-    }
-
-    public void setPhoneNumber(PhoneNumber phoneNumber)
-    {
-        this.phoneNumber = phoneNumber;
-    }
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/log4j/log4j.properties b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/log4j/log4j.properties
deleted file mode 100644
index 78352e4..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/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-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/resources/org/myorganization/component/example/build.properties b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/resources/org/myorganization/component/example/build.properties
deleted file mode 100644
index 29deaef..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/resources/org/myorganization/component/example/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# Do not edit this file, as it will be completed automatically
-# by maven during the build process
-mycomponents_version=${pom.version}
-jsf_implementation=${jsf_implementation}
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/examples-config.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/examples-config.xml
deleted file mode 100644
index de5adcb..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/examples-config.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE faces-config PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
-  "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-
-<!-- =========== FULL CONFIGURATION FILE ================================== -->
-
-<!-- my components examples -->
-
-<faces-config>
-
-
-    <!-- Managed Beans for sayhello.jsp -->
-    <managed-bean>
-        <managed-bean-name>sayHelloBean</managed-bean-name>
-        <managed-bean-class>org.myorganization.component.example.SayHelloBean</managed-bean-class>
-        <managed-bean-scope>request</managed-bean-scope>
-    </managed-bean>
-
-    <!-- NAVIGATION RULES -->
-
-    <navigation-rule>
-        <navigation-case>
-            <from-outcome>go_home</from-outcome>
-            <to-view-id>/home.jsp</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-    <navigation-rule>
-        <from-view-id>/validatorDemo.jsp</from-view-id>
-        <navigation-case>
-            <from-outcome>display_number</from-outcome>
-            <to-view-id>/validatorDemoResult.jsp</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-    
-    <navigation-rule>
-        <from-view-id>/converterDemo.jsp</from-view-id>
-        <navigation-case>
-            <from-outcome>display_phone</from-outcome>
-            <to-view-id>/converterDemoResult.jsp</to-view-id>
-        </navigation-case>
-    </navigation-rule>
-
-</faces-config>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/web.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 7da038b..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
-
-  <description>debug web.xml</description>
-
-  <context-param>
-    <description>Comma separated list of URIs of (additional) faces config files.
-            (e.g. /WEB-INF/my-config.xml)
-            See JSF 1.0 PRD2, 10.3.2
-            Attention: You do not need to put /WEB-INF/faces-config.xml in here.
-    </description>
-    <param-name>javax.faces.CONFIG_FILES</param-name>
-    <param-value>/WEB-INF/examples-config.xml</param-value>
-  </context-param>
-
-  <context-param>
-    <description>State saving method: "client" or "server" (= default)
-            See JSF Specification 2.5.3</description>
-    <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-    <param-value>server</param-value>
-  </context-param>
-
-  <servlet>
-    <servlet-name>Faces Servlet</servlet-name>
-    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>Faces Servlet</servlet-name>
-    <url-pattern>*.jsf</url-pattern>
-  </servlet-mapping>
-
-  <welcome-file-list>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
-
-</web-app>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/converterDemo.jsp b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/converterDemo.jsp
deleted file mode 100644
index 1ba5598..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/converterDemo.jsp
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://www.myorganitzation.org/mycomponents" prefix="mycomp"%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>My JSF Components Examples</title>
-</head>
-<body>
-
-<f:view>
-    <h:outputText value="Custom Converter Demo"/>
-    <f:verbatim><hr></f:verbatim>
-
-    <h:form>
-        <h:panelGrid columns="2">
-            <h:outputLabel for="num" value="Enter your phone number (Area Code - Number)" />
-            <h:inputText id="num" value="#{sayHelloBean.phoneNumber}">
-                <mycomp:phoneNumberConverter/>
-            </h:inputText>
-            <h:commandButton value="Submit" action="#{sayHelloBean.submitPhoneNumber}"/>
-        </h:panelGrid>
-        <h:commandLink value="[HOME]" action="go_home"/>
-        <h:messages />
-    </h:form>
-</f:view>
-
-</body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/converterDemoResult.jsp b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/converterDemoResult.jsp
deleted file mode 100644
index 142d914..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/converterDemoResult.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://www.myorganitzation.org/mycomponents" prefix="mycomp"%>
-
-<html>
-<head>
-    <title>My JSF Components</title>
-</head>
-
-<body>
-
-<f:view>
-    <h:form>
-        <h:panelGrid columns="2">
-            <h:outputLabel for="areaCode" value="Your area code is:"/> 
-            <h:outputText id="areaCode" value="#{sayHelloBean.phoneNumber.areaCode}"/>
-            <h:outputLabel for="num" value="Your number is:"/> 
-            <h:outputText id="num" value="#{sayHelloBean.phoneNumber.number}"/>
-            <h:commandLink value="[HOME]" action="go_home"/>
-        </h:panelGrid>
-    </h:form>
-</f:view>
-
-
-</body>
-
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/home.jsp b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/home.jsp
deleted file mode 100644
index 9c6c991..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/home.jsp
+++ /dev/null
@@ -1,44 +0,0 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://www.myorganitzation.org/mycomponents" prefix="mycomp"%>
-
-<html>
-
-<head>
-    <title>My JSF Components Examples</title>
-</head>
-
-<body>
-
-<f:view>
-    <h:form>
-
-        <f:loadBundle basename="org.myorganization.component.example.build" var="buildInfo"/>
-
-        <h:panelGrid columns="2">
-            <h:outputText style="font-weight: bold" value="My JSF Components Library"/>
-            <h:outputText value=" (Version #{buildInfo['mycomponents_version']}, using #{buildInfo ['jsf_implementation']})"/>
-        </h:panelGrid>
-
-        <h:panelGrid>
-
-            <h:outputText value="My component examples" />
-            <h:panelGrid style="padding-left:25px">
-                <h:outputLink value="sayhello.jsf">
-                    <f:verbatim>sayHello - demo component</f:verbatim>
-                </h:outputLink>
-                <h:outputLink value="validatorDemo.jsf">
-                    <f:verbatim>sayHello - demo validator</f:verbatim>
-                </h:outputLink>
-                <h:outputLink value="converterDemo.jsf">
-                    <f:verbatim>sayHello - demo converter</f:verbatim>
-                </h:outputLink>
-            </h:panelGrid>
-
-        </h:panelGrid>
-
-    </h:form>
-</f:view>
-</body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/index.jsp b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/index.jsp
deleted file mode 100644
index c4a9b48..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/index.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<jsp:forward page="home.jsf"/>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/sayhello.jsp b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/sayhello.jsp
deleted file mode 100644
index fa67d71..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/sayhello.jsp
+++ /dev/null
@@ -1,49 +0,0 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://www.myorganitzation.org/mycomponents" prefix="mycomp"%>
-
-<html>
-<head>
-    <title>My JSF Components</title>
-</head>
-
-<body>
-
-<f:view>
-
-    <mycomp:sayHello firstName="John" lastName="Smith"/>
-
-    <h:outputText value=" (probably not you, I know)"/>
-
-    <f:verbatim><hr></f:verbatim>
-
-    <h:form>
-        <h:panelGrid columns="2">
-            <h:outputLabel for="inputFirstName" value="First name" />
-            <h:inputText id="inputFirstName" value="#{sayHelloBean.firstName}"/>
-
-            <h:outputLabel for="inputLastName" value="Last name" />
-            <h:inputText id="inputLastName" value="#{sayHelloBean.lastName}"/>
-        </h:panelGrid>
-
-        <h:panelGrid columns="1">
-
-            <h:commandButton value="Say Hello!" actionListener="#{sayHelloBean.sayIt}"/>
-
-            <mycomp:sayHello firstName="#{sayHelloBean.firstName}"
-                             lastName="#{sayHelloBean.lastName}"
-                             rendered="#{sayHelloBean.renderGreeting}"/>
-
-            <h:commandLink value="[HOME]" action="go_home"/>
-
-        </h:panelGrid>
-
-    </h:form>
-
-</f:view>
-
-
-</body>
-
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/validatorDemo.jsp b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/validatorDemo.jsp
deleted file mode 100644
index 4eed4d7..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/validatorDemo.jsp
+++ /dev/null
@@ -1,31 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://www.myorganitzation.org/mycomponents" prefix="mycomp"%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-    <title>My JSF Components Examples</title>
-</head>
-<body>
-
-<f:view>
-    <h:outputText value="Custom Validator Demo"/>
-    <f:verbatim><hr></f:verbatim>
-
-    <h:form>
-        <h:panelGrid columns="2">
-            <h:outputLabel for="num" value="Enter an odd number" />
-            <h:inputText id="num" value="#{sayHelloBean.oddNumber}">
-                <mycomp:validateOddNum/>
-            </h:inputText>
-            <h:commandButton value="Submit" action="#{sayHelloBean.submitOddNumber}"/>
-        </h:panelGrid>
-        <h:commandLink value="[HOME]" action="go_home"/>
-        <h:messages />
-    </h:form>
-</f:view>
-
-</body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/validatorDemoResult.jsp b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/validatorDemoResult.jsp
deleted file mode 100644
index eb6d5be..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/validatorDemoResult.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://www.myorganitzation.org/mycomponents" prefix="mycomp"%>
-
-<html>
-<head>
-    <title>My JSF Components</title>
-</head>
-
-<body>
-
-<f:view>
-    <h:form>
-        <h:panelGrid columns="2">
-            Value entered is: <h:outputText value="#{sayHelloBean.oddNumber}"/>
-            <h:commandLink value="[HOME]" action="go_home"/>
-        </h:panelGrid>
-    </h:form>
-</f:view>
-
-
-</body>
-
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index bf92c46..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>${groupId}</groupId>
-  <artifactId>${artifactId}-project</artifactId>
-  <packaging>pom</packaging>
-  <name>My JSF Components Library Project</name>
-  <version>${version}</version>
-
-  <description>
-      This is the project for my funky components. This will build both the core and the examples
-  </description>
-
-    <modules>
-        <module>core</module>
-        <module>examples</module>
-    </modules>
-
-    <repositories>
-        <repository>
-            <id>Myfaces repository</id>
-            <url>http://myfaces.zones.apache.org/dist/maven-repository</url>
-        </repository>
-    </repositories>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/LICENSE.txt b/maven2-archetypes/myfaces-archetype-trinidad/LICENSE.txt
deleted file mode 100644
index 75b5248..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/NOTICE.txt b/maven2-archetypes/myfaces-archetype-trinidad/NOTICE.txt
deleted file mode 100644
index ab2c2b5..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces                   ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/pom.xml b/maven2-archetypes/myfaces-archetype-trinidad/pom.xml
deleted file mode 100644
index 68af520..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-	   
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 
-
-  <parent>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-parent</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.myfaces.buildtools</groupId>
-  <artifactId>myfaces-archetype-trinidad</artifactId>
-  <packaging>maven-plugin</packaging>
-  <name>MyFaces Trinidad Archetype</name>
-  <description>Archetype to create a new webapp based on Trinidad</description>
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/LICENSE b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/NOTICE b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index ab2c2b5..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
-==  Version 2.0, in this case for the Apache MyFaces                   ==
-=========================================================================
-
-This product includes software developed by 
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the 
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses 
-associated with this software.
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/archetype.xml b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index 5196f55..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/archetype.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.
-	   
--->
-
-<archetype>
-  <id>myfaces-archetype-trinidad</id>
-  <sources>
-    <source>src/main/java/HelloWorldBacking.java</source>
-  </sources>
-  <resources>
-    <resource>src/main/log4j/log4j.properties</resource>
-    <resource>src/main/webapp/index.jspx</resource>
-    <resource>src/main/webapp/page2.jspx</resource>
-    <resource>src/main/webapp/WEB-INF/web.xml</resource>
-    <resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
-  </resources>
-</archetype>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 50e6d79..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-	   
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <packaging>war</packaging>
-    <version>${version}</version>
-    <name>A custom project using myfaces</name>
-    <url>http://www.myorganization.org</url>
-
-    <properties>
-        <jsf-myfaces.version>1.2.7</jsf-myfaces.version>
-        <jsf-ri.version>1.2_13</jsf-ri.version>
-        <trinidad.version>1.2.11</trinidad.version>        
-        <maven.jetty.plugin.version>6.1.16</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>${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>${jsf-myfaces.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.myfaces.core</groupId>
-                    <artifactId>myfaces-impl</artifactId>
-                    <version>${jsf-myfaces.version}</version>
-                    <scope>compile</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>${jsf-ri.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>javax.faces</groupId>
-                    <artifactId>jsf-impl</artifactId>
-                    <version>${jsf-ri.version}</version>
-                </dependency>
-            </dependencies>
-        </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>${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>${log4j.version}</version>
-                    <type>jar</type>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
-    <repositories>
-        <repository>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>apache-maven-snapshots</id>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-        </repository>
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-
-    <!-- Project dependencies -->
-    <dependencies>
-        
-        <!-- Apache Trinidad -->
-        <dependency>
-            <groupId>org.apache.myfaces.trinidad</groupId>
-            <artifactId>trinidad-api</artifactId>
-            <version>${trinidad.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.myfaces.trinidad</groupId>
-            <artifactId>trinidad-impl</artifactId>
-            <version>${trinidad.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        
-        <dependency>
-        	<groupId>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-trinidad/src/main/resources/archetype-resources/src/main/java/HelloWorldBacking.java b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/java/HelloWorldBacking.java
deleted file mode 100644
index a56bc17..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/java/HelloWorldBacking.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- * 
- *  http://www.apache.org/licenses/LICENSE-2.0
- * 
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package $package;
-
-import javax.faces.context.FacesContext;
-
-import org.apache.myfaces.trinidad.render.ExtendedRenderKitService;
-import org.apache.myfaces.trinidad.util.Service;
-
-/**
- * A typical simple backing bean, that is backed to <code>helloworld.jsp</code>
- * 
- */
-public class HelloWorldBacking
-{
-
-  //properties
-  private String _name;
-
-  /**
-   * default empty constructor
-   */
-  public HelloWorldBacking()
-  {   
-  }
-
-  //-------------------getter & setter
-  public String getName()
-  {
-    return _name;
-  }
-
-  public void setName(String name)
-  {
-    this._name = name;
-  }
-
-  /**
-   * Method that is backed to a submit button of a form.
-   */
-  public String send()
-  {
-    FacesContext facesContext = FacesContext.getCurrentInstance();
-    ExtendedRenderKitService service = (ExtendedRenderKitService)
-      Service.getRenderKitService(facesContext, ExtendedRenderKitService.class);
-    service.addScript(facesContext, "alert('Script added by ExtendedRenderKitService')");
-
-    //do real logic
-    return ("success");
-  }
-}
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/log4j/log4j.properties b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/log4j/log4j.properties
deleted file mode 100644
index 78352e4..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/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-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
deleted file mode 100644
index 1ebe6e1..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-	   
--->
-<faces-config version="1.2" 
-    xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:xi="http://www.w3.org/2001/XInclude"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
-  
-  <application>
-    <!-- Use the Trinidad RenderKit -->
-    <default-render-kit-id>
-      org.apache.myfaces.trinidad.core
-    </default-render-kit-id>
-  </application>
-
-  <!-- Global preferences object that proxies to others -->
-  <managed-bean>
-    <managed-bean-name>helloWorldBacking</managed-bean-name>
-    <managed-bean-class>${package}.HelloWorldBacking</managed-bean-class>
-    <managed-bean-scope>request</managed-bean-scope>
-  </managed-bean>
-
-  <!-- navigation rules for index.jspx -->
-  <navigation-rule>
-    <from-view-id>/index.jspx</from-view-id>
-    <navigation-case>
-      <from-outcome>success</from-outcome>
-      <to-view-id>/page2.jspx</to-view-id>
-    </navigation-case>
-  </navigation-rule>
-	
-  <!-- navigation rules for page2.jspx -->
-  <navigation-rule>
-    <from-view-id>/page2.jspx</from-view-id>
-    <navigation-case>
-      <from-outcome>back</from-outcome>
-      <to-view-id>/index.jspx</to-view-id>
-    </navigation-case>
-  </navigation-rule>
-
-</faces-config>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index dcb4552..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version = '1.0' encoding = 'ISO-8859-1'?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-	   
--->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-         version="2.4">
-  <!-- Use client-side state saving.  In Trinidad, it is an
-       optimized, token-based mechanism that is almost always a
-       better choice than the standard JSF server-side state saving. -->
-  <context-param>
-    <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
-    <param-value>client</param-value>
-    <!--param-value>server</param-value-->
-  </context-param>
-
-  <!-- Trinidad by default uses an optimized client-side state saving
-       mechanism. To disable that, uncomment the following -->
-  <!--context-param>
-    <param-name>org.apache.myfaces.trinidad.CLIENT_STATE_METHOD</param-name>
-    <param-value>all</param-value>
-  </context-param-->
-
-  <!-- Trinidad also supports an optimized strategy for caching some
-   view state at an application level, which significantly improves
-   scalability.  However, it makes it harder to develop (updates to
-   pages will not be noticed until the server is restarted), and in
-   some rare cases cannot be used for some pages (see Trinidad
-   documentation for more information) -->
-  <context-param>
-    <param-name>org.apache.myfaces.trinidad.USE_APPLICATION_VIEW_CACHE</param-name>
-    <param-value>false</param-value>
-  </context-param>
-
-  <!-- If this parameter is enabled, Trinidad will automatically
-       check the modification date of your JSPs, and discard saved
-       state when they change;  this makes development easier,
-       but adds overhead that should be avoided when your application
-       is deployed -->
-  <context-param>
-    <param-name>org.apache.myfaces.trinidad.CHECK_FILE_MODIFICATION</param-name>
-    <param-value>true</param-value>
-  </context-param>
-
-  <!-- Enables Change Persistence at a session scope.  By default,
-       Change Persistence is entirely disabled. The ChangeManager is
-       an API, which can persist component modifications (like,
-       is a showDetail or tree expanded or collapsed). For providing
-       a custom Change Persistence implementation inherit from the 
-       Trinidad API's ChangeManager class. As the value you have 
-       to use the fullqualified class name. -->
-  <context-param>
-    <param-name>org.apache.myfaces.trinidad.CHANGE_PERSISTENCE</param-name>
-    <param-value>session</param-value>
-  </context-param>
-
-  <filter>
-    <filter-name>trinidad</filter-name>
-    <filter-class>org.apache.myfaces.trinidad.webapp.TrinidadFilter</filter-class>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>trinidad</filter-name>
-    <servlet-name>faces</servlet-name>
-  </filter-mapping>
-
-  <!-- Faces Servlet -->
-  <servlet>
-    <servlet-name>faces</servlet-name>
-    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-  </servlet>
-  
-  <!-- resource loader servlet -->
-  <servlet>
-    <servlet-name>resources</servlet-name>
-    <servlet-class>org.apache.myfaces.trinidad.webapp.ResourceServlet</servlet-class>
-  </servlet>
-
-  <!-- Faces Servlet Mappings -->
-  <servlet-mapping>
-    <servlet-name>faces</servlet-name>
-    <url-pattern>/faces/*</url-pattern>
-  </servlet-mapping>
-  
-  <servlet-mapping>
-    <servlet-name>resources</servlet-name>
-    <url-pattern>/adf/*</url-pattern>
-  </servlet-mapping>
-
-
-  <!-- Welcome Files -->
-  <welcome-file-list>
-    <welcome-file>faces/index.jspx</welcome-file>
-  </welcome-file-list>
-
-</web-app>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/index.jspx b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/index.jspx
deleted file mode 100644
index 641c7eb..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/index.jspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-	   
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
-          xmlns:f="http://java.sun.com/jsf/core"
-          xmlns:tr="http://myfaces.apache.org/trinidad" >
-  <jsp:directive.page contentType="text/html;charset=utf-8"/>
-  <f:view>
-    <tr:document title="Apache MyFaces Trinidad Archetype Demo">
-       <tr:form>
-       
-        <tr:panelPage>
-          <tr:inputText label="Your name" id="input1" value="#{helloWorldBacking.name}" required="true"/>
-          <tr:commandButton id="button1" text="press me" action="#{helloWorldBacking.send}" />
-        </tr:panelPage>
-       
-       </tr:form>
-    </tr:document>
-  </f:view>
-</jsp:root>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/page2.jspx b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/page2.jspx
deleted file mode 100644
index 63caf44..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/page2.jspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-	   
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
-          xmlns:f="http://java.sun.com/jsf/core"
-          xmlns:tr="http://myfaces.apache.org/trinidad" >
-  <jsp:directive.page contentType="text/html;charset=utf-8"/>
-  <f:view>
-    <tr:document title="Apache MyFaces Trinidad Archetype Demo">
-       <tr:form>
-       
-        <tr:panelPage>
-          <tr:outputText id="input1" value="Hello #{helloWorldBacking.name}. We hope you enjoy Apache MyFaces Trinidad"/>
-          <tr:commandLink id="link" text="GO HOME" action="back" />
-        </tr:panelPage>
-       
-       </tr:form>
-    </tr:document>
-  </f:view>
-</jsp:root>
\ No newline at end of file
diff --git a/maven2-archetypes/pom.xml b/maven2-archetypes/pom.xml
deleted file mode 100644
index 541a55f..0000000
--- a/maven2-archetypes/pom.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2006 The Apache Software Foundation.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<!--
-  - The archetypes project defines a set of maven archetype plugins that can be
-  - used to create an initial directory tree of files when starting a new JSF
-  - project.
-  -
-  - This pom is used:
-  - * as the parent pom for all individual archetype modules, to define common settings
-  - * to define the common archetype website
-  - * as a convenient tool for building all the archetype projects.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.myfaces</groupId>
-    <artifactId>myfaces</artifactId>
-    <version>5</version>
-  </parent>
-
... 105898 lines suppressed ...

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