[maven-release-plugin] copy for tag lu4242_m2_plugins_100_release
diff --git a/maven2-archetypes/LICENSE.txt b/LICENSE.txt
similarity index 100%
rename from maven2-archetypes/LICENSE.txt
rename to LICENSE.txt
diff --git a/maven2-archetypes/NOTICE.txt b/NOTICE.txt
similarity index 100%
rename from maven2-archetypes/NOTICE.txt
rename to NOTICE.txt
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/LICENSE.txt b/maven2-archetypes/myfaces-archetype-helloworld-facelets/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/NOTICE.txt b/maven2-archetypes/myfaces-archetype-helloworld-facelets/NOTICE.txt
deleted file mode 100644
index 9987813..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-== NOTICE file corresponding to section 4(d) of the Apache License, ==
-== Version 2.0, in this case for the Apache MyFaces ==
-=========================================================================
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses
-associated with this software.
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/pom.xml
deleted file mode 100644
index ca3a86a..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 Archetype Facelets</name>
- <description>Archetype to ease the burden of creating a new application based in myfaces and facelets</description>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/maven/archetype.xml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/maven/archetype.xml
deleted file mode 100644
index 1991f80..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/META-INF/maven/archetype.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<archetype>
- <id>maven-archetype-myfaces-facelets</id>
- <sources>
- <source>src/main/java/HelloWorldBacking.java</source>
- </sources>
- <testSources>
- <!--
- <source>src/test/java/AppTest.java</source>
- -->
- </testSources>
- <resources>
- <resource>pom.xml</resource>
- <resource>src/main/webapp/WEB-INF/examples-config.xml</resource>
- <resource>src/main/webapp/WEB-INF/tomahawk.taglib.xml</resource>
- <resource>src/main/webapp/WEB-INF/web.xml</resource>
- <resource>src/main/webapp/helloWorld.xhtml</resource>
- <resource>src/main/webapp/index.jsp</resource>
- <resource>src/main/webapp/page2.xhtml</resource>
- <resource>src/main/webapp/template.xhtml</resource>
- </resources>
-</archetype>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 6e6b36a..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <packaging>war</packaging>
- <version>${version}</version>
- <name>A custom project using myfaces</name>
- <url>http://www.myorganization.org</url>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <!--This plugin allows to run the example using mvn jetty:run -->
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.8</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <repositories>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>apache-maven-snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </repository>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
- <!-- Project dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.2.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>1.2.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.tomahawk</groupId>
- <artifactId>tomahawk</artifactId>
- <version>1.1.6</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>1.1.11</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/java/HelloWorldBacking.java b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/java/HelloWorldBacking.java
deleted file mode 100644
index c79989a..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/java/HelloWorldBacking.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package $package;
-
-/**
- * A typical simple backing bean, that is backed to <code>helloworld.jsp</code>
- *
- * @author <a href="mailto:matzew@apache.org">Matthias Weßendorf</a>
- */
-public class HelloWorldBacking
-{
-
- //properties
- private String name;
-
- /**
- * default empty constructor
- */
- public HelloWorldBacking()
- {
- }
-
- //-------------------getter & setter
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- /**
- * Method that is backed to a submit button of a form.
- */
- public String send()
- {
- //do real logic
- return ("success");
- }
-}
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/examples-config.xml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/examples-config.xml
deleted file mode 100644
index 4dfab50..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/examples-config.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd" >
-
-<faces-config>
-
- <application>
- <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
- </application>
-
- <!-- managed beans of the simple hello world app -->
- <managed-bean>
- <managed-bean-name>helloWorldBacking</managed-bean-name>
- <managed-bean-class>
- ${package}.HelloWorldBacking
- </managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
-
- <!-- navigation rules for helloWorld.jsp -->
- <navigation-rule>
- <from-view-id>/helloWorld.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>success</from-outcome>
- <to-view-id>/page2.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <!-- navigation rules for page2.jsp -->
- <navigation-rule>
- <from-view-id>/page2.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>back</from-outcome>
- <to-view-id>/helloWorld.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-</faces-config>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tomahawk.taglib.xml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tomahawk.taglib.xml
deleted file mode 100644
index b9fc141..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tomahawk.taglib.xml
+++ /dev/null
@@ -1,458 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE facelet-taglib PUBLIC "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" "facelet-taglib_1_0.dtd">
-<facelet-taglib>
- <!-- author: thomas.jachmann@mindmatters.de -->
- <namespace>http://myfaces.apache.org/tomahawk</namespace>
- <tag>
- <tag-name>commandButton</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlCommandButton</component-type>
- <renderer-type>org.apache.myfaces.Button</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>commandLink</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlCommandLink</component-type>
- <renderer-type>org.apache.myfaces.Link</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>dataTable</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlDataTable</component-type>
- <renderer-type>org.apache.myfaces.Table</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>inputHidden</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlInputHidden</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>inputSecret</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlInputSecret</component-type>
- <renderer-type>org.apache.myfaces.Secret</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>inputText</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlInputText</component-type>
- <renderer-type>org.apache.myfaces.Text</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>inputTextHelp</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlInputTextHelp</component-type>
- <renderer-type>org.apache.myfaces.TextHelp</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>inputTextarea</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlInputTextarea</component-type>
- <renderer-type>org.apache.myfaces.Textarea</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>graphicImage</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlGraphicImage</component-type>
- <renderer-type>org.apache.myfaces.Image</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>message</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlMessage</component-type>
- <renderer-type>org.apache.myfaces.Message</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>messages</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlMessages</component-type>
- <renderer-type>org.apache.myfaces.Messages</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>outputLabel</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlOutputLabel</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>outputText</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlOutputText</component-type>
- <renderer-type>org.apache.myfaces.Text</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>panelGrid</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlPanelGrid</component-type>
- <renderer-type>org.apache.myfaces.Grid</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>panelGroup</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlPanelGroup</component-type>
- <renderer-type>org.apache.myfaces.Group</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>selectOneMenu</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlSelectOneMenu</component-type>
- <renderer-type>org.apache.myfaces.Menu</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>selectManyMenu</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlSelectManyMenu</component-type>
- <renderer-type>org.apache.myfaces.Menu</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>selectOneRadio</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlSelectOneRadio</component-type>
- <renderer-type>org.apache.myfaces.Radio</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>selectBooleanCheckbox</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlSelectBooleanCheckbox</component-type>
- <renderer-type>org.apache.myfaces.Checkbox</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>selectManyCheckbox</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlSelectManyCheckbox</component-type>
- <renderer-type>org.apache.myfaces.Checkbox</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>selectOneListbox</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlSelectOneListbox</component-type>
- <renderer-type>org.apache.myfaces.Listbox</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>selectManyListbox</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlSelectManyListbox</component-type>
- <renderer-type>org.apache.myfaces.Listbox</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>inputCalendar</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlInputCalendar</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>jsValueChangeListener</tag-name>
- <component>
- <component-type>org.apache.myfaces.JsValueChangeListener</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>jsValueSet</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlJsValueSet</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>checkbox</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlCheckbox</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>commandNavigation</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlCommandNavigation</component-type>
- <renderer-type>org.apache.myfaces.Navigation</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>commandNavigation2</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlCommandNavigationItem</component-type>
- <renderer-type>org.apache.myfaces.NavigationMenu</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>commandSortHeader</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlCommandSortHeader</component-type>
- <renderer-type>org.apache.myfaces.SortHeader</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>dataList</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlDataList</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>dataScroller</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlDataScroller</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>inputDate</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlInputDate</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>inputFileUpload</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlInputFileUpload</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>inputHtml</tag-name>
- <component>
- <component-type>org.apache.myfaces.InputHtml</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>navigationMenuItem</tag-name>
- <component>
- <component-type>org.apache.myfaces.NavigationMenuItem</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>navigationMenuItems</tag-name>
- <component>
- <component-type>javax.faces.SelectItems</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>jscookMenu</tag-name>
- <component>
- <component-type>org.apache.myfaces.JSCookMenu</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>panelLayout</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlPanelLayout</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>panelNavigation</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlPanelNavigation</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>panelNavigation2</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlPanelNavigationMenu</component-type>
- <renderer-type>org.apache.myfaces.NavigationMenu</renderer-type>
- </component>
- </tag>
- <tag>
- <tag-name>panelTab</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlPanelTab</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>panelTabbedPane</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlPanelTabbedPane</component-type>
- </component>
- </tag>
- <!-- deactivated since there's no component! tag>
- <tag-name>tabChangeListener</tag-name>
- <component>
- <component-type></component-type>
- </component>
- </tag-->
- <tag>
- <tag-name>collapsiblePanel</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlCollapsiblePanel</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>selectOneCountry</tag-name>
- <component>
- <component-type>org.apache.myfaces.SelectOneCountry</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>selectOneLanguage</tag-name>
- <component>
- <component-type>org.apache.myfaces.SelectOneLanguage</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>stylesheet</tag-name>
- <component>
- <component-type>org.apache.myfaces.Stylesheet</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>div</tag-name>
- <component>
- <component-type>org.apache.myfaces.Div</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>htmlTag</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlTag</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>radio</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlRadio</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>tree</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlTree</component-type>
- <renderer-type>org.apache.myfaces.HtmlTree</renderer-type>
- </component>
- </tag>
- <!-- deactivated since there's no component! tag>
- <tag-name>treeSelectionListener</tag-name>
- <component>
- <component-type></component-type>
- </component>
- </tag-->
- <!-- deactivated since there's no component! tag>
- <tag-name>iconProvider</tag-name>
- <component>
- <component-type></component-type>
- </component>
- </tag-->
- <tag>
- <tag-name>treeColumn</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlTreeColumn</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>treeCheckbox</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlTreeCheckbox</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>tree2</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlTree2</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>panelStack</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlPanelStack</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>popup</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlPopup</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>newspaperTable</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlNewspaperTable</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>aliasBean</tag-name>
- <component>
- <component-type>org.apache.myfaces.AliasBean</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>aliasBeansScope</tag-name>
- <component>
- <component-type>org.apache.myfaces.AliasBeansScope</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>buffer</tag-name>
- <component>
- <component-type>org.apache.myfaces.Buffer</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>saveState</tag-name>
- <component>
- <component-type>org.apache.myfaces.SaveState</component-type>
- </component>
- </tag>
- <!-- deactivated since there's no component! tag>
- <tag-name>updateActionListener</tag-name>
- <component>
- <component-type></component-type>
- </component>
- </tag-->
- <tag>
- <tag-name>validateCreditCard</tag-name>
- <validator>
- <validator-id>org.apache.myfaces.validator.CreditCard</validator-id>
- </validator>
- </tag>
- <tag>
- <tag-name>validateEmail</tag-name>
- <validator>
- <validator-id>org.apache.myfaces.validator.Email</validator-id>
- </validator>
- </tag>
- <tag>
- <tag-name>validateEqual</tag-name>
- <validator>
- <validator-id>org.apache.myfaces.validator.Equal</validator-id>
- </validator>
- </tag>
- <tag>
- <tag-name>swapImage</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlSwapImage</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>columns</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlColumns</component-type>
- </component>
- </tag>
- <tag>
- <tag-name>column</tag-name>
- <component>
- <component-type>org.apache.myfaces.HtmlColumn</component-type>
- </component>
- </tag>
- <!-- additional validators (note: not in tld, so no code completion) -->
- <tag>
- <tag-name>validateRegExpr</tag-name>
- <validator>
- <validator-id>org.apache.myfaces.validator.RegExpr</validator-id>
- </validator>
- </tag>
-</facelet-taglib>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index e5a6b50..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,284 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <description>MyProject web.xml</description>
-
- <context-param>
- <param-name>
- org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL
- </param-name>
- <param-value>true</param-value>
- </context-param>
-
- <!-- Configure tomahawk taglib -->
- <context-param>
- <param-name>facelets.LIBRARIES</param-name>
- <param-value>/WEB-INF/tomahawk.taglib.xml</param-value>
- </context-param>
-
- <!-- Use Documents Saved as *.xhtml -->
- <context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.xhtml</param-value>
- </context-param>
-
- <!-- Special Debug Output for Development -->
- <context-param>
- <param-name>facelets.DEVELOPMENT</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <description>
- Comma separated list of URIs of (additional) faces config
- files. (e.g. /WEB-INF/my-config.xml) See JSF 1.0 PRD2,
- 10.3.2 Attention: You do not need to put
- /WEB-INF/faces-config.xml in here.
- </description>
- <param-name>javax.faces.CONFIG_FILES</param-name>
- <param-value>/WEB-INF/examples-config.xml</param-value>
- </context-param>
- <context-param>
- <description>
- State saving method: "client" or "server" (= default) See
- JSF Specification 2.5.3
- </description>
- <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
- <param-value>client</param-value>
- </context-param>
- <context-param>
- <description>
- Only applicable if state saving method is "server" (=
- default). Defines the amount (default = 20) of the latest
- views are stored in session.
- </description>
- <param-name>
- org.apache.myfaces.NUMBER_OF_VIEWS_IN_SESSION
- </param-name>
- <param-value>20</param-value>
- </context-param>
- <context-param>
- <description>
- Only applicable if state saving method is "server" (=
- default). If true (default) the state will be serialized to
- a byte stream before it is written to the session. If false
- the state will not be serialized to a byte stream.
- </description>
- <param-name>
- org.apache.myfaces.SERIALIZE_STATE_IN_SESSION
- </param-name>
- <param-value>true</param-value>
- </context-param>
- <context-param>
- <description>
- Only applicable if state saving method is "server" (=
- default) and if
- org.apache.myfaces.SERIALIZE_STATE_IN_SESSION is true (=
- default) If true (default) the serialized state will be
- compressed before it is written to the session. If false the
- state will not be compressed.
- </description>
- <param-name>
- org.apache.myfaces.COMPRESS_STATE_IN_SESSION
- </param-name>
- <param-value>true</param-value>
- </context-param>
- <context-param>
- <description>
- This parameter tells MyFaces if javascript code should be
- allowed in the rendered HTML output. If javascript is
- allowed, command_link anchors will have javascript code that
- submits the corresponding form. If javascript is not
- allowed, the state saving info and nested parameters will be
- added as url parameters. Default: "true"
- </description>
- <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
- <param-value>true</param-value>
- </context-param>
- <context-param>
- <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
- <param-value>false</param-value>
- </context-param>
- <context-param>
- <description>
- If true, rendered HTML code will be formatted, so that it is
- "human readable". i.e. additional line separators and
- whitespace will be written, that do not influence the HTML
- code. Default: "true"
- </description>
- <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
- <param-value>true</param-value>
- </context-param>
- <context-param>
- <description>
- If true, a javascript function will be rendered that is able
- to restore the former vertical scroll on every request.
- Convenient feature if you have pages with long lists and you
- do not want the browser page to always jump to the top if
- you trigger a link or button action that stays on the same
- page. Default: "false"
- </description>
- <param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <description>
- Used for encrypting view state. Only relevant for client
- side state saving. See MyFaces wiki/web site documentation
- for instructions on how to configure an application for
- diffenent encryption strengths.
- </description>
- <param-name>org.apache.myfaces.SECRET</param-name>
- <param-value>NzY1NDMyMTA=</param-value>
- </context-param>
-
- <context-param>
- <description>
- Validate managed beans, navigation rules and ensure that
- forms are not nested.
- </description>
- <param-name>org.apache.myfaces.VALIDATE</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <description>
- Treat readonly same as if disabled attribute was set for
- select elements.
- </description>
- <param-name>
- org.apache.myfaces.READONLY_AS_DISABLED_FOR_SELECTS
- </param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <description>
- Use the defined class as the class which will be called when
- a resource is added to the ExtensionFilter handling. Using
- StreamingAddResource here helps with performance. If you
- want to add custom components and want to use the
- ExtensionFilter, you need to provide your custom
- implementation here.
- </description>
- <param-name>org.apache.myfaces.ADD_RESOURCE_CLASS</param-name>
- <param-value>
- org.apache.myfaces.renderkit.html.util.DefaultAddResource
- </param-value>
- </context-param>
-
- <context-param>
- <description>
- Virtual path in the URL which triggers loading of resources
- for the MyFaces extended components in the ExtensionFilter.
- </description>
- <param-name>
- org.apache.myfaces.RESOURCE_VIRTUAL_PATH
- </param-name>
- <param-value>/faces/myFacesExtensionResource</param-value>
- </context-param>
-
- <context-param>
- <description>
- Check if the extensions-filter has been properly configured.
- </description>
- <param-name>
- org.apache.myfaces.CHECK_EXTENSIONS_FILTER
- </param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <description>
- Define partial state saving as true/false.
- </description>
- <param-name>javax.faces.PARTIAL_STATE_SAVING_METHOD</param-name>
- <param-value>false</param-value>
- </context-param>
-
- <!-- Extensions Filter -->
- <filter>
- <filter-name>extensionsFilter</filter-name>
- <filter-class>
- org.apache.myfaces.webapp.filter.ExtensionsFilter
- </filter-class>
- <init-param>
- <description>
- Set the size limit for uploaded files. Format: 10 - 10
- bytes 10k - 10 KB 10m - 10 MB 1g - 1 GB
- </description>
- <param-name>uploadMaxFileSize</param-name>
- <param-value>100m</param-value>
- </init-param>
- <init-param>
- <description>
- Set the threshold size - files below this limit are
- stored in memory, files above this limit are stored on
- disk.
-
- Format: 10 - 10 bytes 10k - 10 KB 10m - 10 MB 1g - 1 GB
- </description>
- <param-name>uploadThresholdSize</param-name>
- <param-value>100k</param-value>
- </init-param>
- </filter>
-
- <filter-mapping>
- <filter-name>extensionsFilter</filter-name>
- <url-pattern>*.jsf</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>extensionsFilter</filter-name>
- <url-pattern>/faces/*</url-pattern>
- </filter-mapping>
-
- <!-- Listener, to allow Jetty serving MyFaces apps -->
- <listener>
- <listener-class>
- org.apache.myfaces.webapp.StartupServletContextListener
- </listener-class>
- </listener>
-
- <!-- Faces Servlet -->
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <!-- Faces Servlet Mapping -->
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.jsf</url-pattern>
- </servlet-mapping>
-
- <!-- Welcome files -->
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>index.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml
deleted file mode 100644
index 51fd399..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/helloWorld.xhtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html">
-<head>
-<title>Hello World</title>
-</head>
-<body>
-<ui:composition template="/template.xhtml">
-
- <ui:define name="body">
- <h:form id="form">
- <h:panelGrid id="grid" columns="2">
- <h:outputText id="output1" value="Please enter your name" />
- <h:inputText id="input1" value="#{helloWorldBacking.name}"
- required="true" />
- <h:commandButton id="button1" value="press me"
- action="#{helloWorldBacking.send}" />
- <h:message id="message1" for="input1" />
- </h:panelGrid>
- </h:form>
- </ui:define>
-</ui:composition>
-</body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/index.jsp
deleted file mode 100644
index a29c228..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page session="false"%>
-<%
-response.sendRedirect("helloWorld.jsf");
-%>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
deleted file mode 100644
index d5713c6..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/page2.xhtml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html">
-<head>
-<title>Hello World</title>
-</head>
-<body>
-
-<f:view>
- <h:outputText
- value="Hello #{helloWorldBacking.name}. We hope you enjoy Apache MyFaces" />
- <h:form id="form2">
- <h:commandLink id="link1" action="back">
- <h:outputText id="linkText" value="GO HOME" />
- </h:commandLink>
- </h:form>
-</f:view>
-</body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/template.xhtml b/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/template.xhtml
deleted file mode 100644
index 7cf88b1..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/src/main/webapp/template.xhtml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<title>Myfaces Example Facelets</title>
-</head>
-
-<body>
-<h1><ui:insert name="title">Myfaces Example Facelets</ui:insert></h1>
-<p><ui:insert name="body">Hello World Example!</ui:insert></p>
-</body>
-
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/pom.xml
deleted file mode 100644
index afb8d8d..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-archetype-parent</artifactId>
- <version>1.0.2-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-archetype-helloworld-portlets</artifactId>
- <packaging>maven-plugin</packaging>
- <name>MyFaces Portlet Archetype</name>
- <description>Archetype to ease the burden of creating a new portlet application based in myfaces</description>
-
-</project>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/archetype.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index 749e789..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-
- @author Leonardo Uribe (latest modification by $Author$)
- @version $Revision$ $Date$
-
--->
-
-<archetype>
- <id>myfaces-archetype-helloworld-portlets</id>
- <resources>
- <resource>src/main/java/org/apache/myfaces/portlet/faces/demo/helloworld/NameBean.java</resource>
- <resource>src/main/webapp/index.jsp</resource>
- <resource>src/main/webapp/edit.jsp</resource>
- <resource>src/main/webapp/help.jsp</resource>
- <resource>src/main/webapp/helloworld/hello.jsp</resource>
- <resource>src/main/webapp/helloworld/index.jsp</resource>
- <resource>src/main/webapp/WEB-INF/web.xml</resource>
- <resource>src/main/webapp/WEB-INF/portlet.xml</resource>
- <resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
- <resource>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</resource>
- </resources>
-</archetype>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 404cc1c..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <packaging>war</packaging>
- <version>${version}</version>
- <name>A custom project using myfaces</name>
- <url>http://www.myorganization.org</url>
-
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>portlet-api</groupId>
- <artifactId>portlet-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.portlet-bridge</groupId>
- <artifactId>portlet-bridge-api</artifactId>
- <version>1.0.0-alpha-2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.portlet-bridge</groupId>
- <artifactId>portlet-bridge-impl</artifactId>
- <version>1.0.0-alpha-2</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-jdev-plugin</artifactId>
- <groupId>org.apache.myfaces.trinidadbuild</groupId>
- <configuration>
- <libraries>
- <library>JSP Runtime</library>
- </libraries>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <jsf.version>1.2_03</jsf.version>
- </properties>
-
- <profiles>
- <!-- sets up the webapp for deployment to pluto "mvn clean install -Ppluto" -->
- <profile>
- <id>pluto</id>
- <build>
- <plugins>
- <!-- configure maven-war-plugin to use updated web.xml -->
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>
- ${project.build.directory}/pluto-resources/web.xml
- </webXml>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.pluto</groupId>
- <artifactId>maven-pluto-plugin</artifactId>
- <version>1.1.4</version>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- To run jetty, issue "mvn clean -PjettyConfig jetty:run" -->
- <profile>
- <id>jettyConfig</id>
- <dependencies>
- <dependency>
- <groupId>com.bekk.boss</groupId>
- <artifactId>maven-jetty-pluto-embedded</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
- <webDefaultXml>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
- <systemProperties>
- <systemProperty>
- <name>org.apache.pluto.embedded.portletId</name>
- <value>${artifactId}</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.pluto</groupId>
- <artifactId>maven-pluto-plugin</artifactId>
- <version>1.1.4</version>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- By default the war examples use myfaces! :) -->
- <profile>
- <id>myfaces</id>
- <activation>
- <property>
- <name>!jsf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.2.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>1.2.2</version>
- </dependency>
- </dependencies>
- </profile>
-
- <!-- To use the examples using the Sun's JSF Reference Implementation: mvn clean install -Djsf=ri -->
- <profile>
- <id>jsfri</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${jsf.version}</version>
- </dependency>
- </dependencies>
- <properties>
- <jsf_implementation>JSF-RI</jsf_implementation>
- </properties>
- </profile>
-
- <profile>
- <id>jsfri-provided</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri-provided</value>
- </property>
- </activation>
-
- <repositories>
- <repository>
- <id>java.net</id>
- <name>java.net Maven 1 Repository</name>
- <url>https://maven-repository.dev.java.net/nonav/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${jsf.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>${jsf.version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- <properties>
- <jsf_implementation>JSF-RI</jsf_implementation>
- </properties>
- </profile>
- </profiles>
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/portlet/faces/demo/helloworld/NameBean.java b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/portlet/faces/demo/helloworld/NameBean.java
deleted file mode 100644
index 7a55842..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/portlet/faces/demo/helloworld/NameBean.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.apache.myfaces.portlet.faces.demo.helloworld;
-
-public class NameBean
-{
- public String _name;
-
- public NameBean()
- {
- }
-
- public void setName(String _name)
- {
- this._name = _name;
- }
-
- public String getName()
- {
- return _name;
- }
-}
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/resources/log4j.properties
deleted file mode 100644
index a16da0a..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-#for debugging log4j itself
-log4j.debug=false
-
-#Logger-Priorities:
-#DEBUG lowest, prints all messages
-#INFO prints all messages with FATAL, ERROR, WARN or INFO priority
-#WARN prints all messages with FATAL, ERROR or WARN priority
-#ERROR prints all messages with FATAL or ERROR priority
-#FATAL highest, prints only FATAL messages
-
-# root logger
-log4j.rootLogger=INFO, A1
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
-
-# myfaces logger
-log4j.logger.org.apache.myfaces=INFO
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
deleted file mode 100644
index b821653..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-<faces-config xmlns="http://java.sun.com/JSF/Configuration">
- <navigation-rule>
- <from-view-id>*</from-view-id>
- <navigation-case>
- <from-outcome>helloWorld</from-outcome>
- <to-view-id>/helloworld/index.jsp</to-view-id>
- </navigation-case>
- </navigation-rule>
- <navigation-rule>
- <from-view-id>/helloworld/index.jsp</from-view-id>
- <navigation-case>
- <from-outcome>sayhello</from-outcome>
- <to-view-id>/helloworld/hello.jsp</to-view-id>
- </navigation-case>
- </navigation-rule>
- <managed-bean>
- <managed-bean-name>namebean</managed-bean-name>
- <managed-bean-class>org.apache.myfaces.portlet.faces.demo.helloworld.NameBean</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
-</faces-config>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
deleted file mode 100644
index 80ab83f..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
+++ /dev/null
Binary files differ
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
deleted file mode 100644
index 7830c6d..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<portlet-app version="1.0"
- xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
-
- <portlet>
- <description lang="EN">MyFaces Portlet Bridge Demo Portlet</description>
- <portlet-name>${artifactId}</portlet-name>
- <display-name lang="EN">MyFaces Portlet Bridge Demo</display-name>
- <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
-
- <init-param>
- <name>javax.portlet.faces.defaultViewId.view</name>
- <value>/index.jsp</value>
- </init-param>
-
- <init-param>
- <name>javax.portlet.faces.defaltViewId.edit</name>
- <value>/edit.jsp</value>
- </init-param>
-
- <init-param>
- <name>javax.portlet.faces.defaultViewId.help</name>
- <value>/help.jsp</value>
- </init-param>
-
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>edit</portlet-mode>
- <portlet-mode>view</portlet-mode>
- <portlet-mode>help</portlet-mode>
- </supports>
-
- <supported-locale>en</supported-locale>
-
- <portlet-info>
- <title>MyFaces Portlet Bridge Demo</title>
- <short-title>Bridge Demo</short-title>
- </portlet-info>
- </portlet>
-
-</portlet-app>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 4a409e4..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version = '1.0' encoding = 'ISO-8859-1'?>
-<!DOCTYPE web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN' 'http://java.sun.com/dtd/web-app_2_3.dtd'>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<!-- The Jetty Pluto Plugin needs to have a Webapp 2.3 web-xml. Don't know why. -->
-<web-app>
-
- <context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.jsp</param-value>
- </context-param>
-
- <!-- Listener, to allow Jetty serving MyFaces apps -->
- <!-- TODO: is this needed anymore for jetty? I don't think so.. -->
- <!-- listener>
- <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
- </listener -->
-
- <!-- Faces Servlet -->
- <servlet>
- <servlet-name>faces</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <!-- Faces Servlet Mappings -->
- <!--
- In this demo application, I chose to use suffix mapping. I did this because it makes urls
- in the portlet world look nicer in the source. The portlet url should be the same
- reguardless.
- -->
- <servlet-mapping>
- <servlet-name>faces</servlet-name>
- <url-pattern>*.jsf</url-pattern>
- </servlet-mapping>
-
-</web-app>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/edit.jsp b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/edit.jsp
deleted file mode 100644
index f7b780d..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/edit.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<f:view>
- <html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>index</title>
- </head>
- <body>
- <h:form>
- <h:panelGrid columns="1">
- <h:outputText value="This is the portlet edit screen."/>
- </h:panelGrid>
- </h:form>
- </body>
- </html>
-</f:view>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/hello.jsp b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/hello.jsp
deleted file mode 100644
index 750b2fa..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/hello.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<f:view>
- <html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>hello</title>
- </head>
- <body>
- <h:form>
- <h:panelGrid columns="1">
- <h:outputText value="Hello #{namebean.name}"/>
- <h:commandButton value="return" action="helloWorld"/>
- </h:panelGrid>
- </h:form>
- </body>
- </html>
-</f:view>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/index.jsp b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/index.jsp
deleted file mode 100644
index 2b5743a..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/helloworld/index.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<f:view>
- <html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>index</title>
- </head>
- <body>
- <h:form>
- <h:panelGrid columns="1">
- <h:panelGrid columns="2">
- <h:outputText value="Please enter your name: "/>
- <h:inputText value="#{namebean.name}"/>
- </h:panelGrid>
- <h:commandButton value="Click Here" action="sayhello"/>
- </h:panelGrid>
- </h:form>
- </body>
- </html>
-</f:view>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/help.jsp b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/help.jsp
deleted file mode 100644
index e387c18..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/help.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<f:view>
- <html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>index</title>
- </head>
- <body>
- <h:form>
- <h:panelGrid columns="1">
- <h:outputText value="This is the portlet help screen."/>
- </h:panelGrid>
- </h:form>
- </body>
- </html>
-</f:view>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/index.jsp
deleted file mode 100644
index 33e20e9..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld-portlets/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<f:view>
- <html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>index</title>
- </head>
- <body>
- <h:form>
- <h:panelGrid columns="1">
- <h:outputText value="Please select:"/>
- <h:panelGroup>
- <ul>
- <li>
- <h:commandLink value="HelloWorld example" action="helloWorld"/>
- </li>
- </ul>
- </h:panelGroup>
- </h:panelGrid>
- </h:form>
- </body>
- </html>
-</f:view>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/LICENSE.txt b/maven2-archetypes/myfaces-archetype-helloworld/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/NOTICE.txt b/maven2-archetypes/myfaces-archetype-helloworld/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-== NOTICE file corresponding to section 4(d) of the Apache License, ==
-== Version 2.0, in this case for the Apache MyFaces Maven Plugins ==
-=========================================================================
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses
-associated with this software.
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld/pom.xml
deleted file mode 100644
index fde1c03..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-archetype-parent</artifactId>
- <version>1.0.2-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-archetype-helloworld</artifactId>
- <packaging>maven-plugin</packaging>
- <name>MyFaces Archetype</name>
- <description>Archetype to ease the burden of creating a new application based in myfaces</description>
-
-</project>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/archetype.xml b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index 8d6effb..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-
- @author Bruno Aranda (latest modification by $Author: grantsmith $)
- @version $Revision: 472560 $ $Date: 2006-11-08 18:45:25 +0100 (Mi, 08 Nov 2006) $
-
--->
-
-<archetype>
- <id>myfaces-archetype-helloworld</id>
- <resources>
- <resource>src/main/java/org/apache/myfaces/blank/HelloWorldController.java</resource>
- <resource>src/main/webapp/index.jsp</resource>
- <resource>src/main/webapp/helloWorld.jsp</resource>
- <resource>src/main/webapp/page2.jsp</resource>
- <resource>src/main/webapp/WEB-INF/web.xml</resource>
- <resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
- </resources>
-</archetype>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 1bea129..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <packaging>war</packaging>
- <version>${version}</version>
- <name>A custom project using myfaces</name>
- <url>http://www.myorganization.org</url>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <!--This plugin allows to run the example using mvn jetty:run -->
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.8</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <repositories>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>apache-maven-snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </repository>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
- <!-- Project dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.2.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>1.2.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.tomahawk</groupId>
- <artifactId>tomahawk</artifactId>
- <version>1.1.6</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldController.java b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldController.java
deleted file mode 100644
index c62289b..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/blank/HelloWorldController.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-*/
-package org.apache.myfaces.blank;
-
-/**
- * A typical simple backing bean, that is backed to <code>helloworld.jsp</code>
- *
- */
-public class HelloWorldController {
-
-
- //properties
- private String name;
-
- /**
- * default empty constructor
- */
- public HelloWorldController(){
- }
-
- //-------------------getter & setter
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * Method that is backed to a submit button of a form.
- */
- public String send(){
- //do real logic, return a string which will be used for the navigation system of JSF
- return "success";
- }
-}
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/resources/log4j.properties
deleted file mode 100644
index a16da0a..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-#for debugging log4j itself
-log4j.debug=false
-
-#Logger-Priorities:
-#DEBUG lowest, prints all messages
-#INFO prints all messages with FATAL, ERROR, WARN or INFO priority
-#WARN prints all messages with FATAL, ERROR or WARN priority
-#ERROR prints all messages with FATAL or ERROR priority
-#FATAL highest, prints only FATAL messages
-
-# root logger
-log4j.rootLogger=INFO, A1
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
-
-# myfaces logger
-log4j.logger.org.apache.myfaces=INFO
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
deleted file mode 100644
index d698d66..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-
-<faces-config version="1.2"
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
-
- <!-- managed beans of the simple hello world app -->
- <managed-bean>
- <managed-bean-name>helloWorld</managed-bean-name>
- <managed-bean-class>org.apache.myfaces.blank.HelloWorldController</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
-
- <!-- navigation rules for helloWorld.jsp -->
- <navigation-rule>
- <from-view-id>/helloWorld.jsp</from-view-id>
- <navigation-case>
- <from-outcome>success</from-outcome>
- <to-view-id>/page2.jsp</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <!-- navigation rules for page2.jsp -->
- <navigation-rule>
- <from-view-id>/page2.jsp</from-view-id>
- <navigation-case>
- <from-outcome>back</from-outcome>
- <to-view-id>/helloWorld.jsp</to-view-id>
- </navigation-case>
- </navigation-rule>
-</faces-config>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index e3ad41b..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <description>MyProject web.xml</description>
-
- <!--optional: context-param>
- <description>Comma separated list of URIs of (additional) faces config files.
- (e.g. /WEB-INF/my-config.xml)
- See JSF 1.0 PRD2, 10.3.2
- Attention: You do not need to put /WEB-INF/faces-config.xml in here.
- </description>
- <param-name>javax.faces.CONFIG_FILES</param-name>
- <param-value>/WEB-INF/examples-config.xml</param-value>
- </context-param-->
- <context-param>
- <description>State saving method: "client" or "server" (= default)
- See JSF Specification 2.5.3</description>
- <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
- <param-value>client</param-value>
- </context-param>
- <context-param>
- <description>Only applicable if state saving method is "server" (= default).
- Defines the amount (default = 20) of the latest views are stored in session.</description>
- <param-name>org.apache.myfaces.NUMBER_OF_VIEWS_IN_SESSION</param-name>
- <param-value>20</param-value>
- </context-param>
- <context-param>
- <description>Only applicable if state saving method is "server" (= default).
- If true (default) the state will be serialized to a byte stream before it
- is written to the session.
- If false the state will not be serialized to a byte stream.</description>
- <param-name>org.apache.myfaces.SERIALIZE_STATE_IN_SESSION</param-name>
- <param-value>true</param-value>
- </context-param>
- <context-param>
- <description>Only applicable if state saving method is "server" (= default) and if
- org.apache.myfaces.SERIALIZE_STATE_IN_SESSION is true (= default)
- If true (default) the serialized state will be compressed before it
- is written to the session. If false the state will not be compressed.</description>
- <param-name>org.apache.myfaces.COMPRESS_STATE_IN_SESSION</param-name>
- <param-value>true</param-value>
- </context-param>
- <context-param>
- <description>This parameter tells MyFaces if javascript code should be allowed in the
- rendered HTML output.
- If javascript is allowed, command_link anchors will have javascript code
- that submits the corresponding form.
- If javascript is not allowed, the state saving info and nested parameters
- will be added as url parameters.
- Default: "true"</description>
- <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
- <param-value>true</param-value>
- </context-param>
- <context-param>
- <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
- <param-value>false</param-value>
- </context-param>
- <context-param>
- <description>If true, rendered HTML code will be formatted, so that it is "human readable".
- i.e. additional line separators and whitespace will be written, that do not
- influence the HTML code.
- Default: "true"</description>
- <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
- <param-value>true</param-value>
- </context-param>
- <context-param>
- <description>If true, a javascript function will be rendered that is able to restore the
- former vertical scroll on every request. Convenient feature if you have pages
- with long lists and you do not want the browser page to always jump to the top
- if you trigger a link or button action that stays on the same page.
- Default: "false"</description>
- <param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <description>Used for encrypting view state. Only relevant for client side
- state saving. See MyFaces wiki/web site documentation for instructions
- on how to configure an application for diffenent encryption strengths.
- </description>
- <param-name>org.apache.myfaces.SECRET</param-name>
- <param-value>NzY1NDMyMTA=</param-value>
- </context-param>
-
- <context-param>
- <description>
- Validate managed beans, navigation rules and ensure that forms are not nested.
- </description>
- <param-name>org.apache.myfaces.VALIDATE</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <description>
- Treat readonly same as if disabled attribute was set for select elements.
- </description>
- <param-name>org.apache.myfaces.READONLY_AS_DISABLED_FOR_SELECTS</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <description>
- Use the defined class as the class which will be called when a resource is added to the
- ExtensionFilter handling. Using StreamingAddResource here helps with performance. If you want to add
- custom components and want to use the ExtensionFilter, you need to provide your custom implementation here.
- </description>
- <param-name>org.apache.myfaces.ADD_RESOURCE_CLASS</param-name>
- <param-value>org.apache.myfaces.renderkit.html.util.DefaultAddResource</param-value>
- </context-param>
-
- <context-param>
- <description>
- Virtual path in the URL which triggers loading of resources for the MyFaces extended components
- in the ExtensionFilter.
- </description>
- <param-name>org.apache.myfaces.RESOURCE_VIRTUAL_PATH</param-name>
- <param-value>/faces/myFacesExtensionResource</param-value>
- </context-param>
-
- <context-param>
- <description>
- Check if the extensions-filter has been properly configured.
- </description>
- <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <context-param>
- <description>
- Define partial state saving as true/false.
- </description>
- <param-name>javax.faces.PARTIAL_STATE_SAVING_METHOD</param-name>
- <param-value>false</param-value>
- </context-param>
-
- <!-- Extensions Filter -->
- <filter>
- <filter-name>extensionsFilter</filter-name>
- <filter-class>org.apache.myfaces.webapp.filter.ExtensionsFilter</filter-class>
- <init-param>
- <description>Set the size limit for uploaded files.
- Format: 10 - 10 bytes
- 10k - 10 KB
- 10m - 10 MB
- 1g - 1 GB</description>
- <param-name>uploadMaxFileSize</param-name>
- <param-value>100m</param-value>
- </init-param>
- <init-param>
- <description>Set the threshold size - files
- below this limit are stored in memory, files above
- this limit are stored on disk.
-
- Format: 10 - 10 bytes
- 10k - 10 KB
- 10m - 10 MB
- 1g - 1 GB</description>
- <param-name>uploadThresholdSize</param-name>
- <param-value>100k</param-value>
- </init-param>
- </filter>
-
- <filter-mapping>
- <filter-name>extensionsFilter</filter-name>
- <url-pattern>*.jsf</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>extensionsFilter</filter-name>
- <url-pattern>/faces/*</url-pattern>
- </filter-mapping>
-
- <!-- Listener, to allow Jetty serving MyFaces apps -->
- <listener>
- <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
- </listener>
-
- <!-- Faces Servlet -->
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <!-- Faces Servlet Mapping -->
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.jsf</url-pattern>
- </servlet-mapping>
-
- <!-- Welcome files -->
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>index.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
deleted file mode 100644
index 1334d73..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/helloWorld.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<html>
- <head>
- <title>Hello World</title>
- </head>
- <body>
- <f:view>
- <h:form id="mainForm">
- <h:panelGrid columns="2">
- <h:outputLabel for="name" value="Please enter your name" />
- <h:inputText id="name" value="#{helloWorld.name}" required="true"/>
- <h:commandButton value="Press me" action="#{helloWorld.send}"/>
- <h:messages showDetail="true" showSummary="false"/>
- </h:panelGrid>
- </h:form>
- </f:view>
- </body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/index.jsp b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/index.jsp
deleted file mode 100644
index a29c228..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,4 +0,0 @@
-<%@ page session="false"%>
-<%
-response.sendRedirect("helloWorld.jsf");
-%>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/page2.jsp b/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
deleted file mode 100644
index 6d12c41..0000000
--- a/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/src/main/webapp/page2.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<html>
- <head>
- <title>Hello World</title>
- </head>
- <body>
- <f:view>
- <h:form id="mainForm">
- <h2><h:outputText value="Hello #{helloWorld.name}. We hope you enjoy Apache MyFaces"/></h2>
- <h:commandLink action="back">
- <h:outputText value="Home"/>
- </h:commandLink>
- </h:form>
- </f:view>
- </body>
-</html>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/LICENSE.txt b/maven2-archetypes/myfaces-archetype-jsfcomponents/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/NOTICE.txt b/maven2-archetypes/myfaces-archetype-jsfcomponents/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-== NOTICE file corresponding to section 4(d) of the Apache License, ==
-== Version 2.0, in this case for the Apache MyFaces Maven Plugins ==
-=========================================================================
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses
-associated with this software.
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/pom.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/pom.xml
deleted file mode 100644
index 7718d88..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-archetype-parent</artifactId>
- <version>1.0.2-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-archetype-jsfcomponents</artifactId>
- <packaging>maven-plugin</packaging>
- <name>JSF Components Library Archetype</name>
- <description>Archetype to ease the burden of creating a library of JSF components</description>
-</project>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/archetype.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index c47fb59..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
-
- @author Bruno Aranda (latest modification by $Author: grantsmith $)
- @version $Revision: 472560 $ $Date: 2006-11-08 18:45:25 +0100 (Mi, 08 Nov 2006) $
-
--->
-
-<archetype>
- <id>myfaces-archetype-jsfcomponents</id>
- <resources>
- <resource>examples/src/main/resources/org/myorganization/component/example/build.properties</resource>
- <resource>examples/src/main/java/org/myorganization/component/example/SayHelloBean.java</resource>
- <resource>examples/src/main/webapp/sayhello.jsp</resource>
- <resource>examples/src/main/webapp/index.jsp</resource>
- <resource>examples/src/main/webapp/WEB-INF/examples-config.xml</resource>
- <resource>examples/src/main/webapp/WEB-INF/web.xml</resource>
- <resource>examples/src/main/webapp/home.jsp</resource>
- <resource>examples/pom.xml</resource>
- <resource>core/src/main/resources/META-INF/faces-config.xml</resource>
- <resource>core/src/main/tld/entities/say_hello_attributes.xml</resource>
- <resource>core/src/main/tld/entities/ui_component_attributes.xml</resource>
- <resource>core/src/main/tld/misc/resolve_entities.xsl</resource>
- <resource>core/src/main/tld/misc/web-jsptaglibrary_1_2.dtd</resource>
- <resource>core/src/main/tld/misc/resolve_entities-tlddoc.xsl</resource>
- <resource>core/src/main/tld/mycomponents.tld</resource>
- <resource>core/src/main/java/org/myorganization/component/sayhello/SayHello.java</resource>
- <resource>core/src/main/java/org/myorganization/component/sayhello/SayHelloRenderer.java</resource>
- <resource>core/src/main/java/org/myorganization/component/sayhello/SayHelloTag.java</resource>
- <resource>core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java</resource>
- <resource>core/pom.xml</resource>
- </resources>
-</archetype>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/pom.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/pom.xml
deleted file mode 100644
index fa99cde..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/pom.xml
+++ /dev/null
@@ -1,302 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>${artifactId}-core</artifactId>
- <packaging>jar</packaging>
- <name>My JSF Components Library</name>
-
- <description>
- This is my super jsf components library.
- </description>
-
- <parent>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}-project</artifactId>
- <version>${version}</version>
- </parent>
-
- <dependencies>
-
- <!-- compile -->
-
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.2.0</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.1</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- <version>1.0</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- provided dependencies -->
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.1.5</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- test dependencies -->
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.struts.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xslt-maven-plugin</artifactId>
- <version>1.0</version>
- <configuration>
- <xslFile>src/main/tld/misc/resolve_entities.xsl</xslFile>
- <srcIncludes>**/*.tld</srcIncludes>
- <srcDir>src/main/tld</srcDir>
- <destDir>target/classes/META-INF</destDir>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>transform</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>changelog-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- <reportSets>
- <reportSet>
- <id>dual-report</id>
- <configuration>
- <type>range</type>
- <range>30</range>
- </configuration>
- <reports>
- <report>changelog</report>
- <report>file-activity</report>
- <report>dev-activity</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.0-beta-3</version>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- <configuration>
- <tags>TODO, FIXME, XXX, @deprecated</tags>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>surefire-report-maven-plugin</artifactId>
- </plugin>
-
- </plugins>
- </reporting>
-
- <profiles>
- <profile>
- <id>generate-site</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xslt-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>generate-tld-for-tlddoc</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <configuration>
- <xslFile>src/main/tld/misc/resolve_entities-tlddoc.xsl</xslFile>
- <srcIncludes>**/*.tld</srcIncludes>
- <srcDir>src/main/tld</srcDir>
- <destDir>target/tlddoc-site</destDir>
- </configuration>
- </execution>
- <execution>
- <id>generate-tld-for-jar</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <configuration>
- <xslFile>src/main/tld/misc/resolve_entities.xsl</xslFile>
- <srcIncludes>**/*.tld</srcIncludes>
- <srcDir>src/main/tld</srcDir>
- <destDir>target/classes/META-INF</destDir>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>net.sourceforge.maven-taglib</groupId>
- <artifactId>maven-taglib-plugin</artifactId>
- <configuration>
- <taglib.src.dir>${basedir}/target/tlddoc-site</taglib.src.dir>
- <tldDocDir>${basedir}/target/site/tlddoc</tldDocDir>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- </profile>
- <profile>
- <id>generate-assembly</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xslt-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>generate-tld-for-tlddoc</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <configuration>
- <xslFile>src/main/tld/misc/resolve_entities-tlddoc.xsl</xslFile>
- <srcIncludes>**/*.tld</srcIncludes>
- <srcDir>src/main/tld</srcDir>
- <destDir>target/tlddoc-site</destDir>
- </configuration>
- </execution>
- <execution>
- <id>generate-tld-for-jar</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <configuration>
- <xslFile>src/main/tld/misc/resolve_entities.xsl</xslFile>
- <srcIncludes>**/*.tld</srcIncludes>
- <srcDir>src/main/tld</srcDir>
- <destDir>target/classes/META-INF</destDir>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <goals><goal>jar</goal></goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>net.sourceforge.maven-taglib</groupId>
- <artifactId>maven-taglib-plugin</artifactId>
- <configuration>
- <taglib.src.dir>${basedir}/target/tlddoc-site</taglib.src.dir>
- <tldDocDir>${basedir}/target/tlddoc</tldDocDir>
- </configuration>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <goals><goal>taglibdocjar</goal></goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHello.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHello.java
deleted file mode 100644
index 5a3fdb2..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHello.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.myorganization.component.sayhello;
-
-import javax.faces.component.UIOutput;
-import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-
-/**
- * The sayHello component
- */
-public class SayHello extends UIOutput
-{
- public static final String COMPONENT_TYPE = "org.myorganization.SayHello";
- public static final String DEFAULT_RENDERER_TYPE = "org.myorganization.SayHelloRenderer";
- public static final String COMPONENT_FAMILY = "javax.faces.Output";
-
- private String firstName;
- private String lastName;
-
- public SayHello()
- {
- // do nothing
- }
-
-
- public String getFamily()
- {
- return COMPONENT_FAMILY;
- }
-
- public void restoreState(FacesContext context, Object state) {
- Object values[] = (Object[])state;
- super.restoreState(context, values[0]);
-
- this.firstName = (String)values[1];
- this.lastName = (String)values[2];
- }
-
- public Object saveState(FacesContext context) {
- Object values[] = new Object[3];
- values[0] = super.saveState(context);
- values[1] = firstName;
- values[2] = lastName;
- return values;
- }
-
- public String getFirstName()
- {
- if (firstName != null)
- {
- return firstName;
- }
-
- ValueBinding vb = getValueBinding("firstName");
- return (vb == null)? null : (String) vb.getValue(FacesContext.getCurrentInstance());
- }
-
- public void setFirstName(String firstName)
- {
- this.firstName = firstName;
- }
-
- public String getLastName()
- {
- if (lastName != null)
- {
- return lastName;
- }
-
- ValueBinding vb = getValueBinding("lastName");
- return (vb == null)? null : (String) vb.getValue(FacesContext.getCurrentInstance());
- }
-
- public void setLastName(String lastName)
- {
- this.lastName = lastName;
- }
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHelloRenderer.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHelloRenderer.java
deleted file mode 100644
index e603568..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHelloRenderer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.myorganization.component.sayhello;
-
-import javax.faces.render.Renderer;
-import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
-import javax.faces.component.UIComponent;
-import java.io.IOException;
-
-/**
- * The renderer for my component
- */
-public class SayHelloRenderer extends Renderer
-{
-
- public void decode(FacesContext facesContext, UIComponent uiComponent)
- {
- super.decode(facesContext, uiComponent);
- // nothing to decode
- }
-
- public void encodeBegin(FacesContext facesContext, UIComponent uiComponent) throws IOException
- {
- super.encodeBegin(facesContext, uiComponent);
- // no need to use encodeBegin.
- }
-
- public void encodeChildren(FacesContext facesContext, UIComponent uiComponent) throws IOException
- {
- super.encodeChildren(facesContext, uiComponent);
- // this component does not have children
- }
-
- public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException
- {
- super.encodeEnd(facesContext, uiComponent);
-
- if (!uiComponent.isRendered())
- {
- return;
- }
-
- ResponseWriter writer = facesContext.getResponseWriter();
-
- SayHello sayHello = (SayHello) uiComponent;
-
- String firstName = sayHello.getFirstName();
- String lastName = sayHello.getLastName();
-
- writer.write("Hello ");
-
- if (firstName != null)
- {
- writer.write(firstName);
- }
-
- if (lastName != null)
- {
- writer.write(" "+lastName);
- }
-
- writer.write("!");
- }
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHelloTag.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHelloTag.java
deleted file mode 100644
index 2bc0d9a..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/java/org/myorganization/component/sayhello/SayHelloTag.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.myorganization.component.sayhello;
-
-import javax.faces.application.Application;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.webapp.UIComponentTag;
-
-/**
- * The tag for my component
- */
-public class SayHelloTag extends UIComponentTag
-{
-
- private String firstName;
- private String lastName;
-
- /**
- * @see javax.faces.webapp.UIComponentTag#getComponentType()
- */
- public String getComponentType()
- {
- return SayHello.COMPONENT_TYPE;
- }
-
- /**
- * @see javax.faces.webapp.UIComponentTag#getRendererType()
- */
- public String getRendererType()
- {
- return SayHello.DEFAULT_RENDERER_TYPE;
- }
-
- /**
- * @see javax.faces.webapp.UIComponentTag#setProperties
- */
- protected void setProperties(UIComponent component) {
- super.setProperties(component);
-
- FacesContext context = FacesContext.getCurrentInstance();
- Application application = context.getApplication();
-
- // firstName
- if (UIComponentTag.isValueReference(firstName))
- {
- component.setValueBinding("firstName", application.createValueBinding(firstName));
- }
- else
- {
- component.getAttributes().put("firstName", firstName);
- }
-
- // lastName
- if (lastName != null)
- {
- if (UIComponentTag.isValueReference(lastName))
- {
- component.setValueBinding("lastName", application.createValueBinding(lastName));
- }
- else
- {
- component.getAttributes().put("lastName", lastName);
- }
- }
-
- }
-
- public void release() {
- super.release();
- this.firstName = null;
- this.lastName = null;
- }
-
- public void setFirstName(String firstName)
- {
- this.firstName = firstName;
- }
-
- public void setLastName(String lastName)
- {
- this.lastName = lastName;
- }
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/faces-config.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/faces-config.xml
deleted file mode 100644
index b1af4fc..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/faces-config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-<faces-config xmlns="http://java.sun.com/JSF/Configuration">
-
- <!-- components -->
-
- <component>
- <component-type>org.myorganization.SayHello</component-type>
- <component-class>org.myorganization.component.sayhello.SayHello</component-class>
- </component>
-
-
- <!-- renderkit -->
-
- <render-kit>
-
- <renderer>
- <component-family>javax.faces.Output</component-family>
- <renderer-type>org.myorganization.SayHelloRenderer</renderer-type>
- <renderer-class>org.myorganization.component.sayhello.SayHelloRenderer</renderer-class>
- </renderer>
-
- </render-kit>
-
-</faces-config>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/mycomponents.taglib.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/mycomponents.taglib.xml
deleted file mode 100644
index 847bd10..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/resources/META-INF/mycomponents.taglib.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE facelet-taglib PUBLIC
- "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
- "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
-<facelet-taglib>
- <namespace>http://www.myorganitzation.org/mycomponents</namespace>
-
- <tag>
- <tag-name>sayHello</tag-name>
- <component>
- <component-type>org.myorganization.SayHello</component-type>
- <renderer-type>org.myorganization.SayHelloRenderer</renderer-type>
- </component>
- </tag>
-</facelet-taglib>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/entities/say_hello_attributes.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/entities/say_hello_attributes.xml
deleted file mode 100644
index 86185ea..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/entities/say_hello_attributes.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- This is the list of attributes for the sayHello component -->
-<attribute>
- <name>firstName</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <description>
- The first name of the user
- </description>
-</attribute>
-<attribute>
- <name>lastName</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <description>
- The last name of the user
- </description>
-</attribute>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/entities/ui_component_attributes.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/entities/ui_component_attributes.xml
deleted file mode 100644
index da13cad..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/entities/ui_component_attributes.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<attribute>
- <name>id</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <type>java.lang.String</type>
- <description>
- The developer-assigned ID of this component. The ID must be unique
- within the scope of the tag's enclosing naming container (e.g.
- h:form or f:subview). This value must be a static value.
- </description>
-</attribute>
-
-<attribute>
- <name>binding</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <type>java.lang.String</type>
- <description>
- Identifies a backing bean property (of type UIComponent or appropriate
- subclass) to bind to this component instance. This value must be an
- EL expression.
- </description>
-</attribute>
-
-<attribute>
- <name>rendered</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- <type>java.lang.String</type>
- <description>
- A boolean value that indicates whether this component should be rendered.
- Default value: true.
- </description>
-</attribute>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/misc/resolve_entities-tlddoc.xsl b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/misc/resolve_entities-tlddoc.xsl
deleted file mode 100644
index 16d84dc..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/misc/resolve_entities-tlddoc.xsl
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- - Stylesheet to expand xml entity references inline.
- -
- - This is a temporary workaround for a bug in the tlddoc application which means that
- - a (valid) xmlns attribute is rejected; tlddoc v1.3 only accepts input that (incorrectly)
- - puts the tld elements in no namespace. This stylesheet therefore generates a special
- - version of the tld for feeding to the tlddoc app, until such time as tlddoc is fixed.
- -->
-<xsl:stylesheet version="1.1"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
- <xsl:output method="xml"
- encoding="ISO-8859-1"
- doctype-public="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- doctype-system="http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"
- indent="yes"/>
-
- <xsl:template match="*" priority="2">
- <!-- avoiding copy to get get rid of namespace attribute -->
- <xsl:element name="{name(.)}">
- <xsl:apply-templates select="@*|node()"/>
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="@*|node()">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/misc/resolve_entities.xsl b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/misc/resolve_entities.xsl
deleted file mode 100644
index eafd3aa..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/misc/resolve_entities.xsl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- - Stylesheet to pretty-print an xml document. In addition, if the input
- - document contains any xml entity references, then those are expanded
- - inline.
- -
- - Based on a stylesheet by John Mongan.
- -->
-<xsl:stylesheet version="1.1"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
- <xsl:output method="xml"
- encoding="ISO-8859-1"
- doctype-public="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- doctype-system="http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd"/>
-
- <xsl:param name="indent-increment" select="' '" />
-
- <xsl:template match="*">
- <xsl:param name="indent" select="'
'"/>
-
- <xsl:value-of select="$indent"/>
- <xsl:copy>
- <xsl:copy-of select="@*" />
- <xsl:apply-templates>
- <xsl:with-param name="indent"
- select="concat($indent, $indent-increment)"/>
- </xsl:apply-templates>
- <xsl:if test="*">
- <xsl:value-of select="$indent"/>
- </xsl:if>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="comment()|processing-instruction()">
- <xsl:param name="indent" select="'
'"/>
- <xsl:value-of select="$indent"/>
- <xsl:copy />
- </xsl:template>
-
- <!--
- - Discard the text content of a node where the text content
- - is nothing but whitespace. When this rule isn't matched
- - the default xml processing applies, which is to copy the
- - text directly to the output.
- -
- - WARNING: this is dangerous. Handle with care
- -->
- <xsl:template match="text()[normalize-space(.)='']"/>
-
-</xsl:stylesheet>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/misc/web-jsptaglibrary_1_2.dtd b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/misc/web-jsptaglibrary_1_2.dtd
deleted file mode 100644
index 4b6fb7f..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/misc/web-jsptaglibrary_1_2.dtd
+++ /dev/null
@@ -1,108 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<!--
-
- This is the DTD defining the JavaServer Pages 1.2 Tag Library
- descriptor (.tld) (XML) file format/syntax.
-
- A Tag Library is a JAR file containing a valid instance of a Tag Library
- Descriptor (taglib.tld) file in the META-INF subdirectory, along with the
- appropriate implementing classes, and other resources required to
- implement the tags defined therein.
-
- -->
-
-<!NOTATION WEB-JSPTAGLIB.1_2 PUBLIC
- "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN">
-
-<!--
-This is the XML DTD for the JSP 1.2 Tag Library Descriptor.
-All JSP 1.2 tag library descriptors must include a DOCTYPE
-of the following form:
-
- <!DOCTYPE taglib
- PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-
--->
-
-<!ELEMENT taglib (tlib-version, jsp-version, short-name, uri?,
- display-name?, small-icon?, large-icon?, description?,
- validator?, listener*, tag+) >
-
-<!ATTLIST taglib id ID #IMPLIED
- xmlns CDATA #FIXED
- "http://java.sun.com/JSP/TagLibraryDescriptor">
-
-<!ELEMENT tlib-version (#PCDATA) >
-<!ELEMENT jsp-version (#PCDATA) >
-<!ELEMENT short-name (#PCDATA) >
-<!ELEMENT uri (#PCDATA) >
-<!ELEMENT description (#PCDATA) >
-<!ELEMENT validator (validator-class, init-param*, description?) >
-<!ELEMENT validator-class (#PCDATA) >
-<!ELEMENT init-param (param-name, param-value, description?)>
-<!ELEMENT param-name (#PCDATA)>
-<!ELEMENT param-value (#PCDATA)>
-<!ELEMENT listener (listener-class) >
-<!ELEMENT listener-class (#PCDATA) >
-<!ELEMENT tag (name, tag-class, tei-class?, body-content?, display-name?,
- small-icon?, large-icon?, description?, variable*, attribute*,
- example?) >
-<!ELEMENT tag-class (#PCDATA) >
-<!ELEMENT tei-class (#PCDATA) >
-<!ELEMENT body-content (#PCDATA) >
-<!ELEMENT display-name (#PCDATA) >
-<!ELEMENT large-icon (#PCDATA) >
-<!ELEMENT small-icon (#PCDATA) >
-<!ELEMENT example (#PCDATA) >
-<!ELEMENT variable ( (name-given | name-from-attribute), variable-class?,
- declare?, scope?, description?) >
-<!ELEMENT name-given (#PCDATA) >
-<!ELEMENT name-from-attribute (#PCDATA) >
-<!ELEMENT variable-class (#PCDATA) >
-<!ELEMENT declare (#PCDATA) >
-<!ELEMENT scope (#PCDATA) >
-<!ELEMENT attribute (name, required? , rtexprvalue?, type?, description?) >
-<!ELEMENT name (#PCDATA) >
-<!ELEMENT required (#PCDATA) >
-<!ELEMENT rtexprvalue (#PCDATA) >
-<!ELEMENT type (#PCDATA) >
-
-<!-- ID attributes -->
-
-<!ATTLIST tlib-version id ID #IMPLIED>
-<!ATTLIST jsp-version id ID #IMPLIED>
-<!ATTLIST short-name id ID #IMPLIED>
-<!ATTLIST uri id ID #IMPLIED>
-<!ATTLIST description id ID #IMPLIED>
-<!ATTLIST example id ID #IMPLIED>
-<!ATTLIST tag id ID #IMPLIED>
-<!ATTLIST tag-class id ID #IMPLIED>
-<!ATTLIST tei-class id ID #IMPLIED>
-<!ATTLIST body-content id ID #IMPLIED>
-<!ATTLIST attribute id ID #IMPLIED>
-<!ATTLIST name id ID #IMPLIED>
-<!ATTLIST required id ID #IMPLIED>
-<!ATTLIST rtexprvalue id ID #IMPLIED>
-<!ATTLIST param-name id ID #IMPLIED>
-<!ATTLIST param-value id ID #IMPLIED>
-<!ATTLIST listener id ID #IMPLIED>
-<!ATTLIST listener-class id ID #IMPLIED>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/mycomponents.tld b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/mycomponents.tld
deleted file mode 100644
index 2fdc390..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/mycomponents.tld
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!DOCTYPE taglib
- PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
- "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd" [
-
-<!--
-===========================================================================
-My component entities. Working with entities allows a more clear structure
-of the tld file and the possibility to reuse attributes without having to
-rewrite them again.
-When adding a new component or creating/modifying attributes for an existing
-component, create or modify the corresponding 'entities' file in the entities
-folder.
-===========================================================================
--->
-<!ENTITY ui_component_attributes SYSTEM "entities/ui_component_attributes.xml">
-<!ENTITY say_hello_attributes SYSTEM "entities/say_hello_attributes.xml">
-]>
-
-<taglib>
-
- <tlib-version>1.0</tlib-version>
- <jsp-version>1.2</jsp-version>
- <short-name>mycomp</short-name>
- <uri>http://www.myorganitzation.org/mycomponents</uri>
- <description>
- Example components library. Actually it only contains a simple component
- </description>
-
- <!-- Add your component tags here -->
-
- <!-- sayHello demo component-->
- <tag>
- <name>sayHello</name>
- <tag-class>org.myorganization.component.sayhello.SayHelloTag</tag-class>
- <body-content>JSP</body-content>
- <description>Simple component to greet a user.</description>
-
- <!-- import the entities for that component here-->
- &ui_component_attributes;
- &say_hello_attributes;
- </tag>
-
-
-</taglib>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java
deleted file mode 100644
index 00d9c7c..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.myorganization.component.sayhello;
-
-import junit.framework.Test;
-import org.apache.shale.test.base.AbstractJsfTestCase;
-import org.apache.shale.test.mock.MockRenderKitFactory;
-import org.apache.shale.test.mock.MockResponseWriter;
-
-import java.io.IOException;
-import java.io.StringWriter;
-
-/**
- * Class to test the behaviour of the SayHello renderer
- */
-public class SayHelloRendererTest extends AbstractJsfTestCase
-{
-
- public static Test suite()
- {
- return null;
- }
-
- private MockResponseWriter writer ;
- private SayHello sayHello;
-
- public SayHelloRendererTest(String name)
- {
- super(name);
- }
-
- public void setUp()
- {
- super.setUp();
-
- sayHello = new SayHello();
- sayHello.setFirstName("John");
- sayHello.setLastName("Smith");
-
- writer = new MockResponseWriter(new StringWriter(), null, null);
- facesContext.setResponseWriter(writer);
- // TODO remove these two lines once shale-test goes alpha, see MYFACES-1155
- facesContext.getViewRoot().setRenderKitId(MockRenderKitFactory.HTML_BASIC_RENDER_KIT);
- facesContext.getRenderKit().addRenderer(
- sayHello.getFamily(),
- sayHello.getRendererType(),
- new SayHelloRenderer());
- }
-
- public void tearDown()
- {
- super.tearDown();
- sayHello = null;
- writer = null;
- }
-
- public void testEncodeEnd() throws IOException
- {
- sayHello.encodeEnd(facesContext);
- facesContext.renderResponse();
-
- String output = writer.getWriter().toString();
-
- assertEquals("Hello John Smith!", output);
- assertNotSame("Bye John Smith!", output);
- }
-
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml
deleted file mode 100644
index dde870a..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- This is the project descriptor for the examples of my components -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>${artifactId}-examples</artifactId>
- <packaging>war</packaging>
- <name>My Components Examples</name>
-
- <parent>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}-project</artifactId>
- <version>${version}</version>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}-core</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-
- <repositories>
- <!-- Repository for jstl 1.2 -->
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
- <profiles>
- <!-- By default the war examples use myfaces! :) -->
- <profile>
- <id>myfaces</id>
- <activation>
- <property>
- <name>!jsf</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.2.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>1.2.2</version>
- <!-- Sandbox examples must only have runtime dependency to myfaces-impl
- so that it will be automatically added to war. But there must not be
- any compile dependency on impl so that is is always possible to use
- other JSF implementations. -->
- <scope>runtime</scope>
- </dependency>
- </dependencies>
-
- <properties>
- <jsf_implementation>MyFaces</jsf_implementation>
- </properties>
- </profile>
-
- <!-- To use the examples using the Sun's JSF Reference Implementation: -Djsf=ri -->
- <profile>
- <id>jsfri</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>ri</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.1_02</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>1.1_02</version>
- <scope>runtime</scope>
- </dependency>
- <!--
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.0</version>
- <scope>compile</scope>
- </dependency>
- -->
- </dependencies>
-
- <repositories>
- <repository>
- <id>java.net</id>
- <name>java.net Maven 1 Repository</name>
- <url>https://maven-repository.dev.java.net/nonav/repository</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
- <properties>
- <jsf_implementation>JSF-RI</jsf_implementation>
- </properties>
- </profile>
-
- </profiles>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <!--This plugin allows to run the example using mvn jetty:run -->
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.8</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- </configuration>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
- </build>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/java/org/myorganization/component/example/SayHelloBean.java b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/java/org/myorganization/component/example/SayHelloBean.java
deleted file mode 100644
index 122150c..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/java/org/myorganization/component/example/SayHelloBean.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.myorganization.component.example;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.faces.event.ActionEvent;
-
-/**
- * Managed bean for the sayHello page example
- */
-public class SayHelloBean
-{
-
- private static final Log log = LogFactory.getLog(SayHelloBean.class);
-
- private String firstName;
- private String lastName;
- private boolean renderGreeting;
-
- public SayHelloBean()
- {
- this.renderGreeting = false;
- }
-
- public void sayIt(ActionEvent evt)
- {
- renderGreeting = true;
-
- if (log.isInfoEnabled())
- {
- log.info("The name to say hello is '"+firstName+"' and the last name is '"+lastName+"'.");
- }
- }
-
-
- public String getFirstName()
- {
- return firstName;
- }
-
- public void setFirstName(String firstName)
- {
- this.firstName = firstName;
- }
-
- public String getLastName()
- {
- return lastName;
- }
-
- public void setLastName(String lastName)
- {
- this.lastName = lastName;
- }
-
-
- public boolean isRenderGreeting()
- {
- return renderGreeting;
- }
-
- public void setRenderGreeting(boolean renderGreeting)
- {
- this.renderGreeting = renderGreeting;
- }
-}
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/resources/org/myorganization/component/example/build.properties b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/resources/org/myorganization/component/example/build.properties
deleted file mode 100644
index 29deaef..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/resources/org/myorganization/component/example/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# Do not edit this file, as it will be completed automatically
-# by maven during the build process
-mycomponents_version=${pom.version}
-jsf_implementation=${jsf_implementation}
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/examples-config.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/examples-config.xml
deleted file mode 100644
index 5cec759..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/examples-config.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-
-<!DOCTYPE faces-config PUBLIC
- "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
- "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-
-<!-- =========== FULL CONFIGURATION FILE ================================== -->
-
-<!-- my components examples -->
-
-<faces-config>
-
-
- <!-- Managed Beans for sayhello.jsp -->
- <managed-bean>
- <managed-bean-name>sayHelloBean</managed-bean-name>
- <managed-bean-class>org.myorganization.component.example.SayHelloBean</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
-
- <!-- NAVIGATION RULES -->
-
- <navigation-rule>
- <navigation-case>
- <from-outcome>go_home</from-outcome>
- <to-view-id>/home.jsp</to-view-id>
- </navigation-case>
- </navigation-rule>
-
-
-</faces-config>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/web.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 7da038b..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
-
- <description>debug web.xml</description>
-
- <context-param>
- <description>Comma separated list of URIs of (additional) faces config files.
- (e.g. /WEB-INF/my-config.xml)
- See JSF 1.0 PRD2, 10.3.2
- Attention: You do not need to put /WEB-INF/faces-config.xml in here.
- </description>
- <param-name>javax.faces.CONFIG_FILES</param-name>
- <param-value>/WEB-INF/examples-config.xml</param-value>
- </context-param>
-
- <context-param>
- <description>State saving method: "client" or "server" (= default)
- See JSF Specification 2.5.3</description>
- <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
- <param-value>server</param-value>
- </context-param>
-
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.jsf</url-pattern>
- </servlet-mapping>
-
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/home.jsp b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/home.jsp
deleted file mode 100644
index e7b0e90..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/home.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://www.myorganitzation.org/mycomponents" prefix="mycomp"%>
-
-<html>
-
-<head>
- <title>My JSF Components Examples</title>
-</head>
-
-<body>
-
-<f:view>
- <h:form>
-
- <f:loadBundle basename="org.myorganization.component.example.build" var="buildInfo"/>
-
- <h:panelGrid columns="2">
- <h:outputText style="font-weight: bold" value="My JSF Components Library"/>
- <h:outputText value=" (Version #{buildInfo['mycomponents_version']}, using #{buildInfo ['jsf_implementation']})"/>
- </h:panelGrid>
-
- <h:panelGrid>
-
- <h:outputText value="My component examples" />
- <h:panelGrid style="padding-left:25px">
- <h:outputLink value="sayhello.jsf">
- <f:verbatim>sayHello - demo component</f:verbatim>
- </h:outputLink>
- </h:panelGrid>
-
- </h:panelGrid>
-
- </h:form>
-</f:view>
-</body>
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/index.jsp b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/index.jsp
deleted file mode 100644
index c4a9b48..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/index.jsp
+++ /dev/null
@@ -1 +0,0 @@
-<jsp:forward page="home.jsf"/>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/sayhello.jsp b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/sayhello.jsp
deleted file mode 100644
index fa67d71..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/src/main/webapp/sayhello.jsp
+++ /dev/null
@@ -1,49 +0,0 @@
-<%@ page session="false" contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://www.myorganitzation.org/mycomponents" prefix="mycomp"%>
-
-<html>
-<head>
- <title>My JSF Components</title>
-</head>
-
-<body>
-
-<f:view>
-
- <mycomp:sayHello firstName="John" lastName="Smith"/>
-
- <h:outputText value=" (probably not you, I know)"/>
-
- <f:verbatim><hr></f:verbatim>
-
- <h:form>
- <h:panelGrid columns="2">
- <h:outputLabel for="inputFirstName" value="First name" />
- <h:inputText id="inputFirstName" value="#{sayHelloBean.firstName}"/>
-
- <h:outputLabel for="inputLastName" value="Last name" />
- <h:inputText id="inputLastName" value="#{sayHelloBean.lastName}"/>
- </h:panelGrid>
-
- <h:panelGrid columns="1">
-
- <h:commandButton value="Say Hello!" actionListener="#{sayHelloBean.sayIt}"/>
-
- <mycomp:sayHello firstName="#{sayHelloBean.firstName}"
- lastName="#{sayHelloBean.lastName}"
- rendered="#{sayHelloBean.renderGreeting}"/>
-
- <h:commandLink value="[HOME]" action="go_home"/>
-
- </h:panelGrid>
-
- </h:form>
-
-</f:view>
-
-
-</body>
-
-</html>
diff --git a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 77e19c1..0000000
--- a/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}-project</artifactId>
- <packaging>pom</packaging>
- <name>My JSF Components Library Project</name>
- <version>${version}</version>
-
- <description>
- This is the project for my funky components. This will build both the core and the examples
- </description>
-
- <modules>
- <module>core</module>
- <module>examples</module>
- </modules>
-
- <repositories>
- <repository>
- <id>Myfaces repository</id>
- <url>http://myfaces.zones.apache.org/dist/maven-repository</url>
- </repository>
- </repositories>
-
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/LICENSE.txt b/maven2-archetypes/myfaces-archetype-trinidad/LICENSE.txt
deleted file mode 100644
index 75b5248..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/NOTICE.txt b/maven2-archetypes/myfaces-archetype-trinidad/NOTICE.txt
deleted file mode 100644
index ab2c2b5..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-== NOTICE file corresponding to section 4(d) of the Apache License, ==
-== Version 2.0, in this case for the Apache MyFaces ==
-=========================================================================
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses
-associated with this software.
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/pom.xml b/maven2-archetypes/myfaces-archetype-trinidad/pom.xml
deleted file mode 100644
index d81304f..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>Apache MyFaces Trinidad Archetype</name>
- <description>Archetype to ease the burden of creating a new application based with Trinidad</description>
-</project>
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/LICENSE b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/NOTICE b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index ab2c2b5..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-== NOTICE file corresponding to section 4(d) of the Apache License, ==
-== Version 2.0, in this case for the Apache MyFaces ==
-=========================================================================
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses
-associated with this software.
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/archetype.xml b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/archetype.xml
deleted file mode 100644
index dea5438..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/META-INF/archetype.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-
-<archetype>
- <id>myfaces-archetype-trinidad</id>
- <resources>
- <resource>src/main/java/org/apache/myfaces/trinidad/blank/HelloWorldBacking.java</resource>
- <resource>src/main/webapp/index.jspx</resource>
- <resource>src/main/webapp/page2.jspx</resource>
- <resource>src/main/webapp/WEB-INF/web.xml</resource>
- <resource>src/main/webapp/WEB-INF/faces-config.xml</resource>
- </resources>
-</archetype>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml
deleted file mode 100644
index 1770307..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <packaging>war</packaging>
- <version>${version}</version>
- <name>A custom project using myfaces</name>
- <url>http://www.myorganization.org</url>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <!--This plugin allows to run the example using mvn jetty:run -->
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.8</version>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <repositories>
- <repository>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <id>apache-maven-snapshots</id>
- <url>http://people.apache.org/repo/m2-incubating-repository/</url>
- </repository>
- <repository>
- <id>java.net</id>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
- </repositories>
-
- <!-- Project dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${myfaces.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- Apache Trinidad -->
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-api</artifactId>
- <version>${trinidad.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.trinidad</groupId>
- <artifactId>trinidad-impl</artifactId>
- <version>${trinidad.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.0</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <properties>
- <trinidad.version>1.2.5</trinidad.version>
- <myfaces.version>1.2.2</myfaces.version>
- </properties>
-
-</project>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/trinidad/blank/HelloWorldBacking.java b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/trinidad/blank/HelloWorldBacking.java
deleted file mode 100644
index 871a25d..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/java/org/apache/myfaces/trinidad/blank/HelloWorldBacking.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.myfaces.trinidad.blank;
-
-import javax.faces.context.FacesContext;
-
-import org.apache.myfaces.trinidad.render.ExtendedRenderKitService;
-import org.apache.myfaces.trinidad.util.Service;
-
-/**
- * A typical simple backing bean, that is backed to <code>helloworld.jsp</code>
- *
- */
-public class HelloWorldBacking
-{
-
- //properties
- private String _name;
-
- /**
- * default empty constructor
- */
- public HelloWorldBacking()
- {
- }
-
- //-------------------getter & setter
- public String getName()
- {
- return _name;
- }
-
- public void setName(String name)
- {
- this._name = name;
- }
-
- /**
- * Method that is backed to a submit button of a form.
- */
- public String send()
- {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- ExtendedRenderKitService service = (ExtendedRenderKitService)
- Service.getRenderKitService(facesContext, ExtendedRenderKitService.class);
- service.addScript(facesContext, "alert('Script added by ExtendedRenderKitService')");
-
- //do real logic
- return ("success");
- }
-}
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
deleted file mode 100644
index e5ecb66..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<faces-config version="1.2"
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
-
- <application>
- <!-- Use the Trinidad RenderKit -->
- <default-render-kit-id>
- org.apache.myfaces.trinidad.core
- </default-render-kit-id>
- </application>
-
- <!-- Global preferences object that proxies to others -->
- <managed-bean>
- <managed-bean-name>helloWorldBacking</managed-bean-name>
- <managed-bean-class>
- org.apache.myfaces.trinidad.blank.HelloWorldBacking
- </managed-bean-class>
- <managed-bean-scope>
- request
- </managed-bean-scope>
- </managed-bean>
-
- <!-- navigation rules for index.jspx -->
- <navigation-rule>
- <from-view-id>/index.jspx</from-view-id>
- <navigation-case>
- <from-outcome>success</from-outcome>
- <to-view-id>/page2.jspx</to-view-id>
- </navigation-case>
- </navigation-rule>
-
- <!-- navigation rules for page2.jspx -->
- <navigation-rule>
- <from-view-id>/page2.jspx</from-view-id>
- <navigation-case>
- <from-outcome>back</from-outcome>
- <to-view-id>/index.jspx</to-view-id>
- </navigation-case>
- </navigation-rule>
-
-</faces-config>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index dcb4552..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version = '1.0' encoding = 'ISO-8859-1'?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
- <!-- Use client-side state saving. In Trinidad, it is an
- optimized, token-based mechanism that is almost always a
- better choice than the standard JSF server-side state saving. -->
- <context-param>
- <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
- <param-value>client</param-value>
- <!--param-value>server</param-value-->
- </context-param>
-
- <!-- Trinidad by default uses an optimized client-side state saving
- mechanism. To disable that, uncomment the following -->
- <!--context-param>
- <param-name>org.apache.myfaces.trinidad.CLIENT_STATE_METHOD</param-name>
- <param-value>all</param-value>
- </context-param-->
-
- <!-- Trinidad also supports an optimized strategy for caching some
- view state at an application level, which significantly improves
- scalability. However, it makes it harder to develop (updates to
- pages will not be noticed until the server is restarted), and in
- some rare cases cannot be used for some pages (see Trinidad
- documentation for more information) -->
- <context-param>
- <param-name>org.apache.myfaces.trinidad.USE_APPLICATION_VIEW_CACHE</param-name>
- <param-value>false</param-value>
- </context-param>
-
- <!-- If this parameter is enabled, Trinidad will automatically
- check the modification date of your JSPs, and discard saved
- state when they change; this makes development easier,
- but adds overhead that should be avoided when your application
- is deployed -->
- <context-param>
- <param-name>org.apache.myfaces.trinidad.CHECK_FILE_MODIFICATION</param-name>
- <param-value>true</param-value>
- </context-param>
-
- <!-- Enables Change Persistence at a session scope. By default,
- Change Persistence is entirely disabled. The ChangeManager is
- an API, which can persist component modifications (like,
- is a showDetail or tree expanded or collapsed). For providing
- a custom Change Persistence implementation inherit from the
- Trinidad API's ChangeManager class. As the value you have
- to use the fullqualified class name. -->
- <context-param>
- <param-name>org.apache.myfaces.trinidad.CHANGE_PERSISTENCE</param-name>
- <param-value>session</param-value>
- </context-param>
-
- <filter>
- <filter-name>trinidad</filter-name>
- <filter-class>org.apache.myfaces.trinidad.webapp.TrinidadFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>trinidad</filter-name>
- <servlet-name>faces</servlet-name>
- </filter-mapping>
-
- <!-- Faces Servlet -->
- <servlet>
- <servlet-name>faces</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- </servlet>
-
- <!-- resource loader servlet -->
- <servlet>
- <servlet-name>resources</servlet-name>
- <servlet-class>org.apache.myfaces.trinidad.webapp.ResourceServlet</servlet-class>
- </servlet>
-
- <!-- Faces Servlet Mappings -->
- <servlet-mapping>
- <servlet-name>faces</servlet-name>
- <url-pattern>/faces/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>resources</servlet-name>
- <url-pattern>/adf/*</url-pattern>
- </servlet-mapping>
-
-
- <!-- Welcome Files -->
- <welcome-file-list>
- <welcome-file>faces/index.jspx</welcome-file>
- </welcome-file-list>
-
-</web-app>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/index.jspx b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/index.jspx
deleted file mode 100644
index 641c7eb..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/index.jspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:tr="http://myfaces.apache.org/trinidad" >
- <jsp:directive.page contentType="text/html;charset=utf-8"/>
- <f:view>
- <tr:document title="Apache MyFaces Trinidad Archetype Demo">
- <tr:form>
-
- <tr:panelPage>
- <tr:inputText label="Your name" id="input1" value="#{helloWorldBacking.name}" required="true"/>
- <tr:commandButton id="button1" text="press me" action="#{helloWorldBacking.send}" />
- </tr:panelPage>
-
- </tr:form>
- </tr:document>
- </f:view>
-</jsp:root>
\ No newline at end of file
diff --git a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/page2.jspx b/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/page2.jspx
deleted file mode 100644
index 63caf44..0000000
--- a/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/src/main/webapp/page2.jspx
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:tr="http://myfaces.apache.org/trinidad" >
- <jsp:directive.page contentType="text/html;charset=utf-8"/>
- <f:view>
- <tr:document title="Apache MyFaces Trinidad Archetype Demo">
- <tr:form>
-
- <tr:panelPage>
- <tr:outputText id="input1" value="Hello #{helloWorldBacking.name}. We hope you enjoy Apache MyFaces Trinidad"/>
- <tr:commandLink id="link" text="GO HOME" action="back" />
- </tr:panelPage>
-
- </tr:form>
- </tr:document>
- </f:view>
-</jsp:root>
\ No newline at end of file
diff --git a/maven2-archetypes/pom.xml b/maven2-archetypes/pom.xml
deleted file mode 100644
index 86053d7..0000000
--- a/maven2-archetypes/pom.xml
+++ /dev/null
@@ -1,192 +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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.myfaces</groupId>
- <artifactId>myfaces</artifactId>
- <version>5</version>
- </parent>
-
- <groupId>org.apache.myfaces.buildtools</groupId>
- <artifactId>myfaces-archetype-parent</artifactId>
- <version>1.0.2-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Apache MyFaces Buildtools Maven2 Archetype Parent</name>
-
- <issueManagement>
- <system>jira</system>
- <url>http://issues.apache.org/jira/browse/MYFACES</url>
- </issueManagement>
-
- <ciManagement>
- <system>continuum</system>
- <url>http://myfaces.zones.apache.org:8080/continuum</url>
- <notifiers>
- <notifier>
- <type>mail</type>
- <sendOnSuccess>true</sendOnSuccess>
- <configuration>
- <address>commits@myfaces.apache.org</address>
- </configuration>
- </notifier>
- </notifiers>
- </ciManagement>
-
- <inceptionYear>2008</inceptionYear>
-
- <build>
- <resources>
- <resource>
- <directory>${basedir}</directory>
- <targetPath>META-INF</targetPath>
- <includes>
- <include>NOTICE.txt</include>
- <include>LICENSE.txt</include>
- </includes>
- </resource>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <!-- 2.4 throws error, so temporally put on 2.3 -->
- <version>2.3</version>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
- </plugin>
- <plugin>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/unusedcode.xml</ruleset>
- </rulesets>
- <linkXref>true</linkXref>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/trunk/maven2-archetypes/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/trunk/maven2-archetypes/</developerConnection>
- <url>http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/</url>
- </scm>
-
- <modules>
- <module>myfaces-archetype-jsfcomponents</module>
- <module>myfaces-archetype-trinidad</module>
- <module>myfaces-archetype-helloworld</module>
- <module>myfaces-archetype-helloworld-facelets</module>
- <module>myfaces-archetype-helloworld-portlets</module>
- </modules>
-
- <distributionManagement>
- <snapshotRepository>
- <uniqueVersion>false</uniqueVersion>
- <id>apache.snapshots</id>
- <name>Apache Maven Snapshot Repository</name>
- <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
- </snapshotRepository>
- <site>
- <id>apache-site</id>
- <url>scpexe://people.apache.org/www/myfaces.apache.org/myfaces/plugins/</url>
- </site>
- </distributionManagement>
-
- <profiles>
- <profile>
- <id>release</id>
- <!--
- NOTE: Execute this profile like
- mvn clean source:jar install deploy -DaltDeploymentRepository=matzew::default::file://FOLDER -Prelease
- -->
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-4</version>
- <executions>
- <execution>
- <id>sign-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.3</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-scm-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <id>getting-scm.revision</id>
- <goals>
- <goal>update</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
\ No newline at end of file
diff --git a/maven2-plugins/LICENSE.txt b/maven2-plugins/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/maven2-plugins/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/maven2-plugins/NOTICE.txt b/maven2-plugins/NOTICE.txt
deleted file mode 100644
index fa3dbd6..0000000
--- a/maven2-plugins/NOTICE.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-=========================================================================
-== NOTICE file corresponding to section 4(d) of the Apache License, ==
-== Version 2.0, in this case for the Apache MyFaces Maven Plugins ==
-=========================================================================
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-Portions of this software were originally based on the following:
-
- - software copyright (c) 2000-2006, Oracle Corp, <http://www.oracle.com/>.
-and are licensed to the Apache Software Foundation under the
-"Software Grant and Corporate Contribution License Agreement"
-
-See the LICENSE.txt file for information on all licenses
-associated with this software.
diff --git a/maven2-plugins/myfaces-faces-plugin/LICENSE.txt b/myfaces-faces-plugin/LICENSE.txt
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/LICENSE.txt
rename to myfaces-faces-plugin/LICENSE.txt
diff --git a/maven2-plugins/myfaces-faces-plugin/NOTICE.txt b/myfaces-faces-plugin/NOTICE.txt
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/NOTICE.txt
rename to myfaces-faces-plugin/NOTICE.txt
diff --git a/maven2-plugins/myfaces-faces-plugin/pom.xml b/myfaces-faces-plugin/pom.xml
similarity index 98%
rename from maven2-plugins/myfaces-faces-plugin/pom.xml
rename to myfaces-faces-plugin/pom.xml
index 460c008..36f4d3e 100644
--- a/maven2-plugins/myfaces-faces-plugin/pom.xml
+++ b/myfaces-faces-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-plugin-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<groupId>org.apache.myfaces.buildtools</groupId>
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/AbstractFacesMojo.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/AbstractFacesMojo.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/AbstractFacesMojo.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/AbstractFacesMojo.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateComponentsMojo.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateComponentsMojo.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateComponentsMojo.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateComponentsMojo.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateFaceletsTaglibsMojo.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateFaceletsTaglibsMojo.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateFaceletsTaglibsMojo.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateFaceletsTaglibsMojo.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateFacesConfigMojo.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateFacesConfigMojo.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateFacesConfigMojo.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateFacesConfigMojo.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateJspTaglibsMojo.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateJspTaglibsMojo.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateJspTaglibsMojo.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateJspTaglibsMojo.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateMasterFacesConfigMojo.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateMasterFacesConfigMojo.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateMasterFacesConfigMojo.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateMasterFacesConfigMojo.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateRendererMapMojo.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateRendererMapMojo.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateRendererMapMojo.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateRendererMapMojo.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/ClassGenerator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/ClassGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/ClassGenerator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/ClassGenerator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/GeneratorHelper.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/GeneratorHelper.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/GeneratorHelper.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/GeneratorHelper.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/component/AbstractComponentGenerator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/component/AbstractComponentGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/component/AbstractComponentGenerator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/component/AbstractComponentGenerator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/component/ComponentGenerator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/component/ComponentGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/component/ComponentGenerator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/component/ComponentGenerator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/component/MyFacesComponentGenerator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/component/MyFacesComponentGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/component/MyFacesComponentGenerator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/component/MyFacesComponentGenerator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/component/TrinidadComponentGenerator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/component/TrinidadComponentGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/component/TrinidadComponentGenerator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/component/TrinidadComponentGenerator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/AbstractComponentTagGenerator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/AbstractComponentTagGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/AbstractComponentTagGenerator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/AbstractComponentTagGenerator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/AbstractConverterTagGenerator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/AbstractConverterTagGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/AbstractConverterTagGenerator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/AbstractConverterTagGenerator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/AbstractTagGenerator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/AbstractTagGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/AbstractTagGenerator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/AbstractTagGenerator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/AbstractValidatorTagGenerator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/AbstractValidatorTagGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/AbstractValidatorTagGenerator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/AbstractValidatorTagGenerator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/ComponentTagGenerator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/ComponentTagGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/ComponentTagGenerator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/ComponentTagGenerator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/MyFacesComponentTagGenerator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/MyFacesConverterTagGenerator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/MyFacesConverterTagGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/MyFacesConverterTagGenerator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/MyFacesConverterTagGenerator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/MyFacesValidatorTagGenerator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/MyFacesValidatorTagGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/MyFacesValidatorTagGenerator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/MyFacesValidatorTagGenerator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/TagAttributeFilter.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/TagAttributeFilter.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/TagAttributeFilter.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/TagAttributeFilter.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/TrinidadComponentTagGenerator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/TrinidadComponentTagGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/TrinidadComponentTagGenerator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/TrinidadComponentTagGenerator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/TrinidadConverterTagGenerator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/TrinidadConverterTagGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/TrinidadConverterTagGenerator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/TrinidadConverterTagGenerator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/TrinidadValidatorTagGenerator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/TrinidadValidatorTagGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/TrinidadValidatorTagGenerator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/generator/taglib/TrinidadValidatorTagGenerator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/io/PrettyWriter.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/io/PrettyWriter.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/io/PrettyWriter.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/io/PrettyWriter.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/AbstractTagBean.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/AbstractTagBean.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/AbstractTagBean.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/AbstractTagBean.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/AttributeBean.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/AttributeBean.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/AttributeBean.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/AttributeBean.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ComponentBean.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ComponentBean.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ComponentBean.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ComponentBean.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ConverterBean.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ConverterBean.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ConverterBean.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ConverterBean.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/EventBean.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/EventBean.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/EventBean.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/EventBean.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/EventRefBean.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/EventRefBean.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/EventRefBean.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/EventRefBean.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/FacesConfigBean.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/FacesConfigBean.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/FacesConfigBean.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/FacesConfigBean.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/FacesConfigParser.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/FacesConfigParser.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/FacesConfigParser.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/FacesConfigParser.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/FacetBean.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/FacetBean.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/FacetBean.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/FacetBean.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/MethodSignatureBean.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/MethodSignatureBean.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/MethodSignatureBean.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/MethodSignatureBean.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ObjectBean.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ObjectBean.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ObjectBean.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ObjectBean.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/PropertyBean.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/PropertyBean.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/PropertyBean.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/PropertyBean.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/RenderKitBean.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/RenderKitBean.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/RenderKitBean.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/RenderKitBean.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/RendererBean.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/RendererBean.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/RendererBean.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/RendererBean.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ValidatorBean.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ValidatorBean.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ValidatorBean.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/ValidatorBean.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/converters/QNameConverter.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/converters/QNameConverter.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/converters/QNameConverter.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/converters/QNameConverter.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/rules/BeanPropertySetterRule.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/rules/BeanPropertySetterRule.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/rules/BeanPropertySetterRule.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/parse/rules/BeanPropertySetterRule.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/AttributeFilter.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/AttributeFilter.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/AttributeFilter.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/AttributeFilter.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/ComponentFilter.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/ComponentFilter.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/ComponentFilter.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/ComponentFilter.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/CompoundIterator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/CompoundIterator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/CompoundIterator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/CompoundIterator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/ConverterFilter.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/ConverterFilter.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/ConverterFilter.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/ConverterFilter.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/FacetFilter.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/FacetFilter.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/FacetFilter.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/FacetFilter.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/Filter.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/Filter.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/Filter.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/Filter.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/FilteredIterator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/FilteredIterator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/FilteredIterator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/FilteredIterator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/PropertyFilter.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/PropertyFilter.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/PropertyFilter.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/PropertyFilter.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/RendererFilter.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/RendererFilter.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/RendererFilter.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/RendererFilter.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/SortedIterator.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/SortedIterator.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/SortedIterator.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/SortedIterator.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/SourceTemplate.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/SourceTemplate.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/SourceTemplate.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/SourceTemplate.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/Util.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/Util.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/Util.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/Util.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/ValidatorFilter.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/ValidatorFilter.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/ValidatorFilter.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/ValidatorFilter.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/XIncludeFilter.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/XIncludeFilter.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/XIncludeFilter.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/XIncludeFilter.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/XPointerFilter.java b/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/XPointerFilter.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/XPointerFilter.java
rename to myfaces-faces-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/faces/util/XPointerFilter.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/resources/META-INF/schemas/maven-faces-plugin.xsd b/myfaces-faces-plugin/src/main/resources/META-INF/schemas/maven-faces-plugin.xsd
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/resources/META-INF/schemas/maven-faces-plugin.xsd
rename to myfaces-faces-plugin/src/main/resources/META-INF/schemas/maven-faces-plugin.xsd
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/faces/resources/faces-config.xml b/myfaces-faces-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/faces/resources/faces-config.xml
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/faces/resources/faces-config.xml
rename to myfaces-faces-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/faces/resources/faces-config.xml
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/faces/resources/transform.xsl b/myfaces-faces-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/faces/resources/transform.xsl
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/faces/resources/transform.xsl
rename to myfaces-faces-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/faces/resources/transform.xsl
diff --git a/maven2-plugins/myfaces-faces-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/faces/resources/transform12.xsl b/myfaces-faces-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/faces/resources/transform12.xsl
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/faces/resources/transform12.xsl
rename to myfaces-faces-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/faces/resources/transform12.xsl
diff --git a/maven2-plugins/myfaces-faces-plugin/src/test/conf/META-INF/faces-config.xml b/myfaces-faces-plugin/src/test/conf/META-INF/faces-config.xml
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/test/conf/META-INF/faces-config.xml
rename to myfaces-faces-plugin/src/test/conf/META-INF/faces-config.xml
diff --git a/maven2-plugins/myfaces-faces-plugin/src/test/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java b/myfaces-faces-plugin/src/test/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/test/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
rename to myfaces-faces-plugin/src/test/java-templates/org/apache/myfaces/trinidad/component/UIXCommandTemplate.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/faces/AbstractMojoTestCase.java b/myfaces-faces-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/faces/AbstractMojoTestCase.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/faces/AbstractMojoTestCase.java
rename to myfaces-faces-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/faces/AbstractMojoTestCase.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateComponentsMojoTest.java b/myfaces-faces-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateComponentsMojoTest.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateComponentsMojoTest.java
rename to myfaces-faces-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateComponentsMojoTest.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateFacesConfigMojoTest.java b/myfaces-faces-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateFacesConfigMojoTest.java
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateFacesConfigMojoTest.java
rename to myfaces-faces-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/faces/GenerateFacesConfigMojoTest.java
diff --git a/maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml b/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml
rename to myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml
diff --git a/maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/javax/faces/ComponentBase.xml b/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/javax/faces/ComponentBase.xml
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/javax/faces/ComponentBase.xml
rename to myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/javax/faces/ComponentBase.xml
diff --git a/maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/javax/faces/NamingContainer.xml b/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/javax/faces/NamingContainer.xml
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/javax/faces/NamingContainer.xml
rename to myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/javax/faces/NamingContainer.xml
diff --git a/maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/Command.xml b/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/Command.xml
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/Command.xml
rename to myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/Command.xml
diff --git a/maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/ComponentBase.xml b/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/ComponentBase.xml
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/ComponentBase.xml
rename to myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/ComponentBase.xml
diff --git a/maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/TestInclude.xml b/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/TestInclude.xml
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/TestInclude.xml
rename to myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/components/trinidad/faces/TestInclude.xml
diff --git a/maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/javax/faces/Action.xml b/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/javax/faces/Action.xml
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/javax/faces/Action.xml
rename to myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/javax/faces/Action.xml
diff --git a/maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/faces/Launch.xml b/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/faces/Launch.xml
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/faces/Launch.xml
rename to myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/faces/Launch.xml
diff --git a/maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/faces/Return.xml b/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/faces/Return.xml
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/faces/Return.xml
rename to myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/events/trinidad/faces/Return.xml
diff --git a/maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/faces-config.xml b/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/faces-config.xml
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/faces-config.xml
rename to myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/faces-config.xml
diff --git a/maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/testGenerate.lst b/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/testGenerate.lst
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/testGenerate.lst
rename to myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/testGenerate.lst
diff --git a/maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/testSkipAPI.lst b/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/testSkipAPI.lst
similarity index 100%
rename from maven2-plugins/myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/testSkipAPI.lst
rename to myfaces-faces-plugin/src/test/resources/META-INF/maven-faces-plugin/testSkipAPI.lst
diff --git a/maven2-plugins/myfaces-i18n-plugin/LICENSE.txt b/myfaces-i18n-plugin/LICENSE.txt
similarity index 100%
rename from maven2-plugins/myfaces-i18n-plugin/LICENSE.txt
rename to myfaces-i18n-plugin/LICENSE.txt
diff --git a/maven2-plugins/myfaces-i18n-plugin/NOTICE.txt b/myfaces-i18n-plugin/NOTICE.txt
similarity index 100%
rename from maven2-plugins/myfaces-i18n-plugin/NOTICE.txt
rename to myfaces-i18n-plugin/NOTICE.txt
diff --git a/maven2-plugins/myfaces-i18n-plugin/pom.xml b/myfaces-i18n-plugin/pom.xml
similarity index 98%
rename from maven2-plugins/myfaces-i18n-plugin/pom.xml
rename to myfaces-i18n-plugin/pom.xml
index 8aad77d..dca0714 100644
--- a/maven2-plugins/myfaces-i18n-plugin/pom.xml
+++ b/myfaces-i18n-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-plugin-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<groupId>org.apache.myfaces.buildtools</groupId>
diff --git a/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/GenerateJavascriptLocalesMojo.java b/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/GenerateJavascriptLocalesMojo.java
similarity index 100%
rename from maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/GenerateJavascriptLocalesMojo.java
rename to myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/GenerateJavascriptLocalesMojo.java
diff --git a/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/GenerateLocaleElementsMojo.java b/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/GenerateLocaleElementsMojo.java
similarity index 100%
rename from maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/GenerateLocaleElementsMojo.java
rename to myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/GenerateLocaleElementsMojo.java
diff --git a/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/uixtools/JSLocaleElementsGenerator.java b/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/uixtools/JSLocaleElementsGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/uixtools/JSLocaleElementsGenerator.java
rename to myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/uixtools/JSLocaleElementsGenerator.java
diff --git a/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/uixtools/VersionUtils.java b/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/uixtools/VersionUtils.java
similarity index 100%
rename from maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/uixtools/VersionUtils.java
rename to myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/uixtools/VersionUtils.java
diff --git a/maven2-plugins/myfaces-javacc-plugin/LICENSE.txt b/myfaces-javacc-plugin/LICENSE.txt
similarity index 100%
rename from maven2-plugins/myfaces-javacc-plugin/LICENSE.txt
rename to myfaces-javacc-plugin/LICENSE.txt
diff --git a/maven2-plugins/myfaces-javacc-plugin/NOTICE.txt b/myfaces-javacc-plugin/NOTICE.txt
similarity index 100%
rename from maven2-plugins/myfaces-javacc-plugin/NOTICE.txt
rename to myfaces-javacc-plugin/NOTICE.txt
diff --git a/maven2-plugins/myfaces-javacc-plugin/pom.xml b/myfaces-javacc-plugin/pom.xml
similarity index 98%
rename from maven2-plugins/myfaces-javacc-plugin/pom.xml
rename to myfaces-javacc-plugin/pom.xml
index d32b30c..b92f064 100644
--- a/maven2-plugins/myfaces-javacc-plugin/pom.xml
+++ b/myfaces-javacc-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-plugin-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<groupId>org.apache.myfaces.buildtools</groupId>
diff --git a/maven2-plugins/myfaces-javacc-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javacc/JavaCCMojo.java b/myfaces-javacc-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javacc/JavaCCMojo.java
similarity index 100%
rename from maven2-plugins/myfaces-javacc-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javacc/JavaCCMojo.java
rename to myfaces-javacc-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javacc/JavaCCMojo.java
diff --git a/maven2-plugins/myfaces-javacc-plugin/src/site/apt/index.apt b/myfaces-javacc-plugin/src/site/apt/index.apt
similarity index 100%
rename from maven2-plugins/myfaces-javacc-plugin/src/site/apt/index.apt
rename to myfaces-javacc-plugin/src/site/apt/index.apt
diff --git a/maven2-plugins/myfaces-javacc-plugin/src/site/site.xml b/myfaces-javacc-plugin/src/site/site.xml
similarity index 100%
rename from maven2-plugins/myfaces-javacc-plugin/src/site/site.xml
rename to myfaces-javacc-plugin/src/site/site.xml
diff --git a/maven2-plugins/myfaces-javacc-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/javacc/JavaCCMojoTest.java b/myfaces-javacc-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/javacc/JavaCCMojoTest.java
similarity index 100%
rename from maven2-plugins/myfaces-javacc-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/javacc/JavaCCMojoTest.java
rename to myfaces-javacc-plugin/src/test/java/org/apache/myfaces/buildtools/maven2/plugin/javacc/JavaCCMojoTest.java
diff --git a/maven2-plugins/myfaces-javacc-plugin/src/test/resources/SelectorParser.jj b/myfaces-javacc-plugin/src/test/resources/SelectorParser.jj
similarity index 100%
rename from maven2-plugins/myfaces-javacc-plugin/src/test/resources/SelectorParser.jj
rename to myfaces-javacc-plugin/src/test/resources/SelectorParser.jj
diff --git a/maven2-plugins/myfaces-javacc-plugin/src/test/resources/validator/ParseException.java b/myfaces-javacc-plugin/src/test/resources/validator/ParseException.java
similarity index 100%
rename from maven2-plugins/myfaces-javacc-plugin/src/test/resources/validator/ParseException.java
rename to myfaces-javacc-plugin/src/test/resources/validator/ParseException.java
diff --git a/maven2-plugins/myfaces-javacc-plugin/src/test/resources/validator/SelectorParser.java b/myfaces-javacc-plugin/src/test/resources/validator/SelectorParser.java
similarity index 100%
rename from maven2-plugins/myfaces-javacc-plugin/src/test/resources/validator/SelectorParser.java
rename to myfaces-javacc-plugin/src/test/resources/validator/SelectorParser.java
diff --git a/maven2-plugins/myfaces-javacc-plugin/src/test/resources/validator/SelectorParserConstants.java b/myfaces-javacc-plugin/src/test/resources/validator/SelectorParserConstants.java
similarity index 100%
rename from maven2-plugins/myfaces-javacc-plugin/src/test/resources/validator/SelectorParserConstants.java
rename to myfaces-javacc-plugin/src/test/resources/validator/SelectorParserConstants.java
diff --git a/maven2-plugins/myfaces-javacc-plugin/src/test/resources/validator/SelectorParserTokenManager.java b/myfaces-javacc-plugin/src/test/resources/validator/SelectorParserTokenManager.java
similarity index 100%
rename from maven2-plugins/myfaces-javacc-plugin/src/test/resources/validator/SelectorParserTokenManager.java
rename to myfaces-javacc-plugin/src/test/resources/validator/SelectorParserTokenManager.java
diff --git a/maven2-plugins/myfaces-javacc-plugin/src/test/resources/validator/SimpleCharStream.java b/myfaces-javacc-plugin/src/test/resources/validator/SimpleCharStream.java
similarity index 100%
rename from maven2-plugins/myfaces-javacc-plugin/src/test/resources/validator/SimpleCharStream.java
rename to myfaces-javacc-plugin/src/test/resources/validator/SimpleCharStream.java
diff --git a/maven2-plugins/myfaces-javacc-plugin/src/test/resources/validator/Token.java b/myfaces-javacc-plugin/src/test/resources/validator/Token.java
similarity index 100%
rename from maven2-plugins/myfaces-javacc-plugin/src/test/resources/validator/Token.java
rename to myfaces-javacc-plugin/src/test/resources/validator/Token.java
diff --git a/maven2-plugins/myfaces-javacc-plugin/src/test/resources/validator/TokenMgrError.java b/myfaces-javacc-plugin/src/test/resources/validator/TokenMgrError.java
similarity index 100%
rename from maven2-plugins/myfaces-javacc-plugin/src/test/resources/validator/TokenMgrError.java
rename to myfaces-javacc-plugin/src/test/resources/validator/TokenMgrError.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/LICENSE.txt b/myfaces-javascript-plugin/LICENSE.txt
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/LICENSE.txt
rename to myfaces-javascript-plugin/LICENSE.txt
diff --git a/maven2-plugins/myfaces-javascript-plugin/NOTICE.txt b/myfaces-javascript-plugin/NOTICE.txt
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/NOTICE.txt
rename to myfaces-javascript-plugin/NOTICE.txt
diff --git a/maven2-plugins/myfaces-javascript-plugin/pom.xml b/myfaces-javascript-plugin/pom.xml
similarity index 98%
rename from maven2-plugins/myfaces-javascript-plugin/pom.xml
rename to myfaces-javascript-plugin/pom.xml
index e7bb4f8..bb109c4 100644
--- a/maven2-plugins/myfaces-javascript-plugin/pom.xml
+++ b/myfaces-javascript-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-plugin-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<groupId>org.apache.myfaces.buildtools</groupId>
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/ObfuscateJavascriptMojo.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/ObfuscateJavascriptMojo.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/ObfuscateJavascriptMojo.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/ObfuscateJavascriptMojo.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/ReduceJavascriptMojo.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/ReduceJavascriptMojo.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/ReduceJavascriptMojo.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/ReduceJavascriptMojo.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAddOp.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAddOp.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAddOp.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAddOp.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAdditiveExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAdditiveExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAdditiveExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAdditiveExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAnnotatableDirective.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAnnotatableDirective.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAnnotatableDirective.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAnnotatableDirective.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTArguments.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTArguments.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTArguments.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTArguments.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTArrayLiteral.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTArrayLiteral.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTArrayLiteral.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTArrayLiteral.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAssignementOperator.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAssignementOperator.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAssignementOperator.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAssignementOperator.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAssignmentExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAssignmentExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAssignmentExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAssignmentExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAssignmentExpressionNoIN.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAssignmentExpressionNoIN.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAssignmentExpressionNoIN.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAssignmentExpressionNoIN.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAttribute.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAttribute.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAttribute.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAttribute.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAttributeExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAttributeExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAttributeExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAttributeExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAttributes.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAttributes.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAttributes.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTAttributes.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseANDExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseANDExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseANDExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseANDExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseANDExpressionNoIN.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseANDExpressionNoIN.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseANDExpressionNoIN.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseANDExpressionNoIN.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseANDOp.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseANDOp.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseANDOp.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseANDOp.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseORExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseORExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseORExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseORExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseORExpressionNoIN.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseORExpressionNoIN.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseORExpressionNoIN.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseORExpressionNoIN.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseOROp.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseOROp.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseOROp.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseOROp.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseXORExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseXORExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseXORExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseXORExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseXORExpressionNoIN.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseXORExpressionNoIN.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseXORExpressionNoIN.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseXORExpressionNoIN.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseXOROp.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseXOROp.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseXOROp.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBitwiseXOROp.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBlock.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBlock.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBlock.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBlock.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBreakStatement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBreakStatement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBreakStatement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTBreakStatement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTCaseElement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTCaseElement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTCaseElement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTCaseElement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTCaseElements.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTCaseElements.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTCaseElements.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTCaseElements.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTCaseLabel.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTCaseLabel.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTCaseLabel.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTCaseLabel.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTClassDefinition.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTClassDefinition.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTClassDefinition.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTClassDefinition.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTConditionalExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTConditionalExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTConditionalExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTConditionalExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTConditionalExpressionNoIN.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTConditionalExpressionNoIN.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTConditionalExpressionNoIN.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTConditionalExpressionNoIN.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTContinueStatement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTContinueStatement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTContinueStatement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTContinueStatement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTDirective.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTDirective.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTDirective.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTDirective.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTDirectives.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTDirectives.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTDirectives.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTDirectives.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTDoStatement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTDoStatement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTDoStatement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTDoStatement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTElementList.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTElementList.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTElementList.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTElementList.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEmptyStatement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEmptyStatement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEmptyStatement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEmptyStatement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEolCommentSkipWs.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEolCommentSkipWs.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEolCommentSkipWs.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEolCommentSkipWs.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEqualOp.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEqualOp.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEqualOp.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEqualOp.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEqualityExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEqualityExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEqualityExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEqualityExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEqualityExpressionNoIN.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEqualityExpressionNoIN.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEqualityExpressionNoIN.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTEqualityExpressionNoIN.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExportBinding.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExportBinding.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExportBinding.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExportBinding.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExportBindingList.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExportBindingList.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExportBindingList.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExportBindingList.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExportDefinition.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExportDefinition.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExportDefinition.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExportDefinition.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExpressionQualifiedIdentifier.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExpressionQualifiedIdentifier.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExpressionQualifiedIdentifier.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExpressionQualifiedIdentifier.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExpressionStatement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExpressionStatement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExpressionStatement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTExpressionStatement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFieldList.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFieldList.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFieldList.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFieldList.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFieldName.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFieldName.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFieldName.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFieldName.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTForInBinding.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTForInBinding.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTForInBinding.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTForInBinding.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTForInitializer.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTForInitializer.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTForInitializer.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTForInitializer.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTForStatement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTForStatement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTForStatement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTForStatement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFullNewExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFullNewExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFullNewExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFullNewExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFullNewSubexpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFullNewSubexpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFullNewSubexpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFullNewSubexpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFullPostfixExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFullPostfixExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFullPostfixExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFullPostfixExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionCommon.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionCommon.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionCommon.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionCommon.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionConstructor.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionConstructor.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionConstructor.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionConstructor.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionDefinition.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionDefinition.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionDefinition.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionDefinition.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionName.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionName.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionName.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTFunctionName.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTIdentifier.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTIdentifier.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTIdentifier.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTIdentifier.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTIfStatement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTIfStatement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTIfStatement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTIfStatement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTImportDirective.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTImportDirective.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTImportDirective.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTImportDirective.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTIncludeDirective.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTIncludeDirective.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTIncludeDirective.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTIncludeDirective.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTInheritance.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTInheritance.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTInheritance.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTInheritance.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTInterfaceDefinition.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTInterfaceDefinition.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTInterfaceDefinition.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTInterfaceDefinition.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLabeledStatement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLabeledStatement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLabeledStatement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLabeledStatement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTListExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTListExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTListExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTListExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTListExpressionNoIN.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTListExpressionNoIN.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTListExpressionNoIN.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTListExpressionNoIN.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLiteralElement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLiteralElement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLiteralElement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLiteralElement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLiteralField.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLiteralField.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLiteralField.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLiteralField.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLogicalANDExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLogicalANDExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLogicalANDExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLogicalANDExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLogicalANDExpressionNoIN.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLogicalANDExpressionNoIN.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLogicalANDExpressionNoIN.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLogicalANDExpressionNoIN.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLogicalORExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLogicalORExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLogicalORExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLogicalORExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLogicalORExpressionNoIN.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLogicalORExpressionNoIN.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLogicalORExpressionNoIN.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTLogicalORExpressionNoIN.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTMulOp.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTMulOp.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTMulOp.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTMulOp.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTMultiplicativeExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTMultiplicativeExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTMultiplicativeExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTMultiplicativeExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTNamespaceDefinition.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTNamespaceDefinition.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTNamespaceDefinition.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTNamespaceDefinition.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTNonAssignmentExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTNonAssignmentExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTNonAssignmentExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTNonAssignmentExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTNonAssignmentExpressionNoIN.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTNonAssignmentExpressionNoIN.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTNonAssignmentExpressionNoIN.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTNonAssignmentExpressionNoIN.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTObjectLiteral.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTObjectLiteral.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTObjectLiteral.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTObjectLiteral.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPackageDefinition.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPackageDefinition.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPackageDefinition.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPackageDefinition.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPackageIdentifiers.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPackageIdentifiers.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPackageIdentifiers.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPackageIdentifiers.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPackageName.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPackageName.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPackageName.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPackageName.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTParameter.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTParameter.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTParameter.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTParameter.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTParameterInit.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTParameterInit.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTParameterInit.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTParameterInit.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTParameters.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTParameters.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTParameters.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTParameters.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPostfixExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPostfixExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPostfixExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPostfixExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPostfixOp.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPostfixOp.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPostfixOp.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPostfixOp.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragma.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragma.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragma.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragma.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragmaArgument.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragmaArgument.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragmaArgument.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragmaArgument.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragmaExpr.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragmaExpr.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragmaExpr.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragmaExpr.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragmaItem.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragmaItem.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragmaItem.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragmaItem.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragmaItems.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragmaItems.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragmaItems.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPragmaItems.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPrimaryExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPrimaryExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPrimaryExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPrimaryExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTProgram.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTProgram.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTProgram.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTProgram.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPropertyOperator.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPropertyOperator.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPropertyOperator.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPropertyOperator.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPropertyOrArguments.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPropertyOrArguments.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPropertyOrArguments.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTPropertyOrArguments.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTQualifiedIdentifier.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTQualifiedIdentifier.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTQualifiedIdentifier.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTQualifiedIdentifier.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTRelOp.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTRelOp.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTRelOp.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTRelOp.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTRelationalExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTRelationalExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTRelationalExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTRelationalExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTRelationalExpressionNoIN.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTRelationalExpressionNoIN.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTRelationalExpressionNoIN.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTRelationalExpressionNoIN.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTReservedNamespace.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTReservedNamespace.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTReservedNamespace.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTReservedNamespace.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTRestParameters.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTRestParameters.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTRestParameters.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTRestParameters.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTResult.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTResult.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTResult.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTResult.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTReturnStatement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTReturnStatement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTReturnStatement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTReturnStatement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSc.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSc.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSc.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSc.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTShiftExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTShiftExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTShiftExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTShiftExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTShiftOp.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTShiftOp.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTShiftOp.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTShiftOp.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSimpleQualifiedIdentifier.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSimpleQualifiedIdentifier.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSimpleQualifiedIdentifier.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSimpleQualifiedIdentifier.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSimpleVariableDefinition.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSimpleVariableDefinition.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSimpleVariableDefinition.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSimpleVariableDefinition.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTStatement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTStatement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTStatement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTStatement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSubstatement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSubstatement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSubstatement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSubstatement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSubstatements.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSubstatements.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSubstatements.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSubstatements.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSuperExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSuperExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSuperExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSuperExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSuperStatement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSuperStatement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSuperStatement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSuperStatement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSwitchStatement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSwitchStatement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSwitchStatement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTSwitchStatement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTThrowStatement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTThrowStatement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTThrowStatement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTThrowStatement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTryStatement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTryStatement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTryStatement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTryStatement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypeExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypeExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypeExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypeExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypeExpressionList.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypeExpressionList.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypeExpressionList.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypeExpressionList.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypeExpressionNoIN.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypeExpressionNoIN.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypeExpressionNoIN.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypeExpressionNoIN.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypedIdentifier.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypedIdentifier.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypedIdentifier.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypedIdentifier.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypedIdentifierNoIN.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypedIdentifierNoIN.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypedIdentifierNoIN.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTTypedIdentifierNoIN.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTUnaryExpression.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTUnaryExpression.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTUnaryExpression.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTUnaryExpression.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTUntypedVariableBinding.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTUntypedVariableBinding.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTUntypedVariableBinding.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTUntypedVariableBinding.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTUntypedVariableBindingList.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTUntypedVariableBindingList.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTUntypedVariableBindingList.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTUntypedVariableBindingList.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTUseDirective.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTUseDirective.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTUseDirective.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTUseDirective.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableBinding.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableBinding.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableBinding.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableBinding.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableBindingList.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableBindingList.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableBindingList.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableBindingList.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableBindingListNoIN.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableBindingListNoIN.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableBindingListNoIN.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableBindingListNoIN.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableBindingNoIN.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableBindingNoIN.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableBindingNoIN.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableBindingNoIN.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableDefinition.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableDefinition.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableDefinition.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableDefinition.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableDefinitionKind.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableDefinitionKind.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableDefinitionKind.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableDefinitionKind.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableDefinitionNoIN.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableDefinitionNoIN.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableDefinitionNoIN.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableDefinitionNoIN.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableInitialisation.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableInitialisation.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableInitialisation.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableInitialisation.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableInitialisationNoIN.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableInitialisationNoIN.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableInitialisationNoIN.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableInitialisationNoIN.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableInitializer.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableInitializer.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableInitializer.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableInitializer.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableInitializerNoIN.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableInitializerNoIN.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableInitializerNoIN.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTVariableInitializerNoIN.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTWhileStatement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTWhileStatement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTWhileStatement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTWhileStatement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTWithStatement.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTWithStatement.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTWithStatement.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ASTWithStatement.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JJTJSParser20State.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JJTJSParser20State.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JJTJSParser20State.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JJTJSParser20State.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20Constants.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20Constants.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20Constants.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20Constants.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20TokenManager.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20TokenManager.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20TokenManager.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20TokenManager.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20TreeConstants.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20TreeConstants.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20TreeConstants.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20TreeConstants.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20Visitor.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20Visitor.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20Visitor.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/JSParser20Visitor.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/Node.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/Node.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/Node.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/Node.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ParseException.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ParseException.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ParseException.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/ParseException.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/SimpleCharStream.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/SimpleCharStream.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/SimpleCharStream.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/SimpleCharStream.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/SimpleNode.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/SimpleNode.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/SimpleNode.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/SimpleNode.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/Token.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/Token.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/Token.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/Token.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/TokenMgrError.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/TokenMgrError.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/TokenMgrError.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/TokenMgrError.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/js2.0.jj b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/js2.0.jj
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/js2.0.jj
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/js2.0.jj
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/js2.0.jjt b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/js2.0.jjt
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/js2.0.jjt
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascript20parser/js2.0.jjt
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascriptcompiler/DepthFirstTraversal.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascriptcompiler/DepthFirstTraversal.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascriptcompiler/DepthFirstTraversal.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascriptcompiler/DepthFirstTraversal.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascriptcompiler/JavascriptCompiler.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascriptcompiler/JavascriptCompiler.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascriptcompiler/JavascriptCompiler.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascriptcompiler/JavascriptCompiler.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascriptcompiler/JavascriptCompilerMain.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascriptcompiler/JavascriptCompilerMain.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascriptcompiler/JavascriptCompilerMain.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/javascriptcompiler/JavascriptCompilerMain.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/InputSource.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/InputSource.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/InputSource.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/InputSource.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/Obfuscator.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/Obfuscator.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/Obfuscator.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/Obfuscator.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/configuration/ConfigException.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/configuration/ConfigException.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/configuration/ConfigException.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/configuration/ConfigException.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/configuration/ObfuscatorConfig.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/configuration/ObfuscatorConfig.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/configuration/ObfuscatorConfig.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/configuration/ObfuscatorConfig.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/configuration/config.xml b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/configuration/config.xml
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/configuration/config.xml
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/configuration/config.xml
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/ObfuscatorFilter.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/ObfuscatorFilter.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/ObfuscatorFilter.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/ObfuscatorFilter.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/CommentsHandler.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/CommentsHandler.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/CommentsHandler.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/CommentsHandler.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/CompressionFilter.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/CompressionFilter.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/CompressionFilter.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/CompressionFilter.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/CompressionHandler.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/CompressionHandler.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/CompressionHandler.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/CompressionHandler.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/NewlineHandler.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/NewlineHandler.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/NewlineHandler.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/NewlineHandler.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/WhitespaceHandler.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/WhitespaceHandler.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/WhitespaceHandler.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/compression/WhitespaceHandler.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/keywords/SpecialKeywordsFilter.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/keywords/SpecialKeywordsFilter.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/keywords/SpecialKeywordsFilter.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/keywords/SpecialKeywordsFilter.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/ObfuscationFilter.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/ObfuscationFilter.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/ObfuscationFilter.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/ObfuscationFilter.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/FunctionContext.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/FunctionContext.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/FunctionContext.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/FunctionContext.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/FunctionState.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/FunctionState.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/FunctionState.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/FunctionState.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/ObfuscationState.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/ObfuscationState.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/ObfuscationState.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/ObfuscationState.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/RootState.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/RootState.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/RootState.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/RootState.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/StatementBlockState.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/StatementBlockState.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/StatementBlockState.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/obfuscation/state/StatementBlockState.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/output/OutputGenerator.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/output/OutputGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/output/OutputGenerator.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/filters/output/OutputGenerator.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/AnnotatedToken.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/AnnotatedToken.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/AnnotatedToken.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/AnnotatedToken.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/AnnotationConstants.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/AnnotationConstants.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/AnnotationConstants.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/AnnotationConstants.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/JSParserTest15.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/JSParserTest15.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/JSParserTest15.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/JSParserTest15.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/JSParserUtils.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/JSParserUtils.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/JSParserUtils.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/JSParserUtils.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/NameGen.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/NameGen.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/NameGen.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/NameGen.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/ProgramContext.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/ProgramContext.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/ProgramContext.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/ProgramContext.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/ProgramContextStack.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/ProgramContextStack.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/ProgramContextStack.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/ProgramContextStack.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/Token.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/Token.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/Token.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/Token.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/js1.5.jj b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/js1.5.jj
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/js1.5.jj
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/obfuscator/javascript15parser/js1.5.jj
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Detokenizer.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Detokenizer.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Detokenizer.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Detokenizer.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/FileProcessor.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/FileProcessor.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/FileProcessor.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/FileProcessor.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Filter1.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Filter1.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Filter1.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Filter1.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Filter2.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Filter2.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Filter2.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Filter2.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Queue.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Queue.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Queue.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Queue.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Reducer.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Reducer.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Reducer.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Reducer.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Token.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Token.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Token.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Token.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/TokenBuffer.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/TokenBuffer.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/TokenBuffer.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/TokenBuffer.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/TokenException.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/TokenException.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/TokenException.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/TokenException.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/TokenReader.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/TokenReader.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/TokenReader.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/TokenReader.java
diff --git a/maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Tokenizer.java b/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Tokenizer.java
similarity index 100%
rename from maven2-plugins/myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Tokenizer.java
rename to myfaces-javascript-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/javascript/uixtools/Tokenizer.java
diff --git a/maven2-plugins/myfaces-jdev-plugin/LICENSE.txt b/myfaces-jdev-plugin/LICENSE.txt
similarity index 100%
rename from maven2-plugins/myfaces-jdev-plugin/LICENSE.txt
rename to myfaces-jdev-plugin/LICENSE.txt
diff --git a/maven2-plugins/myfaces-jdev-plugin/NOTICE.txt b/myfaces-jdev-plugin/NOTICE.txt
similarity index 100%
rename from maven2-plugins/myfaces-jdev-plugin/NOTICE.txt
rename to myfaces-jdev-plugin/NOTICE.txt
diff --git a/maven2-plugins/myfaces-jdev-plugin/pom.xml b/myfaces-jdev-plugin/pom.xml
similarity index 97%
rename from maven2-plugins/myfaces-jdev-plugin/pom.xml
rename to myfaces-jdev-plugin/pom.xml
index 3db336a..074a041 100644
--- a/maven2-plugins/myfaces-jdev-plugin/pom.xml
+++ b/myfaces-jdev-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-plugin-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<groupId>org.apache.myfaces.buildtools</groupId>
diff --git a/maven2-plugins/myfaces-jdev-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/JDeveloperMojo.java b/myfaces-jdev-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/JDeveloperMojo.java
similarity index 100%
rename from maven2-plugins/myfaces-jdev-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/JDeveloperMojo.java
rename to myfaces-jdev-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/JDeveloperMojo.java
diff --git a/maven2-plugins/myfaces-jdev-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/TldContentHandler.java b/myfaces-jdev-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/TldContentHandler.java
similarity index 100%
rename from maven2-plugins/myfaces-jdev-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/TldContentHandler.java
rename to myfaces-jdev-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/TldContentHandler.java
diff --git a/maven2-plugins/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.2/project.xml b/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.2/project.xml
similarity index 100%
rename from maven2-plugins/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.2/project.xml
rename to myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.2/project.xml
diff --git a/maven2-plugins/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.2/workspace.xml b/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.2/workspace.xml
similarity index 100%
rename from maven2-plugins/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.2/workspace.xml
rename to myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.2/workspace.xml
diff --git a/maven2-plugins/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.3/project.xml b/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.3/project.xml
similarity index 100%
rename from maven2-plugins/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.3/project.xml
rename to myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.3/project.xml
diff --git a/maven2-plugins/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.3/workspace.xml b/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.3/workspace.xml
similarity index 100%
rename from maven2-plugins/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.3/workspace.xml
rename to myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.3/workspace.xml
diff --git a/maven2-plugins/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.4/project.xml b/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.4/project.xml
similarity index 100%
rename from maven2-plugins/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.4/project.xml
rename to myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.4/project.xml
diff --git a/maven2-plugins/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.4/workspace.xml b/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.4/workspace.xml
similarity index 100%
rename from maven2-plugins/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.4/workspace.xml
rename to myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/10.1.3.0.4/workspace.xml
diff --git a/maven2-plugins/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/11.1.1.0.0/project.xml b/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/11.1.1.0.0/project.xml
similarity index 100%
rename from maven2-plugins/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/11.1.1.0.0/project.xml
rename to myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/11.1.1.0.0/project.xml
diff --git a/maven2-plugins/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/11.1.1.0.0/workspace.xml b/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/11.1.1.0.0/workspace.xml
similarity index 100%
rename from maven2-plugins/myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/11.1.1.0.0/workspace.xml
rename to myfaces-jdev-plugin/src/main/resources/org/apache/myfaces/buildtools/maven2/plugin/jdeveloper/11.1.1.0.0/workspace.xml
diff --git a/maven2-plugins/myfaces-tagdoc-plugin/LICENSE.txt b/myfaces-tagdoc-plugin/LICENSE.txt
similarity index 100%
rename from maven2-plugins/myfaces-tagdoc-plugin/LICENSE.txt
rename to myfaces-tagdoc-plugin/LICENSE.txt
diff --git a/maven2-plugins/myfaces-tagdoc-plugin/NOTICE.txt b/myfaces-tagdoc-plugin/NOTICE.txt
similarity index 100%
rename from maven2-plugins/myfaces-tagdoc-plugin/NOTICE.txt
rename to myfaces-tagdoc-plugin/NOTICE.txt
diff --git a/maven2-plugins/myfaces-tagdoc-plugin/pom.xml b/myfaces-tagdoc-plugin/pom.xml
similarity index 98%
rename from maven2-plugins/myfaces-tagdoc-plugin/pom.xml
rename to myfaces-tagdoc-plugin/pom.xml
index 59934d0..6f77629 100644
--- a/maven2-plugins/myfaces-tagdoc-plugin/pom.xml
+++ b/myfaces-tagdoc-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-plugin-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<groupId>org.apache.myfaces.buildtools</groupId>
diff --git a/maven2-plugins/myfaces-tagdoc-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocReport.java b/myfaces-tagdoc-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocReport.java
similarity index 100%
rename from maven2-plugins/myfaces-tagdoc-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocReport.java
rename to myfaces-tagdoc-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/tagdoc/TagdocReport.java
diff --git a/maven2-plugins/myfaces-wagon-plugin/LICENSE.txt b/myfaces-wagon-plugin/LICENSE.txt
similarity index 100%
rename from maven2-plugins/myfaces-wagon-plugin/LICENSE.txt
rename to myfaces-wagon-plugin/LICENSE.txt
diff --git a/maven2-plugins/myfaces-wagon-plugin/NOTICE.txt b/myfaces-wagon-plugin/NOTICE.txt
similarity index 100%
rename from maven2-plugins/myfaces-wagon-plugin/NOTICE.txt
rename to myfaces-wagon-plugin/NOTICE.txt
diff --git a/maven2-plugins/myfaces-wagon-plugin/pom.xml b/myfaces-wagon-plugin/pom.xml
similarity index 93%
rename from maven2-plugins/myfaces-wagon-plugin/pom.xml
rename to myfaces-wagon-plugin/pom.xml
index 2c9a406..3080df3 100644
--- a/maven2-plugins/myfaces-wagon-plugin/pom.xml
+++ b/myfaces-wagon-plugin/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-plugin-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
@@ -14,9 +14,9 @@
<packaging>maven-plugin</packaging>
<name>Apache MyFaces Buildtools Maven2 Wagon Plugin</name>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/maven/trunk/wagon-maven-plugin</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/maven/trunk/wagon-maven-plugin</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/myfaces/maven/trunk/wagon-maven-plugin</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/branches/lu4242_m2_plugins_100_release</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/branches/lu4242_m2_plugins_100_release</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/myfaces/myfaces-build-tools/branches/lu4242_m2_plugins_100_release</url>
</scm>
<build>
<extensions>
diff --git a/maven2-plugins/myfaces-wagon-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/wagon/WagonMojo.java b/myfaces-wagon-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/wagon/WagonMojo.java
similarity index 100%
rename from maven2-plugins/myfaces-wagon-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/wagon/WagonMojo.java
rename to myfaces-wagon-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/wagon/WagonMojo.java
diff --git a/maven2-plugins/myfaces-wagon-plugin/src/main/resources/META-INF/LICENSE.txt b/myfaces-wagon-plugin/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from maven2-plugins/myfaces-wagon-plugin/src/main/resources/META-INF/LICENSE.txt
rename to myfaces-wagon-plugin/src/main/resources/META-INF/LICENSE.txt
diff --git a/maven2-plugins/myfaces-wagon-plugin/src/main/resources/META-INF/NOTICE.txt b/myfaces-wagon-plugin/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from maven2-plugins/myfaces-wagon-plugin/src/main/resources/META-INF/NOTICE.txt
rename to myfaces-wagon-plugin/src/main/resources/META-INF/NOTICE.txt
diff --git a/maven2-plugins/myfaces-wagon-plugin/src/site/apt/usage.apt b/myfaces-wagon-plugin/src/site/apt/usage.apt
similarity index 100%
rename from maven2-plugins/myfaces-wagon-plugin/src/site/apt/usage.apt
rename to myfaces-wagon-plugin/src/site/apt/usage.apt
diff --git a/maven2-plugins/myfaces-wagon-plugin/src/site/site.xml b/myfaces-wagon-plugin/src/site/site.xml
similarity index 100%
rename from maven2-plugins/myfaces-wagon-plugin/src/site/site.xml
rename to myfaces-wagon-plugin/src/site/site.xml
diff --git a/maven2-plugins/myfaces-xrts-plugin/LICENSE.txt b/myfaces-xrts-plugin/LICENSE.txt
similarity index 100%
rename from maven2-plugins/myfaces-xrts-plugin/LICENSE.txt
rename to myfaces-xrts-plugin/LICENSE.txt
diff --git a/maven2-plugins/myfaces-xrts-plugin/NOTICE.txt b/myfaces-xrts-plugin/NOTICE.txt
similarity index 100%
rename from maven2-plugins/myfaces-xrts-plugin/NOTICE.txt
rename to myfaces-xrts-plugin/NOTICE.txt
diff --git a/maven2-plugins/myfaces-xrts-plugin/pom.xml b/myfaces-xrts-plugin/pom.xml
similarity index 98%
rename from maven2-plugins/myfaces-xrts-plugin/pom.xml
rename to myfaces-xrts-plugin/pom.xml
index 409b2bd..977b185 100644
--- a/maven2-plugins/myfaces-xrts-plugin/pom.xml
+++ b/myfaces-xrts-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-plugin-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<groupId>org.apache.myfaces.buildtools</groupId>
diff --git a/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/AbstractGenerateSourcesMojo.java b/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/AbstractGenerateSourcesMojo.java
similarity index 100%
rename from maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/AbstractGenerateSourcesMojo.java
rename to myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/AbstractGenerateSourcesMojo.java
diff --git a/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/GenerateSourcesMojo.java b/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/GenerateSourcesMojo.java
similarity index 100%
rename from maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/GenerateSourcesMojo.java
rename to myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/GenerateSourcesMojo.java
diff --git a/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/GenerateTestSourcesMojo.java b/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/GenerateTestSourcesMojo.java
similarity index 100%
rename from maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/GenerateTestSourcesMojo.java
rename to myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/GenerateTestSourcesMojo.java
diff --git a/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/ListRTSWriter.java b/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/ListRTSWriter.java
similarity index 100%
rename from maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/ListRTSWriter.java
rename to myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/ListRTSWriter.java
diff --git a/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/RTSWriter.java b/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/RTSWriter.java
similarity index 100%
rename from maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/RTSWriter.java
rename to myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/RTSWriter.java
diff --git a/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/UnicodeEscapes.java b/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/UnicodeEscapes.java
similarity index 100%
rename from maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/UnicodeEscapes.java
rename to myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/UnicodeEscapes.java
diff --git a/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/XRTSGenerator.java b/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/XRTSGenerator.java
similarity index 100%
rename from maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/XRTSGenerator.java
rename to myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/XRTSGenerator.java
diff --git a/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/XRTSParser.java b/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/XRTSParser.java
similarity index 100%
rename from maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/XRTSParser.java
rename to myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/XRTSParser.java
diff --git a/maven2-plugins/pom.xml b/pom.xml
similarity index 96%
rename from maven2-plugins/pom.xml
rename to pom.xml
index 58e9f49..4d477ab 100644
--- a/maven2-plugins/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-plugin-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<packaging>pom</packaging>
<name>Apache MyFaces Buildtools Maven2 Plugin Parent</name>
@@ -135,9 +135,9 @@
</reporting>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/trunk/maven2-plugins/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/trunk/maven2-plugins/</developerConnection>
- <url>http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/branches/lu4242_m2_plugins_100_release</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/myfaces-build-tools/branches/lu4242_m2_plugins_100_release</developerConnection>
+ <url>http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/lu4242_m2_plugins_100_release</url>
</scm>
<modules>