Index: maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/pom.xml
===================================================================
--- maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/pom.xml	(revision 772010)
+++ maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-pa/pom.xml	(working copy)
@@ -26,7 +26,7 @@
   </prerequisites>
 
   <artifactId>${artifactId}</artifactId>
-  <name>My Portlet Application</name>
+  <name>${rootArtifactId} portlet application</name>
   <parent>
     <groupId>${groupId}</groupId>
     <artifactId>${rootArtifactId}</artifactId>
@@ -45,6 +45,19 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jstl</artifactId>
+      <version>${dollar}{javax.servlet.jstl.version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-api</artifactId>
+      <version>${dollar}{org.apache.portals.jetspeed.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    
   </dependencies>
 
   <build>
Index: maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/pages/default-page.psml
===================================================================
--- maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/pages/default-page.psml	(revision 772010)
+++ maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/src/main/webapp/WEB-INF/pages/default-page.psml	(working copy)
@@ -20,9 +20,8 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
   <defaults
-     skin="blue"
-     layout-decorator="tigris"
-     portlet-decorator="tigris"
+     layout-decorator="jetspeed"
+     portlet-decorator="jetspeed"
   />
   <title>Welcome to Jetspeed 2</title>
   <metadata name="title" xml:lang="fr">Bienvenue a Jetspeed</metadata>
@@ -34,27 +33,28 @@
   <metadata name="title" xml:lang="ko">Jetspeed 2 에 오신 것을 환영합니다</metadata>
 
   <fragment id="dp-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
-    <fragment id="dp-3" type="portlet" name="j2-admin::LocaleSelector">
+    <fragment id="dp-12" type="portlet" name="j2-admin::LoginPortlet">
       <property layout="TwoColumns" name="row" value="0" />
-      <property layout="TwoColumns" name="column" value="1" />
+      <property layout="TwoColumns" name="column" value="0" />
     </fragment>                                
-    <fragment id="dp-12" type="portlet" name="j2-admin::LoginPortlet">
+    <fragment id="dp-22" type="portlet" name="j2-admin::ForgottenPasswordPortlet">
       <property layout="TwoColumns" name="row" value="1" />
-      <property layout="TwoColumns" name="column" value="1" />
+      <property layout="TwoColumns" name="column" value="0" />
     </fragment>                                
-    <fragment id="dp-22" type="portlet" name="j2-admin::ForgottenPasswordPortlet">
+    <fragment id="dp-7" type="portlet" name="${parentArtifactId}-pa::myportlet" >
       <property layout="TwoColumns" name="row" value="2" />
+      <property layout="TwoColumns" name="column" value="0" />
+    </fragment>        
+
+    <fragment id="dp-3" type="portlet" name="j2-admin::LocaleSelector">
+      <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>                                
     <fragment id="dp-23" type="portlet" name="j2-admin::UserRegistrationPortlet">
-      <property layout="TwoColumns" name="row" value="3" />
+      <property layout="TwoColumns" name="row" value="1" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>                                
     
-    <fragment id="dp-7" type="portlet" name="${parentArtifactId}-pa::myportlet" >
-      <property layout="TwoColumns" name="row" value="1" />
-      <property layout="TwoColumns" name="column" value="0" />
-    </fragment>        
   </fragment>
 
   <security-constraints>
Index: maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml
===================================================================
--- maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml	(revision 772010)
+++ maven/jetspeed-archetype/src/main/resources/archetype-resources/__rootArtifactId__-portal/pom.xml	(working copy)
@@ -26,7 +26,7 @@
   </prerequisites>
 
   <artifactId>${artifactId}</artifactId>
-  <name>My Portal</name>
+  <name>${rootArtifactId} portal</name>
   <parent>
     <groupId>${groupId}</groupId>
     <artifactId>${rootArtifactId}</artifactId>
Index: maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml
===================================================================
--- maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml	(revision 772010)
+++ maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml	(working copy)
@@ -26,7 +26,7 @@
   </prerequisites>
   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}</artifactId>
-  <name>My Portal Project</name>
+  <name>${artifactId} portal project</name>
   <version>${version}</version>
   <packaging>pom</packaging>
 
@@ -37,9 +37,9 @@
     <org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
     <servlet-api.version>2.4</servlet-api.version>
     <portlet-api.version>2.0</portlet-api.version>
+    <javax.servlet.jstl.version>1.2</javax.servlet.jstl.version>
     <portal.context.name>${artifactId}</portal.context.name>
     <org.apache.jetspeed.server.home>/opt/apache-tomcat-5.5.27/</org.apache.jetspeed.server.home>
-
   </properties>
 
   <repositories>