Index: applications/jetspeed/src/main/webapp/WEB-INF/pages/jpetstore.psml
===================================================================
--- applications/jetspeed/src/main/webapp/WEB-INF/pages/jpetstore.psml	(revision 768264)
+++ applications/jetspeed/src/main/webapp/WEB-INF/pages/jpetstore.psml	(working copy)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<page id="jpetstore"
-    xmlns="http://portals.apache.org/jetspeed"
-    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">
-  <title>JPetstore</title>
-  <metadata name="title" xml:lang="ja">ペットストア</metadata>
-  <metadata name="short-title" xml:lang="es">JPetstore</metadata>
-  <metadata name="title" xml:lang="es">Demo: tienda de animales</metadata>
-  <metadata name="title" xml:lang="hu">Kisállatkereskedés (JPetstore)</metadata>
-  <metadata name="title" xml:lang="zh">宠物店</metadata>
-  <metadata name="title" xml:lang="zh-TW">寵物店</metadata>
-  <metadata name="title" xml:lang="ko">애완동물가게</metadata>
-
-  <fragment id="jp-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
-    <fragment id="jp-2" type="portlet" name="jpetstore::JPetstorePortlet" decorator='pretty-single-portlet'/>
-  </fragment>
-
-  <security-constraints>
-    <security-constraints-ref>users</security-constraints-ref>
-  </security-constraints>
-</page>
Index: applications/jetspeed/src/main/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_role/user/roletest2.psml
===================================================================
--- applications/jetspeed/src/main/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_role/user/roletest2.psml	(revision 768264)
+++ applications/jetspeed/src/main/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_role/user/roletest2.psml	(working copy)
@@ -21,7 +21,7 @@
             <property name="row" value="0"/>
             <property name="column" value="0"/>
         </fragment>
-        <fragment id="role-test2-003" type="portlet" name="demo::IFramePortlet">
+        <fragment id="role-test2-003" type="portlet" name="webcontent::IFramePortlet">
             <property name="row" value="0"/>
             <property name="column" value="1"/>
         </fragment>
Index: applications/jetspeed/src/main/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/home.psml
===================================================================
--- applications/jetspeed/src/main/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/home.psml	(revision 768264)
+++ applications/jetspeed/src/main/webapp/WEB-INF/pages/__subsite-root/_hostname/localhost/_user/sublocal/home.psml	(working copy)
@@ -21,7 +21,7 @@
             <property name="row" value="0"/>
             <property name="column" value="0"/>
         </fragment>
-        <fragment id="P-111c98bf047-10003" type="portlet" name="demo::IFramePortlet">
+        <fragment id="P-111c98bf047-10003" type="portlet" name="webcontent::IFramePortlet">
             <property name="row" value="0"/>
             <property name="column" value="1"/>
         </fragment>
Index: applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/manager/default-page.psml
===================================================================
--- applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/manager/default-page.psml	(revision 768264)
+++ applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/manager/default-page.psml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <page id="_role-manager-default-page"
     xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    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">
   <title>Manager Role Page</title>
   <metadata name="title" xml:lang="ja">マネージャロールページ</metadata>
@@ -31,13 +31,9 @@
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
     </fragment>
-    <fragment id="mrp-xx5" type="portlet" name="jsf-demo::CalendarPortlet">
+    <fragment id="mrp-xx6" type="portlet" name="j2-admin::LoginPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>
-    <fragment id="mrp-xx6" type="portlet" name="j2-admin::LoginPortlet">
-      <property layout="TwoColumns" name="row" value="0" />
-      <property layout="TwoColumns" name="column" value="2" />
-    </fragment>                                    
   </fragment>
 </page>
Index: applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/more/one-more-page.psml
===================================================================
--- applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/more/one-more-page.psml	(revision 768264)
+++ applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/more/one-more-page.psml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <page id="_role-user-top-links-more-one-more-page"
     xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    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">
   <title>[USER] One More Page</title>
   <metadata name="title" xml:lang="ja">[ユーザー] 追加ページ</metadata>
@@ -27,14 +27,9 @@
   <metadata name="title" xml:lang="zh-TW">[用戶] 追加頁</metadata>
   <metadata name="title" xml:lang="ko">[사용자] 추가 페이지</metadata>
 
-  <fragment id="utp-1" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
+  <fragment id="utp-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
     <fragment id="utp-4" type="portlet" name="demo::BookmarkPortlet">
       <property layout="TwoColumns" name="row" value="0" />
-      <property layout="TwoColumns" name="column" value="1" />
-    </fragment>    	
-    <fragment id="utp-5" type="portlet" name="jsf-demo::CalendarPortlet">
-      <property layout="TwoColumns" name="row" value="0" />
-      <property layout="TwoColumns" name="column" value="1" />
-    </fragment>    		
+    </fragment>
   </fragment>
 </page>
Index: applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml
===================================================================
--- applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml	(revision 768264)
+++ applications/jetspeed/src/main/webapp/WEB-INF/pages/_role/user/top-links/top-page.psml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <page id="_role-user-top-links-top-page"
     xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    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">
   <title>[USER] Top Page</title>
   <metadata name="title" xml:lang="ja">[ユーザー] トップページ</metadata>
@@ -31,18 +31,14 @@
     <fragment id="utp-2" type="portlet" name="j2-admin::LoginPortlet">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="0" />
-    </fragment>                                
+    </fragment>
     <fragment id="utp-3" type="portlet" name="demo::UserInfoTest">
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
-    </fragment>    
+    </fragment>
     <fragment id="utp-4" type="portlet" name="demo::BookmarkPortlet">
-      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="row" value="1" />
       <property layout="TwoColumns" name="column" value="1" />
-    </fragment>    	
-    <fragment id="utp-5" type="portlet" name="jsf-demo::CalendarPortlet">
-      <property layout="TwoColumns" name="row" value="0" />
-      <property layout="TwoColumns" name="column" value="1" />
-    </fragment>    		
+    </fragment>
   </fragment>
 </page>
Index: applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/template-dev/default-page.psml
===================================================================
--- applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/template-dev/default-page.psml	(revision 768264)
+++ applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/template-dev/default-page.psml	(working copy)
@@ -34,13 +34,9 @@
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>	    
-    <fragment id="devtemp-1011" type="portlet" name="jsf-demo::CalendarPortlet">
+    <fragment id="devtemp-1012" type="portlet" name="demo::BookmarkPortlet">
       <property layout="TwoColumns" name="row" value="1" />
       <property layout="TwoColumns" name="column" value="1" />
-    </fragment>	
-    <fragment id="devtemp-1012" type="portlet" name="demo::BookmarkPortlet">
-      <property layout="TwoColumns" name="row" value="2" />
-      <property layout="TwoColumns" name="column" value="1" />
     </fragment>
     
   </fragment>
Index: applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/template/default-page.psml
===================================================================
--- applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/template/default-page.psml	(revision 768264)
+++ applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/template/default-page.psml	(working copy)
@@ -18,12 +18,12 @@
     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">
   <title>User Home</title>
-  <metadata name="title" xml:lang="ja">ユーザーホーム</metadata>
+  <metadata name="title" xml:lang="ja">ユーザーホーム</metadata>
   <metadata name="title" xml:lang="es">Carpeta de Usuario</metadata>
-  <metadata name="title" xml:lang="hu">Felhasználó HOME-ja</metadata>
-  <metadata name="title" xml:lang="zh">用户主页</metadata>
-  <metadata name="title" xml:lang="zh-TW">用戶主頁</metadata>
-  <metadata name="title" xml:lang="ko">사용자 홈</metadata>
+  <metadata name="title" xml:lang="hu">Felhasználó HOME-ja</metadata>
+  <metadata name="title" xml:lang="zh">用户主页</metadata>
+  <metadata name="title" xml:lang="zh-TW">用戶主�</metadata>
+  <metadata name="title" xml:lang="ko">사용� 홈</metadata>
 
   <fragment id="uhtemp-1000" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
     <fragment id="uhtemp-1001" type="portlet" name="rss::RSS">
@@ -34,13 +34,9 @@
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>	    
-    <fragment id="uhtemp-1011" type="portlet" name="jsf-demo::CalendarPortlet">
+    <fragment id="uhtemp-1012" type="portlet" name="demo::BookmarkPortlet">
       <property layout="TwoColumns" name="row" value="1" />
       <property layout="TwoColumns" name="column" value="1" />
-    </fragment>	
-    <fragment id="uhtemp-1012" type="portlet" name="demo::BookmarkPortlet">
-      <property layout="TwoColumns" name="row" value="2" />
-      <property layout="TwoColumns" name="column" value="1" />
     </fragment>
     
   </fragment>
Index: applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/user/p003.psml
===================================================================
--- applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/user/p003.psml	(revision 768264)
+++ applications/jetspeed/src/main/webapp/WEB-INF/pages/_user/user/p003.psml	(working copy)
@@ -17,7 +17,7 @@
 -->
 <page id="_user-user-p003"
     xmlns="http://portals.apache.org/jetspeed"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    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">
   <title>[USER 003] PSML page</title>
   <metadata name="title" xml:lang="ja">[ユーザー 003] PSML ページ</metadata>
@@ -28,16 +28,16 @@
   <metadata name="title" xml:lang="ko">[사용자 003] PSML 페이지</metadata>
 
   <fragment id="u3-xx2" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
-  
-	  <fragment id="u3-xx9" type="portlet" name="demo::CustomerList">
+
+      <fragment id="u3-xx9" type="portlet" name="demo::CustomerList">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="0" />
       </fragment>
-	  <fragment id="u3-xx6" type="portlet" name="demo::IFramePortlet">
+      <fragment id="u3-xx6" type="portlet" name="webcontent::IFramePortlet">
         <property layout="TwoColumns" name="row" value="0" />
         <property layout="TwoColumns" name="column" value="1" />
       </fragment>
-	  	  
+
   </fragment>
-  
+
 </page>
Index: applications/jetspeed/src/main/webapp/WEB-INF/pages/_hostname/localhost/_role/user/roletest.psml
===================================================================
--- applications/jetspeed/src/main/webapp/WEB-INF/pages/_hostname/localhost/_role/user/roletest.psml	(revision 768264)
+++ applications/jetspeed/src/main/webapp/WEB-INF/pages/_hostname/localhost/_role/user/roletest.psml	(working copy)
@@ -21,7 +21,7 @@
             <property name="row" value="0"/>
             <property name="column" value="0"/>
         </fragment>
-        <fragment id="role-test-003" type="portlet" name="demo::IFramePortlet">
+        <fragment id="role-test-003" type="portlet" name="webcontent::IFramePortlet">
             <property name="row" value="0"/>
             <property name="column" value="1"/>
         </fragment>
Index: applications/jetspeed/src/main/webapp/WEB-INF/pages/_hostname/localhost/_user/local/home.psml
===================================================================
--- applications/jetspeed/src/main/webapp/WEB-INF/pages/_hostname/localhost/_user/local/home.psml	(revision 768264)
+++ applications/jetspeed/src/main/webapp/WEB-INF/pages/_hostname/localhost/_user/local/home.psml	(working copy)
@@ -21,7 +21,7 @@
             <property name="row" value="0"/>
             <property name="column" value="0"/>
         </fragment>
-        <fragment id="P-111c98bf046-10003" type="portlet" name="demo::IFramePortlet">
+        <fragment id="P-111c98bf046-10003" type="portlet" name="webcontent::IFramePortlet">
             <property name="row" value="0"/>
             <property name="column" value="1"/>
         </fragment>
Index: applications/jetspeed/src/main/webapp/WEB-INF/pages/Public/public.psml
===================================================================
--- applications/jetspeed/src/main/webapp/WEB-INF/pages/Public/public.psml	(revision 768264)
+++ applications/jetspeed/src/main/webapp/WEB-INF/pages/Public/public.psml	(working copy)
@@ -21,12 +21,12 @@
     xsi:schemaLocation="http://portals.apache.org/jetspeed http://portals.apache.org/jetspeed-2/2.1/schemas/psml.xsd">
 
   <title>Public Share</title>
-  <metadata name="title" xml:lang="ja">一般共有</metadata>
+  <metadata name="title" xml:lang="ja">一般共有</metadata>
   <metadata name="title" xml:lang="es">Carpeta compartida</metadata>
-  <metadata name="title" xml:lang="hu">Nyilvános megosztás</metadata>
-  <metadata name="title" xml:lang="zh">公开共享</metadata>
-  <metadata name="title" xml:lang="zh-TW">公開共用</metadata>
-  <metadata name="title" xml:lang="ko">일반 공유</metadata>
+  <metadata name="title" xml:lang="hu">Nyilvános megosztás</metadata>
+  <metadata name="title" xml:lang="zh">公开共享</metadata>
+  <metadata name="title" xml:lang="zh-TW">公開共用</metadata>
+  <metadata name="title" xml:lang="ko">�반 공유</metadata>
 
   <fragment id="ps-1000" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
     <fragment id="ps-1001" type="portlet" name="rss::RSS">
@@ -37,10 +37,6 @@
       <property layout="TwoColumns" name="row" value="0" />
       <property layout="TwoColumns" name="column" value="1" />
     </fragment>
-    <fragment id="ps-1003" type="portlet" name="jsf-demo::CalendarPortlet">
-      <property layout="TwoColumns" name="row" value="1" />
-      <property layout="TwoColumns" name="column" value="1" />
-    </fragment>	
   </fragment>
 
 </page>
Index: applications/jetspeed/src/main/webapp/WEB-INF/pages/jsf-demo.psml
===================================================================
--- applications/jetspeed/src/main/webapp/WEB-INF/pages/jsf-demo.psml	(revision 768264)
+++ applications/jetspeed/src/main/webapp/WEB-INF/pages/jsf-demo.psml	(working copy)
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<page id="JSFPortlets"
-    xmlns="http://portals.apache.org/jetspeed"
-    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">
-
-   <title>JSF Demo</title>
-   <metadata name="title" xml:lang="ja">JSF デモ</metadata>
-   <metadata name="title" xml:lang="es">Demo Java Server Faces</metadata>
-   <metadata name="short-title" xml:lang="es">Demo JSF</metadata>
-   <metadata name="title" xml:lang="hu">JSF Demo</metadata>
-   <metadata name="title" xml:lang="zh">JSF 示例</metadata>
-  
-   <fragment id="jsfportletspage" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
-     <fragment id="jsfGuessNumber1" type="portlet" name="jsf-demo::guessNumber">
-      <property layout="TwoColumns" name="row" value="0" />
-      <property layout="TwoColumns" name="column" value="0" />
-     </fragment>
-     <fragment id="jsfCalendar" type="portlet" name="jsf-demo::CalendarPortlet">
-      <property layout="TwoColumns" name="row" value="0" />
-      <property layout="TwoColumns" name="column" value="1" />
-     </fragment>
-  </fragment>
-  
-
-  <security-constraints>
-    <security-constraints-ref>users</security-constraints-ref>
-  </security-constraints>
-</page>
Index: applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml
===================================================================
--- applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml	(revision 768264)
+++ applications/jetspeed-demo/jetspeed-mvn-demo-pom.xml	(working copy)
@@ -6,15 +6,15 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-  
+
   $Id$
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -33,7 +33,7 @@
     <artifactId>applications</artifactId>
     <version>2.2-SNAPSHOT</version>
   </parent>
-  
+
   <packaging>pom</packaging>
 
   <properties>
@@ -298,6 +298,7 @@
                 <phase>process-resources</phase>
                 <configuration>
                   <targetBaseDir>${org.apache.jetspeed.server.home}</targetBaseDir>
+                  <!-- <profile>tomcat6</profile> -->
                   <portalName>${org.apache.jetspeed.portal.context.name}</portalName>
                   <destinations>
                     <context>webapps/${org.apache.jetspeed.portal.context.name}/META-INF</context>
@@ -435,7 +436,7 @@
 	            </configuration>
 	           </execution>
 	         </executions>
-	        </plugin>           
+	        </plugin>
             <plugin>
             <groupId>org.apache.portals.jetspeed-2</groupId>
             <artifactId>jetspeed-fileutils-maven-plugin</artifactId>
@@ -453,7 +454,7 @@
                 </configuration>
                </execution>
              </executions>
-            </plugin>           
+            </plugin>
         </plugins>
         <resources>
           <resource>
@@ -463,8 +464,8 @@
           </resource>
         </resources>
       </build>
-    </profile>    
-    
+    </profile>
+
     <profile>
       <id>deploy</id>
       <build>
@@ -591,17 +592,6 @@
                       <targetName>webcontent.war</targetName>
                       <delete>./webcontent</delete>
                     </deployment>
-                    <deployment>
-                      <artifact>org.apache.portals.bridges:jpetstore:war</artifact>
-                      <infuse>true</infuse>
-                      <delete>./jpetstore</delete>
-                    </deployment>
-                    <deployment>
-                      <artifact>org.apache.portals.bridges:jsf-demo:war</artifact>
-                      <infuse>true</infuse>
-                      <expand>true</expand>
-                      <delete>./jsf-demo</delete>
-                    </deployment>
                   </deployments>
                 </configuration>
               </execution>
@@ -683,18 +673,6 @@
                 <version>1.0-SNAPSHOT</version>
                 <type>war</type>
               </dependency>
-              <dependency>
-                <groupId>org.apache.portals.bridges</groupId>
-                <artifactId>jsf-demo</artifactId>
-                <version>1.0.4</version>
-                <type>war</type>
-              </dependency>
-              <dependency>
-                <groupId>org.apache.portals.bridges</groupId>
-                <artifactId>jpetstore</artifactId>
-                <version>1.0.4</version>
-                <type>war</type>
-              </dependency>
 
               <!-- plugin own dependencies -->
               <dependency>
@@ -757,7 +735,7 @@
         </plugins>
       </build>
     </profile>
-    
+
   </profiles>
 
 </project>
Index: pom.xml
===================================================================
--- pom.xml	(revision 768264)
+++ pom.xml	(working copy)
@@ -310,9 +310,6 @@
     <org.apache.pluto.version>2.0.0-SNAPSHOT</org.apache.pluto.version>
     <org.apache.portals.bridges.common.version>1.0.4</org.apache.portals.bridges.common.version>
     <org.apache.portals.bridges.frameworks.version>1.0.4</org.apache.portals.bridges.frameworks.version>
-    <org.apache.portals.bridges.jpetstore.version>1.0.4</org.apache.portals.bridges.jpetstore.version>
-    <org.apache.portals.bridges.jsf-demo.version>1.0.4</org.apache.portals.bridges.jsf-demo.version>
-    <org.apache.portals.bridges.jsf.version>1.0.4</org.apache.portals.bridges.jsf.version>
     <org.apache.portals.bridges.velocity.version>1.0.4</org.apache.portals.bridges.velocity.version>
     <org.apache.portals.bridges.groovy.version>1.0.4</org.apache.portals.bridges.groovy.version>
     <org.apache.portals.bridges.portletfilter.version>1.0.4</org.apache.portals.bridges.portletfilter.version>
@@ -1242,11 +1239,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.portals.bridges</groupId>
-        <artifactId>portals-bridges-jsf</artifactId>
-        <version>${org.apache.portals.bridges.jsf.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.portals.bridges</groupId>
         <artifactId>portals-bridges-groovy</artifactId>
         <version>${org.apache.portals.bridges.groovy.version}</version>
       </dependency>
@@ -1256,20 +1248,6 @@
         <version>${org.apache.portals.bridges.portletfilter.version}</version>
       </dependency>
 
-      <!-- Portals Bridges Applications -->
-      <dependency>
-        <groupId>org.apache.portals.bridges</groupId>
-        <artifactId>jpetstore</artifactId>
-        <type>war</type>
-        <version>${org.apache.portals.bridges.jpetstore.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.portals.bridges</groupId>
-        <artifactId>jsf-demo</artifactId>
-        <type>war</type>
-        <version>${org.apache.portals.bridges.jsf-demo.version}</version>
-      </dependency>
-
       <!-- MyFaces -->
       <dependency>
         <groupId>myfaces</groupId>
Index: jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
===================================================================
--- jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml	(revision 768264)
+++ jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml	(working copy)
@@ -352,33 +352,25 @@
                     <deployment>
                       <artifact>org.apache.portals.jetspeed-2:j2-admin:war</artifact>
                       <expand>true</expand>
+                      <infuse>true</infuse>
                       <delete>./j2-admin</delete>
                     </deployment>
                     <!-- demo pa's, not for minimal! -->
                     <deployment>
-                      <artifact>org.apache.portals.applications:demo:war</artifact>
-                      <expand>true</expand>
-                      <infuse>true</infuse>
+                      <artifact>org.apache.portals.applications:apa-demo:war</artifact>
+                      <targetName>demo.war</targetName>
                       <delete>./demo</delete>
                     </deployment>
                     <deployment>
-                      <artifact>org.apache.portals.applications:rss:war</artifact>
-                      <infuse>true</infuse>
-                      <expand>true</expand>
+                      <artifact>org.apache.portals.applications:apa-rss-war:war</artifact>
+                      <targetName>rss.war</targetName>
                       <delete>./rss</delete>
                     </deployment>
                     <deployment>
-                      <artifact>org.apache.portals.bridges:jpetstore:war</artifact>
-                      <infuse>true</infuse>
-                      <expand>true</expand>
-                      <delete>./jpetstore</delete>
+                      <artifact>org.apache.portals.applications:apa-webcontent-war:war</artifact>
+                      <targetName>webcontent.war</targetName>
+                      <delete>./webcontent</delete>
                     </deployment>
-                    <deployment>
-                      <artifact>org.apache.portals.bridges:jsf-demo:war</artifact>
-                      <infuse>true</infuse>
-                      <expand>true</expand>
-                      <delete>./jsf-demo</delete>
-                    </deployment>
                   </deployments>
                 </configuration>
               </execution>
@@ -439,29 +431,23 @@
               <!-- demo pa's, not for minimal! -->
               <dependency>
                 <groupId>org.apache.portals.applications</groupId>
-                <artifactId>demo</artifactId>
-                <version>${org.apache.portals.jetspeed.version}</version>
+                <artifactId>apa-rss-war</artifactId>
+                <version>1.0-SNAPSHOT</version>
                 <type>war</type>
               </dependency>
               <dependency>
                 <groupId>org.apache.portals.applications</groupId>
-                <artifactId>rss</artifactId>
-                <version>${org.apache.portals.jetspeed.version}</version>
+                <artifactId>apa-demo</artifactId>
+                <version>1.0-SNAPSHOT</version>
                 <type>war</type>
               </dependency>
               <dependency>
-                <groupId>org.apache.portals.bridges</groupId>
-                <artifactId>jsf-demo</artifactId>
-                <version>1.0.4</version>
+                <groupId>org.apache.portals.applications</groupId>
+                <artifactId>apa-webcontent-war</artifactId>
+                <version>1.0-SNAPSHOT</version>
                 <type>war</type>
               </dependency>
-              <dependency>
-                <groupId>org.apache.portals.bridges</groupId>
-                <artifactId>jpetstore</artifactId>
-                <version>1.0.4</version>
-                <type>war</type>
-              </dependency>
-
+              
               <!-- plugin own dependencies -->
               <dependency>
                 <groupId>org.apache.portals.jetspeed-2</groupId>