[maven-scm] copy for tag maven-archetype-bundles-3

git-svn-id: https://svn.apache.org/repos/asf/maven/archetype/tags/maven-archetype-bundles-3@541550 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-archetype-portlet/pom.xml b/maven-archetype-portlet/pom.xml
index 9f3dffb..bd20c81 100644
--- a/maven-archetype-portlet/pom.xml
+++ b/maven-archetype-portlet/pom.xml
@@ -33,5 +33,5 @@
   </description>
   <artifactId>maven-archetype-portlet</artifactId>
   <name>Maven Portlet Archetype</name>
-  <version>1.1-SNAPSHOT</version>
+  <version>1.0.1-SNAPSHOT</version>
 </project>
diff --git a/maven-archetype-portlet/src/main/resources/META-INF/archetype.xml b/maven-archetype-portlet/src/main/resources/META-INF/archetype.xml
index 2b10798..15c7dff 100644
--- a/maven-archetype-portlet/src/main/resources/META-INF/archetype.xml
+++ b/maven-archetype-portlet/src/main/resources/META-INF/archetype.xml
@@ -6,85 +6,10 @@
   <resources>
     <resource>src/main/jetspeed/web.xml</resource>
     <resource>src/main/webapp/normal.jsp</resource>
-    <resource>src/main/webapp/normal.jsp</resource>
     <resource>src/main/webapp/maximized.jsp</resource>
     <resource>src/main/webapp/help.jsp</resource>
     <resource>src/main/webapp/WEB-INF/web.xml</resource>
     <resource>src/main/webapp/WEB-INF/portlet.xml</resource>
-  </resources>
-</archetype>
-<archetype>
-  <id>webapp</id>
-  <sources>
-    <source>src/main/java/MyPortlet.java</source>
-  </sources>
-  <resources>
-    <resource>src/main/jetspeed/web.xml</resource>
-    <resource>src/main/webapp/normal.jsp</resource>
-    <resource>src/main/webapp/normal.jsp</resource>
-    <resource>src/main/webapp/maximized.jsp</resource>
-    <resource>src/main/webapp/help.jsp</resource>
-    <resource>src/main/webapp/WEB-INF/web.xml</resource>
-    <resource>src/main/webapp/WEB-INF/portlet.xml</resource>
-  </resources>
-</archetype>
-<archetype>
-  <id>webapp</id>
-  <sources>
-    <source>src/main/java/MyPortlet.java</source>
-  </sources>
-  <resources>
-    <resource>src/main/jetspeed/web.xml</resource>
-    <resource>src/main/webapp/normal.jsp</resource>
-    <resource>src/main/webapp/normal.jsp</resource>
-    <resource>src/main/webapp/maximized.jsp</resource>
-    <resource>src/main/webapp/help.jsp</resource>
-    <resource>src/main/webapp/WEB-INF/web.xml</resource>
-    <resource>src/main/webapp/WEB-INF/portlet.xml</resource>
-  </resources>
-</archetype>
-<archetype>
-  <id>webapp</id>
-  <sources>
-    <source>src/main/java/MyPortlet.java</source>
-  </sources>
-  <resources>
-    <resource>src/main/jetspeed/web.xml</resource>
-    <resource>src/main/webapp/normal.jsp</resource>
-    <resource>src/main/webapp/normal.jsp</resource>
-    <resource>src/main/webapp/maximized.jsp</resource>
-    <resource>src/main/webapp/help.jsp</resource>
-    <resource>src/main/webapp/WEB-INF/web.xml</resource>
-    <resource>src/main/webapp/WEB-INF/portlet.xml</resource>
-  </resources>
-</archetype>
-<archetype>
-  <id>webapp</id>
-  <sources>
-    <source>src/main/java/MyPortlet.java</source>
-  </sources>
-  <resources>
-    <resource>src/main/jetspeed/web.xml</resource>
-    <resource>src/main/webapp/normal.jsp</resource>
-    <resource>src/main/webapp/normal.jsp</resource>
-    <resource>src/main/webapp/maximized.jsp</resource>
-    <resource>src/main/webapp/help.jsp</resource>
-    <resource>src/main/webapp/WEB-INF/web.xml</resource>
-    <resource>src/main/webapp/WEB-INF/portlet.xml</resource>
-  </resources>
-</archetype>
-<archetype>
-  <id>webapp</id>
-  <sources>
-    <source>src/main/java/MyPortlet.java</source>
-  </sources>
-  <resources>
-    <resource>src/main/jetspeed/web.xml</resource>
-    <resource>src/main/webapp/normal.jsp</resource>
-    <resource>src/main/webapp/normal.jsp</resource>
-    <resource>src/main/webapp/maximized.jsp</resource>
-    <resource>src/main/webapp/help.jsp</resource>
-    <resource>src/main/webapp/WEB-INF/web.xml</resource>
-    <resource>src/main/webapp/WEB-INF/portlet.xml</resource>
+    <resource filtered="false">src/main/webapp/WEB-INF/tld/portlet.tld</resource>
   </resources>
 </archetype>
diff --git a/maven-archetype-portlet/src/main/resources/archetype-resources/pom.xml b/maven-archetype-portlet/src/main/resources/archetype-resources/pom.xml
index 54a5523..62f7067 100644
--- a/maven-archetype-portlet/src/main/resources/archetype-resources/pom.xml
+++ b/maven-archetype-portlet/src/main/resources/archetype-resources/pom.xml
@@ -43,228 +43,3 @@
       </dependency>
   </dependencies>
 </project>
-<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>Maven Portlet Archetype</name>
-  <url>http://maven.apache.org</url>
-  <profiles>
-      <profile>
-          <id>jetspeed</id>
-          <build>
-              <plugins>
-                  <plugin>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-war-plugin</artifactId>
-                      <version>2.0-beta-2</version>
-                      <configuration>
-                          <webXml>src/main/jetspeed/web.xml</webXml>
-                      </configuration>
-                  </plugin>
-              </plugins>
-          </build>
-      </profile>
-  </profiles>
-  <dependencies>
-      <dependency>
-          <groupId>portlet-api</groupId>
-          <artifactId>portlet-api</artifactId>
-          <version>1.0</version>
-          <scope>provided</scope>
-      </dependency>
-      <dependency>
-          <groupId>jstl</groupId>
-          <artifactId>jstl</artifactId>
-          <version>1.0.2</version>
-      </dependency>
-      <dependency>
-          <groupId>taglibs</groupId>
-          <artifactId>standard</artifactId>
-          <version>1.0.4</version>
-      </dependency>
-  </dependencies>
-</project>
-<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>Maven Portlet Archetype</name>
-  <url>http://maven.apache.org</url>
-  <profiles>
-      <profile>
-          <id>jetspeed</id>
-          <build>
-              <plugins>
-                  <plugin>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-war-plugin</artifactId>
-                      <version>2.0-beta-2</version>
-                      <configuration>
-                          <webXml>src/main/jetspeed/web.xml</webXml>
-                      </configuration>
-                  </plugin>
-              </plugins>
-          </build>
-      </profile>
-  </profiles>
-  <dependencies>
-      <dependency>
-          <groupId>portlet-api</groupId>
-          <artifactId>portlet-api</artifactId>
-          <version>1.0</version>
-          <scope>provided</scope>
-      </dependency>
-      <dependency>
-          <groupId>jstl</groupId>
-          <artifactId>jstl</artifactId>
-          <version>1.0.2</version>
-      </dependency>
-      <dependency>
-          <groupId>taglibs</groupId>
-          <artifactId>standard</artifactId>
-          <version>1.0.4</version>
-      </dependency>
-  </dependencies>
-</project>
-<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>Maven Portlet Archetype</name>
-  <url>http://maven.apache.org</url>
-  <profiles>
-      <profile>
-          <id>jetspeed</id>
-          <build>
-              <plugins>
-                  <plugin>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-war-plugin</artifactId>
-                      <version>2.0-beta-2</version>
-                      <configuration>
-                          <webXml>src/main/jetspeed/web.xml</webXml>
-                      </configuration>
-                  </plugin>
-              </plugins>
-          </build>
-      </profile>
-  </profiles>
-  <dependencies>
-      <dependency>
-          <groupId>portlet-api</groupId>
-          <artifactId>portlet-api</artifactId>
-          <version>1.0</version>
-          <scope>provided</scope>
-      </dependency>
-      <dependency>
-          <groupId>jstl</groupId>
-          <artifactId>jstl</artifactId>
-          <version>1.0.2</version>
-      </dependency>
-      <dependency>
-          <groupId>taglibs</groupId>
-          <artifactId>standard</artifactId>
-          <version>1.0.4</version>
-      </dependency>
-  </dependencies>
-</project>
-<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>Maven Portlet Archetype</name>
-  <url>http://maven.apache.org</url>
-  <profiles>
-      <profile>
-          <id>jetspeed</id>
-          <build>
-              <plugins>
-                  <plugin>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-war-plugin</artifactId>
-                      <version>2.0-beta-2</version>
-                      <configuration>
-                          <webXml>src/main/jetspeed/web.xml</webXml>
-                      </configuration>
-                  </plugin>
-              </plugins>
-          </build>
-      </profile>
-  </profiles>
-  <dependencies>
-      <dependency>
-          <groupId>portlet-api</groupId>
-          <artifactId>portlet-api</artifactId>
-          <version>1.0</version>
-          <scope>provided</scope>
-      </dependency>
-      <dependency>
-          <groupId>jstl</groupId>
-          <artifactId>jstl</artifactId>
-          <version>1.0.2</version>
-      </dependency>
-      <dependency>
-          <groupId>taglibs</groupId>
-          <artifactId>standard</artifactId>
-          <version>1.0.4</version>
-      </dependency>
-  </dependencies>
-</project>
-<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>Maven Portlet Archetype</name>
-  <url>http://maven.apache.org</url>
-  <profiles>
-      <profile>
-          <id>jetspeed</id>
-          <build>
-              <plugins>
-                  <plugin>
-                      <groupId>org.apache.maven.plugins</groupId>
-                      <artifactId>maven-war-plugin</artifactId>
-                      <version>2.0-beta-2</version>
-                      <configuration>
-                          <webXml>src/main/jetspeed/web.xml</webXml>
-                      </configuration>
-                  </plugin>
-              </plugins>
-          </build>
-      </profile>
-  </profiles>
-  <dependencies>
-      <dependency>
-          <groupId>portlet-api</groupId>
-          <artifactId>portlet-api</artifactId>
-          <version>1.0</version>
-          <scope>provided</scope>
-      </dependency>
-      <dependency>
-          <groupId>jstl</groupId>
-          <artifactId>jstl</artifactId>
-          <version>1.0.2</version>
-      </dependency>
-      <dependency>
-          <groupId>taglibs</groupId>
-          <artifactId>standard</artifactId>
-          <version>1.0.4</version>
-      </dependency>
-  </dependencies>
-</project>
diff --git a/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/java/MyPortlet.java b/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/java/MyPortlet.java
index 4fde21e..18b43ee 100644
--- a/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/java/MyPortlet.java
+++ b/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/java/MyPortlet.java
@@ -71,587 +71,3 @@
     }
 
 }
-package $package;
-
-/*
- * Copyright 2001-2005 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.
- */
-
-import java.io.IOException;
-import javax.portlet.PortletConfig;
-import javax.portlet.GenericPortlet;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-
-public class MyPortlet extends GenericPortlet {
-
-    private static final String NORMAL_VIEW = "/normal.jsp";
-    private static final String MAXIMIZED_VIEW = "/maximized.jsp";
-    private static final String HELP_VIEW = "/help.jsp";
-
-    private PortletRequestDispatcher normalView;
-    private PortletRequestDispatcher maximizedView;
-    private PortletRequestDispatcher helpView;
-
-    public void doView( RenderRequest request, RenderResponse response )
-        throws PortletException, IOException {
-
-        if( WindowState.MINIMIZED.equals( request.getWindowState() ) ) {
-            return;
-        }
-
-        if ( WindowState.NORMAL.equals( request.getWindowState() ) ) {
-            normalView.include( request, response );
-        } else {
-            maximizedView.include( request, response );
-        }
-    }
-
-    protected void doHelp( RenderRequest request, RenderResponse response )
-        throws PortletException, IOException {
-
-        helpView.include( request, response );
-
-    }
-
-    public void init( PortletConfig config ) throws PortletException {
-        super.init( config );
-        normalView = config.getPortletContext().getRequestDispatcher( NORMAL_VIEW );
-        maximizedView = config.getPortletContext().getRequestDispatcher( MAXIMIZED_VIEW );
-        helpView = config.getPortletContext().getRequestDispatcher( HELP_VIEW );
-    }
-
-    public void destroy() {
-        normalView = null;
-        maximizedView = null;
-        helpView = null;
-        super.destroy();
-    }
-
-}
-package $package;
-
-/*
- * Copyright 2001-2005 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.
- */
-
-import java.io.IOException;
-import javax.portlet.PortletConfig;
-import javax.portlet.GenericPortlet;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-
-public class MyPortlet extends GenericPortlet {
-
-    private static final String NORMAL_VIEW = "/normal.jsp";
-    private static final String MAXIMIZED_VIEW = "/maximized.jsp";
-    private static final String HELP_VIEW = "/help.jsp";
-
-    private PortletRequestDispatcher normalView;
-    private PortletRequestDispatcher maximizedView;
-    private PortletRequestDispatcher helpView;
-
-    public void doView( RenderRequest request, RenderResponse response )
-        throws PortletException, IOException {
-
-        if( WindowState.MINIMIZED.equals( request.getWindowState() ) ) {
-            return;
-        }
-
-        if ( WindowState.NORMAL.equals( request.getWindowState() ) ) {
-            normalView.include( request, response );
-        } else {
-            maximizedView.include( request, response );
-        }
-    }
-
-    protected void doHelp( RenderRequest request, RenderResponse response )
-        throws PortletException, IOException {
-
-        helpView.include( request, response );
-
-    }
-
-    public void init( PortletConfig config ) throws PortletException {
-        super.init( config );
-        normalView = config.getPortletContext().getRequestDispatcher( NORMAL_VIEW );
-        maximizedView = config.getPortletContext().getRequestDispatcher( MAXIMIZED_VIEW );
-        helpView = config.getPortletContext().getRequestDispatcher( HELP_VIEW );
-    }
-
-    public void destroy() {
-        normalView = null;
-        maximizedView = null;
-        helpView = null;
-        super.destroy();
-    }
-
-}
-package $package;
-
-/*
- * Copyright 2001-2005 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.
- */
-
-import java.io.IOException;
-import javax.portlet.PortletConfig;
-import javax.portlet.GenericPortlet;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-
-public class MyPortlet extends GenericPortlet {
-
-    private static final String NORMAL_VIEW = "/normal.jsp";
-    private static final String MAXIMIZED_VIEW = "/maximized.jsp";
-    private static final String HELP_VIEW = "/help.jsp";
-
-    private PortletRequestDispatcher normalView;
-    private PortletRequestDispatcher maximizedView;
-    private PortletRequestDispatcher helpView;
-
-    public void doView( RenderRequest request, RenderResponse response )
-        throws PortletException, IOException {
-
-        if( WindowState.MINIMIZED.equals( request.getWindowState() ) ) {
-            return;
-        }
-
-        if ( WindowState.NORMAL.equals( request.getWindowState() ) ) {
-            normalView.include( request, response );
-        } else {
-            maximizedView.include( request, response );
-        }
-    }
-
-    protected void doHelp( RenderRequest request, RenderResponse response )
-        throws PortletException, IOException {
-
-        helpView.include( request, response );
-
-    }
-
-    public void init( PortletConfig config ) throws PortletException {
-        super.init( config );
-        normalView = config.getPortletContext().getRequestDispatcher( NORMAL_VIEW );
-        maximizedView = config.getPortletContext().getRequestDispatcher( MAXIMIZED_VIEW );
-        helpView = config.getPortletContext().getRequestDispatcher( HELP_VIEW );
-    }
-
-    public void destroy() {
-        normalView = null;
-        maximizedView = null;
-        helpView = null;
-        super.destroy();
-    }
-
-}
-package $package;
-
-/*
- * Copyright 2001-2005 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.
- */
-
-import java.io.IOException;
-import javax.portlet.PortletConfig;
-import javax.portlet.GenericPortlet;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-
-public class MyPortlet extends GenericPortlet {
-
-    private static final String NORMAL_VIEW = "/normal.jsp";
-    private static final String MAXIMIZED_VIEW = "/maximized.jsp";
-    private static final String HELP_VIEW = "/help.jsp";
-
-    private PortletRequestDispatcher normalView;
-    private PortletRequestDispatcher maximizedView;
-    private PortletRequestDispatcher helpView;
-
-    public void doView( RenderRequest request, RenderResponse response )
-        throws PortletException, IOException {
-
-        if( WindowState.MINIMIZED.equals( request.getWindowState() ) ) {
-            return;
-        }
-
-        if ( WindowState.NORMAL.equals( request.getWindowState() ) ) {
-            normalView.include( request, response );
-        } else {
-            maximizedView.include( request, response );
-        }
-    }
-
-    protected void doHelp( RenderRequest request, RenderResponse response )
-        throws PortletException, IOException {
-
-        helpView.include( request, response );
-
-    }
-
-    public void init( PortletConfig config ) throws PortletException {
-        super.init( config );
-        normalView = config.getPortletContext().getRequestDispatcher( NORMAL_VIEW );
-        maximizedView = config.getPortletContext().getRequestDispatcher( MAXIMIZED_VIEW );
-        helpView = config.getPortletContext().getRequestDispatcher( HELP_VIEW );
-    }
-
-    public void destroy() {
-        normalView = null;
-        maximizedView = null;
-        helpView = null;
-        super.destroy();
-    }
-
-}
-package $package;
-
-/*
- * Copyright 2001-2005 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.
- */
-
-import java.io.IOException;
-import javax.portlet.PortletConfig;
-import javax.portlet.GenericPortlet;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-
-public class MyPortlet extends GenericPortlet {
-
-    private static final String NORMAL_VIEW = "/normal.jsp";
-    private static final String MAXIMIZED_VIEW = "/maximized.jsp";
-    private static final String HELP_VIEW = "/help.jsp";
-
-    private PortletRequestDispatcher normalView;
-    private PortletRequestDispatcher maximizedView;
-    private PortletRequestDispatcher helpView;
-
-    public void doView( RenderRequest request, RenderResponse response )
-        throws PortletException, IOException {
-
-        if( WindowState.MINIMIZED.equals( request.getWindowState() ) ) {
-            return;
-        }
-
-        if ( WindowState.NORMAL.equals( request.getWindowState() ) ) {
-            normalView.include( request, response );
-        } else {
-            maximizedView.include( request, response );
-        }
-    }
-
-    protected void doHelp( RenderRequest request, RenderResponse response )
-        throws PortletException, IOException {
-
-        helpView.include( request, response );
-
-    }
-
-    public void init( PortletConfig config ) throws PortletException {
-        super.init( config );
-        normalView = config.getPortletContext().getRequestDispatcher( NORMAL_VIEW );
-        maximizedView = config.getPortletContext().getRequestDispatcher( MAXIMIZED_VIEW );
-        helpView = config.getPortletContext().getRequestDispatcher( HELP_VIEW );
-    }
-
-    public void destroy() {
-        normalView = null;
-        maximizedView = null;
-        helpView = null;
-        super.destroy();
-    }
-
-}
-package $package;
-
-/*
- * Copyright 2001-2005 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.
- */
-
-import java.io.IOException;
-import javax.portlet.PortletConfig;
-import javax.portlet.GenericPortlet;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-
-public class MyPortlet extends GenericPortlet {
-
-    private static final String NORMAL_VIEW = "/normal.jsp";
-    private static final String MAXIMIZED_VIEW = "/maximized.jsp";
-    private static final String HELP_VIEW = "/help.jsp";
-
-    private PortletRequestDispatcher normalView;
-    private PortletRequestDispatcher maximizedView;
-    private PortletRequestDispatcher helpView;
-
-    public void doView( RenderRequest request, RenderResponse response )
-        throws PortletException, IOException {
-
-        if( WindowState.MINIMIZED.equals( request.getWindowState() ) ) {
-            return;
-        }
-
-        if ( WindowState.NORMAL.equals( request.getWindowState() ) ) {
-            normalView.include( request, response );
-        } else {
-            maximizedView.include( request, response );
-        }
-    }
-
-    protected void doHelp( RenderRequest request, RenderResponse response )
-        throws PortletException, IOException {
-
-        helpView.include( request, response );
-
-    }
-
-    public void init( PortletConfig config ) throws PortletException {
-        super.init( config );
-        normalView = config.getPortletContext().getRequestDispatcher( NORMAL_VIEW );
-        maximizedView = config.getPortletContext().getRequestDispatcher( MAXIMIZED_VIEW );
-        helpView = config.getPortletContext().getRequestDispatcher( HELP_VIEW );
-    }
-
-    public void destroy() {
-        normalView = null;
-        maximizedView = null;
-        helpView = null;
-        super.destroy();
-    }
-
-}
-package $package;
-
-/*
- * Copyright 2001-2005 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.
- */
-
-import java.io.IOException;
-import javax.portlet.PortletConfig;
-import javax.portlet.GenericPortlet;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-
-public class MyPortlet extends GenericPortlet {
-
-    private static final String NORMAL_VIEW = "/normal.jsp";
-    private static final String MAXIMIZED_VIEW = "/maximized.jsp";
-    private static final String HELP_VIEW = "/help.jsp";
-
-    private PortletRequestDispatcher normalView;
-    private PortletRequestDispatcher maximizedView;
-    private PortletRequestDispatcher helpView;
-
-    public void doView( RenderRequest request, RenderResponse response )
-        throws PortletException, IOException {
-
-        if( WindowState.MINIMIZED.equals( request.getWindowState() ) ) {
-            return;
-        }
-
-        if ( WindowState.NORMAL.equals( request.getWindowState() ) ) {
-            normalView.include( request, response );
-        } else {
-            maximizedView.include( request, response );
-        }
-    }
-
-    protected void doHelp( RenderRequest request, RenderResponse response )
-        throws PortletException, IOException {
-
-        helpView.include( request, response );
-
-    }
-
-    public void init( PortletConfig config ) throws PortletException {
-        super.init( config );
-        normalView = config.getPortletContext().getRequestDispatcher( NORMAL_VIEW );
-        maximizedView = config.getPortletContext().getRequestDispatcher( MAXIMIZED_VIEW );
-        helpView = config.getPortletContext().getRequestDispatcher( HELP_VIEW );
-    }
-
-    public void destroy() {
-        normalView = null;
-        maximizedView = null;
-        helpView = null;
-        super.destroy();
-    }
-
-}
-package $package;
-
-/*
- * Copyright 2001-2005 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.
- */
-
-import java.io.IOException;
-import javax.portlet.PortletConfig;
-import javax.portlet.GenericPortlet;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-
-public class MyPortlet extends GenericPortlet {
-
-    private static final String NORMAL_VIEW = "/normal.jsp";
-    private static final String MAXIMIZED_VIEW = "/maximized.jsp";
-    private static final String HELP_VIEW = "/help.jsp";
-
-    private PortletRequestDispatcher normalView;
-    private PortletRequestDispatcher maximizedView;
-    private PortletRequestDispatcher helpView;
-
-    public void doView( RenderRequest request, RenderResponse response )
-        throws PortletException, IOException {
-
-        if( WindowState.MINIMIZED.equals( request.getWindowState() ) ) {
-            return;
-        }
-
-        if ( WindowState.NORMAL.equals( request.getWindowState() ) ) {
-            normalView.include( request, response );
-        } else {
-            maximizedView.include( request, response );
-        }
-    }
-
-    protected void doHelp( RenderRequest request, RenderResponse response )
-        throws PortletException, IOException {
-
-        helpView.include( request, response );
-
-    }
-
-    public void init( PortletConfig config ) throws PortletException {
-        super.init( config );
-        normalView = config.getPortletContext().getRequestDispatcher( NORMAL_VIEW );
-        maximizedView = config.getPortletContext().getRequestDispatcher( MAXIMIZED_VIEW );
-        helpView = config.getPortletContext().getRequestDispatcher( HELP_VIEW );
-    }
-
-    public void destroy() {
-        normalView = null;
-        maximizedView = null;
-        helpView = null;
-        super.destroy();
-    }
-
-}
diff --git a/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/jetspeed/web.xml b/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/jetspeed/web.xml
index 9f80dd1..7a3b7a6 100644
--- a/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/jetspeed/web.xml
+++ b/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/jetspeed/web.xml
@@ -34,291 +34,3 @@
         <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
     </taglib>
 </web-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>${artifactId} Wrapper</display-name>
-
-    <description>Generated Portlet Wrapper</description>
-
-    <servlet>
-        <servlet-name>${artifactId}</servlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-        <description>Portlet for Jetspeed Fusion</description>
-        <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
-
-        <init-param>
-            <param-name>registerAtInit</param-name>
-            <param-value>1</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>portletApplication</param-name>
-            <param-value>${artifactId}</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>JetspeedContainer</servlet-name>
-        <url-pattern>/container/*</url-pattern>
-    </servlet-mapping>
-
-    <taglib>
-        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-    </taglib>
-</web-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>${artifactId} Wrapper</display-name>
-
-    <description>Generated Portlet Wrapper</description>
-
-    <servlet>
-        <servlet-name>${artifactId}</servlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-        <description>Portlet for Jetspeed Fusion</description>
-        <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
-
-        <init-param>
-            <param-name>registerAtInit</param-name>
-            <param-value>1</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>portletApplication</param-name>
-            <param-value>${artifactId}</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>JetspeedContainer</servlet-name>
-        <url-pattern>/container/*</url-pattern>
-    </servlet-mapping>
-
-    <taglib>
-        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-    </taglib>
-</web-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>${artifactId} Wrapper</display-name>
-
-    <description>Generated Portlet Wrapper</description>
-
-    <servlet>
-        <servlet-name>${artifactId}</servlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-        <description>Portlet for Jetspeed Fusion</description>
-        <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
-
-        <init-param>
-            <param-name>registerAtInit</param-name>
-            <param-value>1</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>portletApplication</param-name>
-            <param-value>${artifactId}</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>JetspeedContainer</servlet-name>
-        <url-pattern>/container/*</url-pattern>
-    </servlet-mapping>
-
-    <taglib>
-        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-    </taglib>
-</web-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>${artifactId} Wrapper</display-name>
-
-    <description>Generated Portlet Wrapper</description>
-
-    <servlet>
-        <servlet-name>${artifactId}</servlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-        <description>Portlet for Jetspeed Fusion</description>
-        <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
-
-        <init-param>
-            <param-name>registerAtInit</param-name>
-            <param-value>1</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>portletApplication</param-name>
-            <param-value>${artifactId}</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>JetspeedContainer</servlet-name>
-        <url-pattern>/container/*</url-pattern>
-    </servlet-mapping>
-
-    <taglib>
-        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-    </taglib>
-</web-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>${artifactId} Wrapper</display-name>
-
-    <description>Generated Portlet Wrapper</description>
-
-    <servlet>
-        <servlet-name>${artifactId}</servlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-        <description>Portlet for Jetspeed Fusion</description>
-        <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
-
-        <init-param>
-            <param-name>registerAtInit</param-name>
-            <param-value>1</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>portletApplication</param-name>
-            <param-value>${artifactId}</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>JetspeedContainer</servlet-name>
-        <url-pattern>/container/*</url-pattern>
-    </servlet-mapping>
-
-    <taglib>
-        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-    </taglib>
-</web-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>${artifactId} Wrapper</display-name>
-
-    <description>Generated Portlet Wrapper</description>
-
-    <servlet>
-        <servlet-name>${artifactId}</servlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-        <description>Portlet for Jetspeed Fusion</description>
-        <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
-
-        <init-param>
-            <param-name>registerAtInit</param-name>
-            <param-value>1</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>portletApplication</param-name>
-            <param-value>${artifactId}</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>JetspeedContainer</servlet-name>
-        <url-pattern>/container/*</url-pattern>
-    </servlet-mapping>
-
-    <taglib>
-        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-    </taglib>
-</web-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>${artifactId} Wrapper</display-name>
-
-    <description>Generated Portlet Wrapper</description>
-
-    <servlet>
-        <servlet-name>${artifactId}</servlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-        <description>Portlet for Jetspeed Fusion</description>
-        <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
-
-        <init-param>
-            <param-name>registerAtInit</param-name>
-            <param-value>1</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>portletApplication</param-name>
-            <param-value>${artifactId}</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>JetspeedContainer</servlet-name>
-        <url-pattern>/container/*</url-pattern>
-    </servlet-mapping>
-
-    <taglib>
-        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-    </taglib>
-</web-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>${artifactId} Wrapper</display-name>
-
-    <description>Generated Portlet Wrapper</description>
-
-    <servlet>
-        <servlet-name>${artifactId}</servlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-        <description>Portlet for Jetspeed Fusion</description>
-        <servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
-
-        <init-param>
-            <param-name>registerAtInit</param-name>
-            <param-value>1</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>portletApplication</param-name>
-            <param-value>${artifactId}</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>JetspeedContainer</servlet-name>
-        <url-pattern>/container/*</url-pattern>
-    </servlet-mapping>
-
-    <taglib>
-        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-    </taglib>
-</web-app>
diff --git a/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml b/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
index 0b7c9f9..bc639c2 100644
--- a/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
+++ b/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/portlet.xml
@@ -28,273 +28,3 @@
         </portlet-info>
     </portlet>
 </portlet-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<portlet-app
-    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-    version="1.0"
-    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>Write here a short description about your portlet.</description>
-        <portlet-name>${artifactId}</portlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-
-        <portlet-class>${groupId}.${artifactId}</portlet-class>
-
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>VIEW</portlet-mode>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>Put the portlet title here</title>
-            <short-title>Portlet Short Title</short-title>
-            <keywords>put keywords here</keywords>
-        </portlet-info>
-    </portlet>
-</portlet-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<portlet-app
-    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-    version="1.0"
-    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>Write here a short description about your portlet.</description>
-        <portlet-name>${artifactId}</portlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-
-        <portlet-class>${groupId}.${artifactId}</portlet-class>
-
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>VIEW</portlet-mode>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>Put the portlet title here</title>
-            <short-title>Portlet Short Title</short-title>
-            <keywords>put keywords here</keywords>
-        </portlet-info>
-    </portlet>
-</portlet-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<portlet-app
-    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-    version="1.0"
-    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>Write here a short description about your portlet.</description>
-        <portlet-name>${artifactId}</portlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-
-        <portlet-class>${groupId}.${artifactId}</portlet-class>
-
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>VIEW</portlet-mode>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>Put the portlet title here</title>
-            <short-title>Portlet Short Title</short-title>
-            <keywords>put keywords here</keywords>
-        </portlet-info>
-    </portlet>
-</portlet-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<portlet-app
-    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-    version="1.0"
-    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>Write here a short description about your portlet.</description>
-        <portlet-name>${artifactId}</portlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-
-        <portlet-class>${groupId}.${artifactId}</portlet-class>
-
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>VIEW</portlet-mode>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>Put the portlet title here</title>
-            <short-title>Portlet Short Title</short-title>
-            <keywords>put keywords here</keywords>
-        </portlet-info>
-    </portlet>
-</portlet-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<portlet-app
-    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-    version="1.0"
-    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>Write here a short description about your portlet.</description>
-        <portlet-name>${artifactId}</portlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-
-        <portlet-class>${groupId}.${artifactId}</portlet-class>
-
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>VIEW</portlet-mode>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>Put the portlet title here</title>
-            <short-title>Portlet Short Title</short-title>
-            <keywords>put keywords here</keywords>
-        </portlet-info>
-    </portlet>
-</portlet-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<portlet-app
-    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-    version="1.0"
-    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>Write here a short description about your portlet.</description>
-        <portlet-name>${artifactId}</portlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-
-        <portlet-class>${groupId}.${artifactId}</portlet-class>
-
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>VIEW</portlet-mode>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>Put the portlet title here</title>
-            <short-title>Portlet Short Title</short-title>
-            <keywords>put keywords here</keywords>
-        </portlet-info>
-    </portlet>
-</portlet-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<portlet-app
-    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-    version="1.0"
-    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>Write here a short description about your portlet.</description>
-        <portlet-name>${artifactId}</portlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-
-        <portlet-class>${groupId}.${artifactId}</portlet-class>
-
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>VIEW</portlet-mode>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>Put the portlet title here</title>
-            <short-title>Portlet Short Title</short-title>
-            <keywords>put keywords here</keywords>
-        </portlet-info>
-    </portlet>
-</portlet-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<portlet-app
-    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-    version="1.0"
-    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>Write here a short description about your portlet.</description>
-        <portlet-name>${artifactId}</portlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-
-        <portlet-class>${groupId}.${artifactId}</portlet-class>
-
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>VIEW</portlet-mode>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>Put the portlet title here</title>
-            <short-title>Portlet Short Title</short-title>
-            <keywords>put keywords here</keywords>
-        </portlet-info>
-    </portlet>
-</portlet-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<portlet-app
-    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
-    version="1.0"
-    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>Write here a short description about your portlet.</description>
-        <portlet-name>${artifactId}</portlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-
-        <portlet-class>${groupId}.${artifactId}</portlet-class>
-
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>VIEW</portlet-mode>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>Put the portlet title here</title>
-            <short-title>Portlet Short Title</short-title>
-            <keywords>put keywords here</keywords>
-        </portlet-info>
-    </portlet>
-</portlet-app>
diff --git a/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tld/portlet.tld b/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tld/portlet.tld
index 3d96008..b4af8ea 100644
--- a/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tld/portlet.tld
+++ b/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/tld/portlet.tld
@@ -102,1043 +102,3 @@
         <bodycontent>empty</bodycontent>
     </tag>
 </taglib>
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<!-- 
-Copyright 2004 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.
--->
-<taglib>
-    <tlibversion>1.0</tlibversion>
-    <jspversion>1.1</jspversion>
-    <shortname>portlet</shortname>
-    <uri>http://java.sun.com/portlet</uri>
-    <tag>
-        <name>defineObjects</name>
-        <tagclass>org.apache.pluto.tags.DefineObjectsTag</tagclass>
-        <teiclass>org.apache.pluto.tags.DefineObjectsTag$TEI</teiclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-    <tag>
-        <name>param</name>
-        <tagclass>org.apache.pluto.tags.ParamTag</tagclass>
-        <bodycontent>empty</bodycontent>
-        <attribute>
-            <name>name</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>actionURL</name>
-        <tagclass>org.apache.pluto.tags.ActionURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>renderURL</name>
-        <tagclass>org.apache.pluto.tags.RenderURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>namespace</name>
-        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-</taglib>
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<!-- 
-Copyright 2004 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.
--->
-<taglib>
-    <tlibversion>1.0</tlibversion>
-    <jspversion>1.1</jspversion>
-    <shortname>portlet</shortname>
-    <uri>http://java.sun.com/portlet</uri>
-    <tag>
-        <name>defineObjects</name>
-        <tagclass>org.apache.pluto.tags.DefineObjectsTag</tagclass>
-        <teiclass>org.apache.pluto.tags.DefineObjectsTag$TEI</teiclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-    <tag>
-        <name>param</name>
-        <tagclass>org.apache.pluto.tags.ParamTag</tagclass>
-        <bodycontent>empty</bodycontent>
-        <attribute>
-            <name>name</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>actionURL</name>
-        <tagclass>org.apache.pluto.tags.ActionURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>renderURL</name>
-        <tagclass>org.apache.pluto.tags.RenderURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>namespace</name>
-        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-</taglib>
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<!-- 
-Copyright 2004 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.
--->
-<taglib>
-    <tlibversion>1.0</tlibversion>
-    <jspversion>1.1</jspversion>
-    <shortname>portlet</shortname>
-    <uri>http://java.sun.com/portlet</uri>
-    <tag>
-        <name>defineObjects</name>
-        <tagclass>org.apache.pluto.tags.DefineObjectsTag</tagclass>
-        <teiclass>org.apache.pluto.tags.DefineObjectsTag$TEI</teiclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-    <tag>
-        <name>param</name>
-        <tagclass>org.apache.pluto.tags.ParamTag</tagclass>
-        <bodycontent>empty</bodycontent>
-        <attribute>
-            <name>name</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>actionURL</name>
-        <tagclass>org.apache.pluto.tags.ActionURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>renderURL</name>
-        <tagclass>org.apache.pluto.tags.RenderURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>namespace</name>
-        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-</taglib>
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<!-- 
-Copyright 2004 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.
--->
-<taglib>
-    <tlibversion>1.0</tlibversion>
-    <jspversion>1.1</jspversion>
-    <shortname>portlet</shortname>
-    <uri>http://java.sun.com/portlet</uri>
-    <tag>
-        <name>defineObjects</name>
-        <tagclass>org.apache.pluto.tags.DefineObjectsTag</tagclass>
-        <teiclass>org.apache.pluto.tags.DefineObjectsTag$TEI</teiclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-    <tag>
-        <name>param</name>
-        <tagclass>org.apache.pluto.tags.ParamTag</tagclass>
-        <bodycontent>empty</bodycontent>
-        <attribute>
-            <name>name</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>actionURL</name>
-        <tagclass>org.apache.pluto.tags.ActionURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>renderURL</name>
-        <tagclass>org.apache.pluto.tags.RenderURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>namespace</name>
-        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-</taglib>
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<!-- 
-Copyright 2004 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.
--->
-<taglib>
-    <tlibversion>1.0</tlibversion>
-    <jspversion>1.1</jspversion>
-    <shortname>portlet</shortname>
-    <uri>http://java.sun.com/portlet</uri>
-    <tag>
-        <name>defineObjects</name>
-        <tagclass>org.apache.pluto.tags.DefineObjectsTag</tagclass>
-        <teiclass>org.apache.pluto.tags.DefineObjectsTag$TEI</teiclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-    <tag>
-        <name>param</name>
-        <tagclass>org.apache.pluto.tags.ParamTag</tagclass>
-        <bodycontent>empty</bodycontent>
-        <attribute>
-            <name>name</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>actionURL</name>
-        <tagclass>org.apache.pluto.tags.ActionURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>renderURL</name>
-        <tagclass>org.apache.pluto.tags.RenderURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>namespace</name>
-        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-</taglib>
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<!-- 
-Copyright 2004 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.
--->
-<taglib>
-    <tlibversion>1.0</tlibversion>
-    <jspversion>1.1</jspversion>
-    <shortname>portlet</shortname>
-    <uri>http://java.sun.com/portlet</uri>
-    <tag>
-        <name>defineObjects</name>
-        <tagclass>org.apache.pluto.tags.DefineObjectsTag</tagclass>
-        <teiclass>org.apache.pluto.tags.DefineObjectsTag$TEI</teiclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-    <tag>
-        <name>param</name>
-        <tagclass>org.apache.pluto.tags.ParamTag</tagclass>
-        <bodycontent>empty</bodycontent>
-        <attribute>
-            <name>name</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>actionURL</name>
-        <tagclass>org.apache.pluto.tags.ActionURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>renderURL</name>
-        <tagclass>org.apache.pluto.tags.RenderURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>namespace</name>
-        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-</taglib>
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<!-- 
-Copyright 2004 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.
--->
-<taglib>
-    <tlibversion>1.0</tlibversion>
-    <jspversion>1.1</jspversion>
-    <shortname>portlet</shortname>
-    <uri>http://java.sun.com/portlet</uri>
-    <tag>
-        <name>defineObjects</name>
-        <tagclass>org.apache.pluto.tags.DefineObjectsTag</tagclass>
-        <teiclass>org.apache.pluto.tags.DefineObjectsTag$TEI</teiclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-    <tag>
-        <name>param</name>
-        <tagclass>org.apache.pluto.tags.ParamTag</tagclass>
-        <bodycontent>empty</bodycontent>
-        <attribute>
-            <name>name</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>actionURL</name>
-        <tagclass>org.apache.pluto.tags.ActionURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>renderURL</name>
-        <tagclass>org.apache.pluto.tags.RenderURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>namespace</name>
-        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-</taglib>
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<!-- 
-Copyright 2004 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.
--->
-<taglib>
-    <tlibversion>1.0</tlibversion>
-    <jspversion>1.1</jspversion>
-    <shortname>portlet</shortname>
-    <uri>http://java.sun.com/portlet</uri>
-    <tag>
-        <name>defineObjects</name>
-        <tagclass>org.apache.pluto.tags.DefineObjectsTag</tagclass>
-        <teiclass>org.apache.pluto.tags.DefineObjectsTag$TEI</teiclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-    <tag>
-        <name>param</name>
-        <tagclass>org.apache.pluto.tags.ParamTag</tagclass>
-        <bodycontent>empty</bodycontent>
-        <attribute>
-            <name>name</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>actionURL</name>
-        <tagclass>org.apache.pluto.tags.ActionURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>renderURL</name>
-        <tagclass>org.apache.pluto.tags.RenderURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>namespace</name>
-        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-</taglib>
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<!-- 
-Copyright 2004 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.
--->
-<taglib>
-    <tlibversion>1.0</tlibversion>
-    <jspversion>1.1</jspversion>
-    <shortname>portlet</shortname>
-    <uri>http://java.sun.com/portlet</uri>
-    <tag>
-        <name>defineObjects</name>
-        <tagclass>org.apache.pluto.tags.DefineObjectsTag</tagclass>
-        <teiclass>org.apache.pluto.tags.DefineObjectsTag$TEI</teiclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-    <tag>
-        <name>param</name>
-        <tagclass>org.apache.pluto.tags.ParamTag</tagclass>
-        <bodycontent>empty</bodycontent>
-        <attribute>
-            <name>name</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>actionURL</name>
-        <tagclass>org.apache.pluto.tags.ActionURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>renderURL</name>
-        <tagclass>org.apache.pluto.tags.RenderURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>namespace</name>
-        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-</taglib>
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE taglib PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<!-- 
-Copyright 2004 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.
--->
-<taglib>
-    <tlibversion>1.0</tlibversion>
-    <jspversion>1.1</jspversion>
-    <shortname>portlet</shortname>
-    <uri>http://java.sun.com/portlet</uri>
-    <tag>
-        <name>defineObjects</name>
-        <tagclass>org.apache.pluto.tags.DefineObjectsTag</tagclass>
-        <teiclass>org.apache.pluto.tags.DefineObjectsTag$TEI</teiclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-    <tag>
-        <name>param</name>
-        <tagclass>org.apache.pluto.tags.ParamTag</tagclass>
-        <bodycontent>empty</bodycontent>
-        <attribute>
-            <name>name</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>actionURL</name>
-        <tagclass>org.apache.pluto.tags.ActionURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>renderURL</name>
-        <tagclass>org.apache.pluto.tags.RenderURLTag</tagclass>
-        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
-        <bodycontent>JSP</bodycontent>
-        <attribute>
-            <name>windowState</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>portletMode</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>secure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>namespace</name>
-        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
-        <bodycontent>empty</bodycontent>
-    </tag>
-</taglib>
\ No newline at end of file
diff --git a/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index a12c58e..2de9768 100644
--- a/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -34,327 +34,3 @@
         <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
     </taglib>
 </web-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>FortunePortlet</display-name>
-
-    <description>Automated generated Application Wrapper</description>
-
-    <servlet>
-        <servlet-name>${artifactId}</servlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-        <description>Generated Portlet Wrapper</description>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-
-        <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>${groupId}.${artifactId}</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>yourportlet.${artifactId}</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>${artifactId}</servlet-name>
-        <url-pattern>/${artifactId}/*</url-pattern>
-    </servlet-mapping>
-
-    <taglib>
-        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-    </taglib>
-</web-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>FortunePortlet</display-name>
-
-    <description>Automated generated Application Wrapper</description>
-
-    <servlet>
-        <servlet-name>${artifactId}</servlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-        <description>Generated Portlet Wrapper</description>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-
-        <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>${groupId}.${artifactId}</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>yourportlet.${artifactId}</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>${artifactId}</servlet-name>
-        <url-pattern>/${artifactId}/*</url-pattern>
-    </servlet-mapping>
-
-    <taglib>
-        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-    </taglib>
-</web-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>FortunePortlet</display-name>
-
-    <description>Automated generated Application Wrapper</description>
-
-    <servlet>
-        <servlet-name>${artifactId}</servlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-        <description>Generated Portlet Wrapper</description>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-
-        <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>${groupId}.${artifactId}</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>yourportlet.${artifactId}</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>${artifactId}</servlet-name>
-        <url-pattern>/${artifactId}/*</url-pattern>
-    </servlet-mapping>
-
-    <taglib>
-        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-    </taglib>
-</web-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>FortunePortlet</display-name>
-
-    <description>Automated generated Application Wrapper</description>
-
-    <servlet>
-        <servlet-name>${artifactId}</servlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-        <description>Generated Portlet Wrapper</description>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-
-        <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>${groupId}.${artifactId}</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>yourportlet.${artifactId}</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>${artifactId}</servlet-name>
-        <url-pattern>/${artifactId}/*</url-pattern>
-    </servlet-mapping>
-
-    <taglib>
-        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-    </taglib>
-</web-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>FortunePortlet</display-name>
-
-    <description>Automated generated Application Wrapper</description>
-
-    <servlet>
-        <servlet-name>${artifactId}</servlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-        <description>Generated Portlet Wrapper</description>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-
-        <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>${groupId}.${artifactId}</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>yourportlet.${artifactId}</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>${artifactId}</servlet-name>
-        <url-pattern>/${artifactId}/*</url-pattern>
-    </servlet-mapping>
-
-    <taglib>
-        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-    </taglib>
-</web-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>FortunePortlet</display-name>
-
-    <description>Automated generated Application Wrapper</description>
-
-    <servlet>
-        <servlet-name>${artifactId}</servlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-        <description>Generated Portlet Wrapper</description>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-
-        <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>${groupId}.${artifactId}</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>yourportlet.${artifactId}</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>${artifactId}</servlet-name>
-        <url-pattern>/${artifactId}/*</url-pattern>
-    </servlet-mapping>
-
-    <taglib>
-        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-    </taglib>
-</web-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>FortunePortlet</display-name>
-
-    <description>Automated generated Application Wrapper</description>
-
-    <servlet>
-        <servlet-name>${artifactId}</servlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-        <description>Generated Portlet Wrapper</description>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-
-        <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>${groupId}.${artifactId}</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>yourportlet.${artifactId}</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>${artifactId}</servlet-name>
-        <url-pattern>/${artifactId}/*</url-pattern>
-    </servlet-mapping>
-
-    <taglib>
-        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-    </taglib>
-</web-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>FortunePortlet</display-name>
-
-    <description>Automated generated Application Wrapper</description>
-
-    <servlet>
-        <servlet-name>${artifactId}</servlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-        <description>Generated Portlet Wrapper</description>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-
-        <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>${groupId}.${artifactId}</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>yourportlet.${artifactId}</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>${artifactId}</servlet-name>
-        <url-pattern>/${artifactId}/*</url-pattern>
-    </servlet-mapping>
-
-    <taglib>
-        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-    </taglib>
-</web-app>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-    <display-name>FortunePortlet</display-name>
-
-    <description>Automated generated Application Wrapper</description>
-
-    <servlet>
-        <servlet-name>${artifactId}</servlet-name>
-        <display-name>${artifactId} Portlet</display-name>
-        <description>Generated Portlet Wrapper</description>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-
-        <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>${groupId}.${artifactId}</param-value>
-        </init-param>
-
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>yourportlet.${artifactId}</param-value>
-        </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>${artifactId}</servlet-name>
-        <url-pattern>/${artifactId}/*</url-pattern>
-    </servlet-mapping>
-
-    <taglib>
-        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-    </taglib>
-</web-app>
diff --git a/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/help.jsp b/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/help.jsp
index 9601712..fa2eced 100644
--- a/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/help.jsp
+++ b/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/help.jsp
@@ -1,27 +1,3 @@
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 
 <h4>Need help?</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>Need help?</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>Need help?</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>Need help?</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>Need help?</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>Need help?</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>Need help?</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>Need help?</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>Need help?</h4>
\ No newline at end of file
diff --git a/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/maximized.jsp b/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/maximized.jsp
index 94d16c4..9c216eb 100644
--- a/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/maximized.jsp
+++ b/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/maximized.jsp
@@ -1,27 +1,3 @@
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 
 <h4>This is a much bigger world isn't it?</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>This is a much bigger world isn't it?</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>This is a much bigger world isn't it?</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>This is a much bigger world isn't it?</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>This is a much bigger world isn't it?</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>This is a much bigger world isn't it?</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>This is a much bigger world isn't it?</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>This is a much bigger world isn't it?</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>This is a much bigger world isn't it?</h4>
\ No newline at end of file
diff --git a/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/normal.jsp b/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/normal.jsp
index b2836c6..a074fcb 100644
--- a/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/normal.jsp
+++ b/maven-archetype-portlet/src/main/resources/archetype-resources/src/main/webapp/normal.jsp
@@ -1,27 +1,3 @@
 <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
 
 <h4>Welcome to the Maven 2 World!</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>Welcome to the Maven 2 World!</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>Welcome to the Maven 2 World!</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>Welcome to the Maven 2 World!</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>Welcome to the Maven 2 World!</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>Welcome to the Maven 2 World!</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>Welcome to the Maven 2 World!</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>Welcome to the Maven 2 World!</h4>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-
-<h4>Welcome to the Maven 2 World!</h4>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 28ea5df..5747982 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,18 +19,16 @@
 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">
+<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>
     <artifactId>maven-archetype-parent</artifactId>
     <groupId>org.apache.maven.archetype</groupId>
-    <version>1</version>
+    <version>2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.archetypes</groupId>
   <artifactId>maven-archetype-bundles</artifactId>
-  <version>3-SNAPSHOT</version>
+  <version>3</version>
   <packaging>pom</packaging>
   <name>Maven Archetypes</name>
   <modules>
@@ -46,4 +44,10 @@
     <module>maven-archetype-plugin</module>
     <module>maven-archetype-plugin-site</module>    
   </modules>
+
+  <scm>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/maven/archetype/tags/maven-archetype-bundles-3</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/archetype/tags/maven-archetype-bundles-3</developerConnection>
+    <url>https://svn.apache.org/repos/asf/maven/archetype/tags/maven-archetype-bundles-3</url>
+  </scm>
 </project>