Index: jetspeed-installer/zip-tomcat-portal-descriptor.xml
===================================================================
--- jetspeed-installer/zip-tomcat-portal-descriptor.xml	(revision 741077)
+++ jetspeed-installer/zip-tomcat-portal-descriptor.xml	(working copy)
@@ -27,7 +27,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>target/${tomcat.version}</directory>
+      <directory>target/${tomcat.name}</directory>
       <outputDirectory>/</outputDirectory>
     </fileSet>
   </fileSets>
Index: jetspeed-installer/etc/database/import/assembly/repository-datasource-spring.xml
===================================================================
--- jetspeed-installer/etc/database/import/assembly/repository-datasource-spring.xml	(revision 741077)
+++ jetspeed-installer/etc/database/import/assembly/repository-datasource-spring.xml	(working copy)
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-    
-  <!-- datasource bean -->
-  <!--  <bean id="JetspeedDS" class="org.apache.jetspeed.components.rdbms.ojb.ConnectionRepositoryEntry"> -->
-  <bean id="JetspeedDS" class="org.apache.commons.dbcp.BasicDataSource">     
-    <property name="driverClassName">
-      <value>${import.jdbc.driver.class}</value>
-    </property>
-    <property name="url">
-      <value>${import.jdbc.url}</value>
-    </property>
-    <property name="username">
-      <value>${import.jdbc.username}</value>
-    </property>
-    <property name="password">
-      <value>${import.jdbc.password}</value>
-    </property>
-  </bean>     
-  
-  <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/> 
-  
-  <!-- 
-    Dynamically configures Database Platform for OJB by looking at the connection string
-    and figuring out the OJB platform using an OJB metadata utility
-    Its important to get this right otherwise you will be sending the wrong (most likely HSQL)
-    flavor of SQL statements to the backend database.
-  -->
-  <bean id="PlatformConfigurator" 
-    class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator"
-    init-method="init"
-    >
-    <constructor-arg index='0'>
-      <ref bean="JetspeedDS"/>
-    </constructor-arg>         
-    <!-- JNDI Name -->
-    <constructor-arg index='1'>
-      <value>JetspeedDS</value>
-    </constructor-arg>                  
-  </bean>
-  
-  <!-- properties configurer used to pick up system properties -->
-  <bean id="propertiesConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-  
-</beans>
Index: jetspeed-installer/etc/database/import/assembly/import-page-manager.xml
===================================================================
--- jetspeed-installer/etc/database/import/assembly/import-page-manager.xml	(revision 741077)
+++ jetspeed-installer/etc/database/import/assembly/import-page-manager.xml	(working copy)
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-    
-  <bean id="org.apache.jetspeed.page.PageManagerImpl" 
-        name="pageManagerImpl"
-        init-method="init"
-        class="org.apache.jetspeed.page.impl.DatabasePageManager">
-      <!-- OJB configuration file resource path -->
-      <constructor-arg index="0"><value>JETSPEED-INF/ojb/page-manager-repository.xml</value></constructor-arg>       
-      <!-- permissions security enabled flag, default=false -->
-      <constructor-arg index="1"><value>false</value></constructor-arg>
-      <!-- constraints security enabled flag, default=true -->
-      <constructor-arg index="2"><value>false</value></constructor-arg>
-      <!-- folder/page/link cache -->
-      <constructor-arg index="3"><ref bean="pageManagerOidCache"/></constructor-arg>
-      <!-- folder/page/link path cache -->
-      <constructor-arg index="4"><ref bean="pageManagerPathCache"/></constructor-arg>
-  </bean>
-
-    <!-- Proxying -->
-    <bean id="org.apache.jetspeed.page.PageManager" name="dbPageManager" parent="PageManagerTransactionProxy">
-        <property name="proxyInterfaces">
-            <value>org.apache.jetspeed.page.PageManager</value>
-        </property>
-        <property name="target">
-            <ref bean="pageManagerImpl" />
-        </property>
-        <property name="transactionAttributes">
-            <props>
-              <prop key="getPage*">PROPAGATION_SUPPORTS</prop>  
-              <prop key="getLink*">PROPAGATION_SUPPORTS</prop>  
-              <prop key="getFolder*">PROPAGATION_SUPPORTS</prop>  
-              <prop key="getContentPage">PROPAGATION_SUPPORTS</prop>  
-              <prop key="getAll">PROPAGATION_SUPPORTS</prop>  
-              <prop key="getUserFolder">PROPAGATION_SUPPORTS</prop>  
-              <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
-              <prop key="removePage">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
-              <prop key="removeFolder">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
-              <prop key="removeLink">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
-              <prop key="removePageSecurity">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>                            
-              <prop key="createUserHomePagesFromRoles">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
-              <prop key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
-              <prop key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>              
-              <prop key="folderExists">PROPAGATION_SUPPORTS</prop>  
-              <prop key="pageExists">PROPAGATION_SUPPORTS</prop>  
-              <prop key="linkExists">PROPAGATION_SUPPORTS</prop>  
-              <prop key="userFolderExists">PROPAGATION_SUPPORTS</prop>  
-              <prop key="userPageExists">PROPAGATION_SUPPORTS</prop>  
-            </props>
-        </property>
-    </bean>
-
-    <!-- Inject Page Manager Proxy into Page Manager -->
-    <bean id="injectPageManagerProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-        <property name="targetObject"><ref bean="pageManagerImpl"/></property>
-        <property name="targetMethod"><value>setPageManagerProxy</value></property>
-        <property name="arguments">
-            <list>
-                <ref bean="dbPageManager"/>
-            </list>
-        </property>
-    </bean>
-
-  <!-- PageManager -->
-  <bean id="PsmlDocumentHandler"      
-       class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >         
-       <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
-       <constructor-arg index="1"><value>.psml</value></constructor-arg>
-       <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.PageImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
-  </bean>
-  
-  <bean id="LinkDocumentHandler"       
-       class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >         
-       <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
-       <constructor-arg index="1"><value>.link</value></constructor-arg>
-       <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.LinkImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
-  </bean>
-  
-  <bean id="FolderMetaDataDocumentHandler"         
-       class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >         
-       <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
-       <constructor-arg index="1"><value>folder.metadata</value></constructor-arg>
-       <constructor-arg index="2" ><value>org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
-  </bean>
-  
-  <bean id="PageSecurityDocumentHandler"       
-       class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >         
-       <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
-       <constructor-arg index="1"><value>page.security</value></constructor-arg>
-       <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.PageSecurityImpl</value></constructor-arg>       
-       <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
-  </bean>
-  
-  <bean id="DocumentHandlerFactory"        
-       class="org.apache.jetspeed.page.document.psml.DocumentHandlerFactoryImpl" >      
-        <constructor-arg>
-        <map>
-          <entry key=".psml">
-            <ref bean="PsmlDocumentHandler" />
-          </entry>
-          <entry key=".link">
-            <ref bean="LinkDocumentHandler" />
-          </entry>  
-          <entry key="folder.metadata">
-            <ref bean="FolderMetaDataDocumentHandler" />
-          </entry>        
-          <entry key="page.security">
-            <ref bean="PageSecurityDocumentHandler" />
-          </entry>        
-        </map>
-       </constructor-arg>
-  </bean>
-  
-  <bean id="FolderHandler"         
-       class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler" >         
-       <constructor-arg index="0"><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
-       <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
-       <constructor-arg index="2"><ref bean="PageFileCache"/></constructor-arg>        
-  </bean>
-    
-  <bean id="org.apache.jetspeed.page.CastorPageManager" 
-       name="castorPageManager"
-       class="org.apache.jetspeed.page.psml.CastorXmlPageManager">         
-       <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
-       <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
-       <constructor-arg index="2"><ref bean="FolderHandler"/></constructor-arg>
-       <constructor-arg index="3"><ref bean="PageFileCache"/></constructor-arg>        
-       <!-- permissions security enabled flag, default=false -->
-       <constructor-arg index="4"><value>false</value></constructor-arg>
-       <!-- constraints security enabled flag, default=true -->
-       <constructor-arg index="5"><value>false</value></constructor-arg>
-  </bean>
-
-    <!-- Page File Cache -->
-    <bean id="PageFileCache" class="org.apache.jetspeed.cache.file.FileCache" init-method="startFileScanner" destroy-method="stopFileScanner">
-        <!-- Scan rate for changes in cached files on the file system -->
-        <constructor-arg index="0">
-            <value>10</value>
-        </constructor-arg>
-        <!-- Cache size -->
-        <constructor-arg index="1">
-            <value>100</value>
-        </constructor-arg>
-    </bean>
-
-    <bean id="IdGenerator" class="org.apache.jetspeed.idgenerator.JetspeedIdGenerator" init-method="start" destroy-method="stop">
-        <!-- ID Start value -->
-        <constructor-arg index="0">
-            <value>65536</value>
-        </constructor-arg>
-        <!-- ID Prefix -->
-        <constructor-arg index="1">
-            <value>P-</value>
-        </constructor-arg>
-        <!-- ID Suffix -->
-        <constructor-arg index="2">
-            <value></value>
-        </constructor-arg>
-    </bean>
-
-
-    <!-- properties configurer used to pick up system properties -->
-    <bean id="propertiesConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-
-</beans>
Index: jetspeed-installer/etc/database/import/import.properties
===================================================================
--- jetspeed-installer/etc/database/import/import.properties	(revision 741077)
+++ jetspeed-installer/etc/database/import/import.properties	(working copy)
@@ -1,16 +0,0 @@
-# comma-separated list of boot assemblies for Spring
-boot.assemblies =  repository-datasource-spring.xml
-# comma-separated list of assemblies for Spring
-assemblies = import-page-manager.xml, transaction.xml, interceptors.xml
-# root folder to start exporting from
-root.folder = /
-# overwrite folders flag, set to true to replace existing folders
-overwrite.folders = true
-# overwrite pages flag, set to true to replace existing pages 
-overwrite.pages = true
-# if this flag is true, will also try to import page.security 
-full.import = true
-# source page manager Spring component name
-source.page.manager = castorPageManager
-# destination page manager Spring component name
-dest.page.manager = dbPageManager
Index: jetspeed-installer/etc/database/import/log4j.properties
===================================================================
--- jetspeed-installer/etc/database/import/log4j.properties	(revision 741077)
+++ jetspeed-installer/etc/database/import/log4j.properties	(working copy)
@@ -1,34 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# ------------------------------------------------------------------------
-#
-# Logging Configuration
-#
-# $Id$
-#
-# ------------------------------------------------------------------------
-
-log4j.rootLogger = WARN, console
-
-#
-# Console
-#
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-
-# Pattern to output the caller's file name and line number.
-log4j.appender.console.layout.ConversionPattern=%5p: %m%n
-
Index: jetspeed-installer/etc/database/resources/spring-filter-key.properties
===================================================================
--- jetspeed-installer/etc/database/resources/spring-filter-key.properties	(revision 0)
+++ jetspeed-installer/etc/database/resources/spring-filter-key.properties	(revision 0)
@@ -0,0 +1,17 @@
+# 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.
+
+# Use this to override settings in jetspeed.properties
+spring.filter.key=${org.apache.jetspeed.spring.filter.key}

Property changes on: jetspeed-installer\etc\database\resources\spring-filter-key.properties
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Index: jetspeed-installer/etc/database/build.xml
===================================================================
--- jetspeed-installer/etc/database/build.xml	(revision 741077)
+++ jetspeed-installer/etc/database/build.xml	(working copy)
@@ -72,33 +72,33 @@
 
 	</target>
 
-	<target name="setupNoDB">
-		<antcall target="setupDBPSML" />
-	</target>
+	<target name="runSetupDB" depends="checkDerby,checkImportPsml,generateStandardDB,generateDerbyDB,copyJetspeedContext,filterSpringFilterKey,seedDB,dbPsml" />
 
+	<target name="runSetupNoDB" depends="checkImportPsml,copyJetspeedContext,filterSpringFilterKey" />
+
 	<target name="checkInput" unless="failSetup">
 		<antcall target="runSetupDB" />
 	</target>
 
-	<target name='setupDBPSML'>
-		<copy file="${jetspeedWebInfDir}/assembly/page-manager.xml" tofile="${jetspeedWebInfDir}/assembly/alternate/fs-page-manager.xml" />
-	</target>
-
-	<target name="runSetupDB" depends="setupDBPSML,checkDerby,generateStandardDB,generateDerbyDB,copyJetspeedContext,filterSpringDatasource,seedDB,do-psml" />
-
 	<target name="checkDerby">
 		<condition property="_derby">
 			<equals arg1="${db.type}" arg2="derby" />
 		</condition>
 	</target>
 
+	<target name="checkImportPsml">
+		<condition property="_doImportPsml">
+			<equals arg1="${dbImportPsml}" arg2="true" />
+		</condition>
+	</target>
+
 	<target name="generateDerbyDB" if="_derby">
 		<delete dir="${basedir}/derby/productiondb" quiet="true" />
 		<echo>Executing file ${basedir}/derby/create-schema.sql</echo>
 
 		<java classname="org.apache.jetspeed.anttasks.ExecuteJavaSQL" fork="yes">
 			<classpath>
-				<fileset dir="${basedir}/../shared/lib">
+				<fileset dir="${basedir}/../lib">
 					<include name="**/*.jar" />
 				</fileset>
 				<fileset dir="${jetspeedWebInfDir}/lib">
@@ -107,10 +107,7 @@
 				<fileset dir="${basedir}/lib">
 					<include name="**/*.jar" />
 				</fileset>
-				<fileset dir="${basedir}/../common/lib">
-					<include name="**/*.jar" />
-				</fileset>
-				<pathelement location="${basedir}/../shared/classes" />
+				<pathelement location="${basedir}/../lib" />
 				<pathelement location="${jetspeedWebInfDir}/classes" />
 			</classpath>
 			<arg line="driver=&quot;${_jdbc.driver.class}&quot; 
@@ -127,7 +124,7 @@
 
 		<sql driver="${_jdbc.driver.class}" url="${_jdbc.url}" userid="${_db.username}" password="${_db.password}" src="${basedir}/${db.type}/drop-schema.sql" autocommit="true" onerror="continue" print="no" output="setup.log">
 			<classpath>
-				<fileset dir="${basedir}/../shared/lib">
+				<fileset dir="${basedir}/../lib">
 					<include name="**/*.jar" />
 				</fileset>
 			</classpath>
@@ -136,7 +133,7 @@
 		<echo>Starting database generation</echo>
 		<sql driver="${_jdbc.driver.class}" url="${_jdbc.url}" userid="${_db.username}" password="${_db.password}" src="${basedir}/${db.type}/create-schema.sql">
 			<classpath>
-				<fileset dir="${basedir}/../shared/lib">
+				<fileset dir="${basedir}/../lib">
 					<include name="**/*.jar" />
 				</fileset>
 			</classpath>
@@ -146,7 +143,7 @@
 	</target>
 
 	<target name="copyJetspeedContext">
-		<copy file="${portalName}.xml" tofile="${basedir}/../conf/Catalina/localhost/${portalName}.xml" overwrite="true">
+		<copy file="resources/${portalName}.xml" tofile="${basedir}/../conf/Catalina/localhost/${portalName}.xml" overwrite="true">
 
 			<!-- note that the $ is escaped here -->
 			<filterset begintoken="$${" endtoken="}">
@@ -158,27 +155,39 @@
 		</copy>
 	</target>
 
-	<target name="filterSpringDatasource">
-		<copy file="${jetspeedWebInfDir}/assembly/boot/datasource.xml" tofile="${jetspeedWebInfDir}/assembly/boot/datasource_filtered.xml">
+	<target name="filterSpringFilterKey">
+		<delete quiet="true" file="${jetspeedWebInfDir}/conf/spring-filter-key.properties" />
+
+		<!-- Ant's if/else simulation, _doImportPsml has been set before -->
+		<antcall target="filterSpringFilterKey_db"/>
+		<antcall target="filterSpringFilterKey_file"/>
+	</target>
+
+	<target name="filterSpringFilterKey_db" if="_doImportPsml">
+		<copy file="resources/spring-filter-key.properties" todir="${jetspeedWebInfDir}/conf/">
 			<!-- note that the $ is escaped here -->
 			<filterset begintoken="$${" endtoken="}">
-				<filter token="org.apache.jetspeed.database.user" value="${_db.username}" />
-				<filter token="org.apache.jetspeed.database.password" value="${_db.password}" />
-				<filter token="org.apache.jetspeed.database.driver" value="${_jdbc.driver.class}" />
-				<filter token="org.apache.jetspeed.database.url" value="${_jdbc.url}" />
+				<filter token="org.apache.jetspeed.spring.filter.key" value="portal.dbPageManager" />
 			</filterset>
 		</copy>
-		<move file="${jetspeedWebInfDir}/assembly/boot/datasource_filtered.xml" tofile="${jetspeedWebInfDir}/assembly/boot/datasource.xml" overwrite="true" />
-		<delete file="${jetspeedWebInfDir}/assembly/boot/datasource_filtered.xml" />
 	</target>
 
+	<target name="filterSpringFilterKey_file" unless="_doImportPsml">
+		<copy file="resources/spring-filter-key.properties" todir="${jetspeedWebInfDir}/conf/">
+			<!-- note that the $ is escaped here -->
+			<filterset begintoken="$${" endtoken="}">
+				<filter token="org.apache.jetspeed.spring.filter.key" value="portal" />
+			</filterset>
+		</copy>
+	</target>
+
 	<target name="seedDB">
 
 		<echo>Seeding the database</echo>
 
 		<java classname="org.apache.jetspeed.tools.db.serializer.JetspeedSerializerApplicationImpl" fork="yes">
 			<classpath>
-				<fileset dir="${basedir}/../shared/lib">
+				<fileset dir="${basedir}/../lib">
 					<include name="**/*.jar" />
 				</fileset>
 				<fileset dir="${jetspeedWebInfDir}/lib">
@@ -187,14 +196,16 @@
 				<fileset dir="${basedir}/lib">
 					<include name="**/*.jar" />
 				</fileset>
-				<fileset dir="${basedir}/../common/lib">
-					<include name="**/*.jar" />
-				</fileset>
-				<pathelement location="${basedir}/../shared/classes" />
+				<pathelement location="${basedir}/../lib" />
 				<pathelement location="${jetspeedWebInfDir}/classes" />
 			</classpath>
 
-			<arg line="-I &quot;${basedir}/j2-seed.xml&quot; 
+            <sysproperty key="org.apache.jetspeed.database.user" value="${_db.username}"/>
+	        <sysproperty key="org.apache.jetspeed.database.password" value="${_db.password}"/>
+	        <sysproperty key="org.apache.jetspeed.database.url" value="${_jdbc.url}"/>
+	        <sysproperty key="org.apache.jetspeed.database.driver" value="${_jdbc.driver.class}"/>
+	        	
+			<arg line="-I &quot;${basedir}/resources/j2-seed.xml&quot; 
               -a &quot;${basedir}/../webapps/${portalName}&quot;
       		  -c &quot;serializer&quot;
       	      -p &quot;${jetspeedWebInfDir}/conf/spring-filter.properties&quot;" />
@@ -202,42 +213,30 @@
 
 	</target>
 
-	<!-- Populate database with pages the user has selected so -->
-	<target name="do-psml" depends="test-import-psml,db-psml,fs-psml" />
+	<target name="dbPsml" if="_doImportPsml">
 
-	<target name="test-import-psml">
-		<condition property="_doImportPsml">
-			<equals arg1="${dbImportPsml}" arg2="true" />
-		</condition>
-	</target>
-
-	<target name="fs-psml" unless="_doImportPsml">
-		<copy file="${jetspeedWebInfDir}/assembly/alternate/fs-page-manager.xml" tofile="${jetspeedWebInfDir}/assembly/page-manager.xml" overwrite="true" />
-		<delete quiet="true" file="${jetspeedWebInfDir}/assembly/interceptors.xml" />
-	</target>
-
-	<target name="db-psml" if="_doImportPsml">
-
 	    <echo>Importing psml into the database</echo>
 
 	    <java classname="org.apache.jetspeed.tools.page.serializer.JetspeedPageSerializerApplicationImpl" fork="yes">
 	      <classpath>
-	        <fileset dir="${basedir}/../shared/lib">
-	          <include name="**/*.jar" />
-	        </fileset>
-	        <fileset dir="${jetspeedWebInfDir}/lib">
-	          <include name="**/*.jar" />
-	        </fileset>
-	        <fileset dir="${basedir}/lib">
-	          <include name="**/*.jar" />
-	        </fileset>
-	        <fileset dir="${basedir}/../common/lib">
-	          <include name="**/*.jar" />
-	        </fileset>
-	        <pathelement location="${basedir}/../shared/classes" />
-	        <pathelement location="${jetspeedWebInfDir}/classes" />
+			<fileset dir="${basedir}/../lib">
+				<include name="**/*.jar" />
+			</fileset>
+			<fileset dir="${jetspeedWebInfDir}/lib">
+				<include name="**/*.jar" />
+			</fileset>
+			<fileset dir="${basedir}/lib">
+				<include name="**/*.jar" />
+			</fileset>
+			<pathelement location="${basedir}/../lib" />
+			<pathelement location="${jetspeedWebInfDir}/classes" />
 	      </classpath>
 
+          <sysproperty key="org.apache.jetspeed.database.user" value="${_db.username}"/>
+          <sysproperty key="org.apache.jetspeed.database.password" value="${_db.password}"/>
+          <sysproperty key="org.apache.jetspeed.database.url" value="${_jdbc.url}"/>
+          <sysproperty key="org.apache.jetspeed.database.driver" value="${_jdbc.driver.class}"/>
+
 	      <arg
 	        line="-I &quot;/&quot;
 	              -a &quot;${basedir}/../webapps/${portalName}&quot;
Index: jetspeed-installer/etc/ant-installer/antinstall-config.xml
===================================================================
--- jetspeed-installer/etc/ant-installer/antinstall-config.xml	(revision 741077)
+++ jetspeed-installer/etc/ant-installer/antinstall-config.xml	(working copy)
@@ -44,7 +44,7 @@
   
   <page type="input" name="requiredComponents" displayText="Components selection">
     <comment displayText="Jetspeed Enterprise Portal version 2.2-SNAPSHOT" bold="true" />
-    <target displayText="Tomcat 5.5.27 Webserver" target="install" defaultValue="true" force="true" />
+    <target displayText="Tomcat 6.0.18 Webserver" target="install" defaultValue="true" force="true" />
     <checkbox displayText="Jetspeed Portal" property="dummy" defaultValue="true" force="true" />
     <checkbox displayText="Jetspeed Layout Portlets" property="dummy" defaultValue="true" force="true" />
     <checkbox displayText="Jetspeed Administration Portlets" property="dummy" defaultValue="true" force="true" />
@@ -199,20 +199,20 @@
   <page type="input" name="dbCheckFailed" displayText="Connection to the database failed"
     ifProperty="(${checkdb}=true) AND (${dbvalid}=false)">
     <hidden property="checkdb" value="false" />
-    <hidden property="setupDBAntTarget" value="setupNoDB" />
+    <hidden property="setupDBAntTarget" value="runSetupNoDB" />
     
     <comment displayText="Please go back and specify the correct database configuration parameters." bold="true" />
     <comment displayText="" />
     <comment displayText="Continuing now will otherwise require manual setup of the database."/>
   </page>
   
-  <page type="input" name="beforeInstall" displayText="Before your install.." ifProperty="(${dbName}=manual) OR (${setupDBAntTarget}=setupNoDB)">
+  <page type="input" name="beforeInstall" displayText="Before your install.." ifProperty="(${dbName}=manual) OR (${setupDBAntTarget}=runSetupNoDB)">
     <hidden property="db.username" value="" />
     <hidden property="db.password" value="" />
     <hidden property="jdbc.url" value="" />
     <hidden property="jdbc.driver.class" value="" />
     <hidden property="jdbc.driver.jar" value="" />
-    <hidden property="setupDBAntTarget" value="setupNoDB" />
+    <hidden property="setupDBAntTarget" value="runSetupNoDB" />
     <comment displayText="Jetspeed will be installed without yet a configured database to:" bold="true"/>
     <comment displayText="  ${installDir}"/>
     <comment displayText="Warning: all content in this directory will be deleted first!" bold="true"/>
Index: jetspeed-installer/etc/ant-installer/antinstall-config-min.xml
===================================================================
--- jetspeed-installer/etc/ant-installer/antinstall-config-min.xml	(revision 741077)
+++ jetspeed-installer/etc/ant-installer/antinstall-config-min.xml	(working copy)
@@ -44,7 +44,7 @@
 
   <page type="input" name="requiredComponents" displayText="Components selection">
     <comment displayText="Jetspeed Enterprise Portal version 2.2-SNAPSHOT" bold="true" />
-    <target displayText="Tomcat 5.5.27 Webserver" target="install" defaultValue="true" force="true" />
+    <target displayText="Tomcat 6.0.18 Webserver" target="install" defaultValue="true" force="true" />
     <checkbox displayText="Jetspeed Portal" property="dummy" defaultValue="true" force="true" />
     <checkbox displayText="Jetspeed Layout Portlets" property="dummy" defaultValue="true" force="true" />
     <checkbox displayText="Jetspeed Administration Portlets" property="dummy" defaultValue="true" force="true" />
@@ -196,20 +196,20 @@
   <page type="input" name="dbCheckFailed" displayText="Connection to the database failed"
     ifProperty="(${checkdb}=true) AND (${dbvalid}=false)">
     <hidden property="checkdb" value="false" />
-    <hidden property="setupDBAntTarget" value="setupNoDB" />
+    <hidden property="setupDBAntTarget" value="runSetupNoDB" />
 
     <comment displayText="Please go back and specify the correct database configuration parameters." bold="true" />
     <comment displayText="" />
     <comment displayText="Continuing now will otherwise require manual setup of the database."/>
   </page>
 
-  <page type="input" name="beforeInstall" displayText="Before your install.." ifProperty="(${dbName}=manual) OR (${setupDBAntTarget}=setupNoDB)">
+  <page type="input" name="beforeInstall" displayText="Before your install.." ifProperty="(${dbName}=manual) OR (${setupDBAntTarget}=runSetupNoDB)">
     <hidden property="db.username" value="" />
     <hidden property="db.password" value="" />
     <hidden property="jdbc.url" value="" />
     <hidden property="jdbc.driver.class" value="" />
     <hidden property="jdbc.driver.jar" value="" />
-    <hidden property="setupDBAntTarget" value="setupNoDB" />
+    <hidden property="setupDBAntTarget" value="runSetupNoDB" />
     <comment displayText="Jetspeed will be installed without yet a configured database to:" bold="true"/>
     <comment displayText="  ${installDir}"/>
     <comment displayText="Warning: all content in this directory will be deleted first!" bold="true"/>
Index: jetspeed-installer/etc/ant-installer/build.xml
===================================================================
--- jetspeed-installer/etc/ant-installer/build.xml	(revision 741077)
+++ jetspeed-installer/etc/ant-installer/build.xml	(working copy)
@@ -56,7 +56,7 @@
     </condition>
     
     <property name="jdbcjar" value="${jdbc.driver.jar}" />
-    <copy failonerror="false" todir="${installDir}/shared/lib" file="${jdbcjar}" />
+    <copy failonerror="false" todir="${installDir}/lib" file="${jdbcjar}" />
 
     <move file="${installDir}/database/database.properties.template" tofile="${installDir}/database/database.properties"
       overwrite="true">
Index: jetspeed-installer/jetspeed-mvn-database-pom.xml
===================================================================
--- jetspeed-installer/jetspeed-mvn-database-pom.xml	(revision 741077)
+++ jetspeed-installer/jetspeed-mvn-database-pom.xml	(working copy)
@@ -112,10 +112,18 @@
         </exclusion>
         <exclusion>
           <groupId>org.apache.portals.jetspeed-2</groupId>
+          <artifactId>jetspeed-rdbms</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.portals.jetspeed-2</groupId>
           <artifactId>jetspeed-registry</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.portals.jetspeed-2</groupId>
+          <artifactId>jetspeed-sso</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.portals.jetspeed-2</groupId>
           <artifactId>jetspeed-id-generator</artifactId>
         </exclusion>
         <exclusion>
@@ -142,6 +150,14 @@
           <groupId>org.apache.portals.jetspeed-2</groupId>
           <artifactId>jetspeed-serializer</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.springframework</groupId>
+          <artifactId>spring-ojb</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
   </dependencies>
@@ -179,9 +195,8 @@
             <configuration>
               <tasks>
                 <copy file="${project.build.directory}/resources/tomcat/context.xml"
-                  tofile="${project.build.directory}/database/${org.apache.jetspeed.portal.context.name}.xml"
-                />
-              </tasks>
+                  tofile="${project.build.directory}/database/resources/${org.apache.jetspeed.portal.context.name}.xml" />
+               </tasks>
             </configuration>
             <goals>
               <goal>run</goal>
@@ -215,13 +230,9 @@
                   <resource>
                     <path>@seed.path@</path>
                     <include>j2-seed.xml</include>
-                    <destination>database</destination>
+                    <destination>database/resources</destination>
                   </resource>
                   <resource>
-                    <path>db-ojb</path>
-                    <destination>database/import/db-ojb</destination>
-                  </resource>
-                  <resource>
                     <path>ddl</path>
                     <destination>database</destination>
                   </resource>
@@ -265,3 +276,4 @@
   </build>
 
 </project>
+
Index: jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
===================================================================
--- jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml	(revision 741077)
+++ jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml	(working copy)
@@ -38,10 +38,12 @@
   <packaging>pom</packaging>
 
   <properties>
+    <tomcat.version.major>6</tomcat.version.major>
+    <tomcat.version.minor>6.0.18</tomcat.version.minor>
+    <tomcat.name>apache-tomcat-${tomcat.version.minor}</tomcat.name>
     <org.apache.portals.jetspeed.version>${pom.version}</org.apache.portals.jetspeed.version>
     <org.apache.jetspeed.portal.context.name>jetspeed</org.apache.jetspeed.portal.context.name>
-    <tomcat.version>apache-tomcat-5.5.27</tomcat.version>
-    <org.apache.jetspeed.portal.home>${project.build.directory}/${tomcat.version}</org.apache.jetspeed.portal.home>
+    <org.apache.jetspeed.portal.home>${project.build.directory}/${tomcat.name}</org.apache.jetspeed.portal.home>
   </properties>
 
   <build>
@@ -67,16 +69,13 @@
                   <tasks>
                     <mkdir dir="resources"/>
                     <get usetimestamp="true"
-                      src="http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.27/bin/${tomcat.version}.zip"
-                      dest="resources/${tomcat.version}.zip"/>
-                    <unzip src="resources/${tomcat.version}.zip" dest="${project.build.directory}"
+                      src="http://archive.apache.org/dist/tomcat/tomcat-${tomcat.version.major}/v${tomcat.version.minor}/bin/${tomcat.name}.zip"
+                      dest="resources/${tomcat.name}.zip"/>
+                    <unzip src="resources/${tomcat.name}.zip" dest="${project.build.directory}"
                       overwrite="false"/>
 
-                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/balancer"/>
-                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/jsp-examples"/>
-                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/servlets-examples"/>
-                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/tomcat-docs"/>
-                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/webdav"/>
+                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/examples"/>
+                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/docs"/>
                   </tasks>
                 </configuration>
                 <goals>
@@ -145,6 +144,7 @@
                 <configuration>
                   <targetBaseDir>${org.apache.jetspeed.portal.home}</targetBaseDir>
                   <portalName>${org.apache.jetspeed.portal.context.name}</portalName>
+                  <profile>tomcat${tomcat.version.major}</profile>
                   <destinations>
                     <context>webapps/jetspeed/META-INF</context>
                   </destinations>
@@ -310,6 +310,7 @@
                 <configuration>
                   <targetBaseDir>${org.apache.jetspeed.portal.home}</targetBaseDir>
                   <portalName>${org.apache.jetspeed.portal.context.name}</portalName>
+                  <profile>tomcat${tomcat.version.major}</profile>
                   <destinations>
                     <context>webapps/jetspeed/META-INF</context>
                   </destinations>
Index: maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java
===================================================================
--- maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java	(revision 741077)
+++ maven/jetspeed-deploy-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/DeployMojo.java	(working copy)
@@ -54,6 +54,10 @@
 {
     private static final String DEPLOY_FACTORY_CLASS_NAME = "org.apache.jetspeed.tools.deploy.JetspeedDeployFactory";
 
+    private static final String PROFILE_TOMCAT5 = "tomcat5"; 
+    private static final String PROFILE_TOMCAT6 = "tomcat6"; 
+    private static final String DEFAULT_PROFILE = PROFILE_TOMCAT5; 
+
     public static class Deployment
     {
         private String artifact;
@@ -123,6 +127,11 @@
     /** @parameter expression="${plugin.introducedDependencyArtifacts}" */
     private Set pluginDependencyArtifacts;
     
+    /**
+     * @parameter
+     */
+    private String profile;
+
     private Artifacts artifacts;
     
     /* (non-Javadoc)
@@ -135,27 +144,8 @@
         {
             destMap.putAll(destinations);
         }
-        // init default for tomcat5.5
-        if (!destMap.containsKey("system"))
-        {
-            destMap.put("system","common/endorsed");
-        }
-        if (!destMap.containsKey("lib"))
-        {
-            destMap.put("lib","shared/lib");
-        }
-        if (!destMap.containsKey("war"))
-        {
-            destMap.put("war", "webapps");
-        }
-        if (!destMap.containsKey("deploy"))
-        {
-            destMap.put("deploy", ((String)destMap.get("war"))+"/"+portalName+"/WEB-INF/deploy");
-        }
-        if (!destMap.containsKey("local"))
-        {
-            destMap.put("local", ((String)destMap.get("deploy"))+"/local");
-        }
+
+       	initDefaultDestinations(destMap, (profile != null) ? profile : DEFAULT_PROFILE);
         
         File targetBaseDir = new File(this.targetBaseDir);
         if (targetBaseDir.exists() && targetBaseDir.isFile())
@@ -476,8 +466,8 @@
             }
         }
     }
-    
-    private static String getValue(String value, String defaultValue)
+
+	private static String getValue(String value, String defaultValue)
     {
         return value != null ? value : defaultValue;
     }
@@ -653,4 +643,62 @@
             }
         }
     }
-}
+    
+    /**
+     * Initialize default destinations for a certain profile.
+     */
+    private void initDefaultDestinations(Map destMap, String profile) throws MojoFailureException {
+
+    	if (!(profile.equals(PROFILE_TOMCAT5) || profile.equals(PROFILE_TOMCAT6))) {
+    		throw new MojoFailureException("Cannot handle profile '" + profile + "', use '" 
+    				+ PROFILE_TOMCAT5 + "' or '" + PROFILE_TOMCAT6 + "'");
+    	}
+    	
+    	if (profile.equals(PROFILE_TOMCAT5)) {
+    		
+	        if (!destMap.containsKey("system"))
+	        {
+	            destMap.put("system","common/endorsed");
+	        }
+	        if (!destMap.containsKey("lib"))
+	        {
+	            destMap.put("lib","shared/lib");
+	        }
+	        if (!destMap.containsKey("war"))
+	        {
+	            destMap.put("war", "webapps");
+	        }
+	        if (!destMap.containsKey("deploy"))
+	        {
+	            destMap.put("deploy", ((String)destMap.get("war"))+"/"+portalName+"/WEB-INF/deploy");
+	        }
+	        if (!destMap.containsKey("local"))
+	        {
+	            destMap.put("local", ((String)destMap.get("deploy"))+"/local");
+	        }
+    	}
+    	else if (profile.equals(PROFILE_TOMCAT6)) {
+
+    		if (!destMap.containsKey("system"))
+            {
+                destMap.put("system","lib");
+            }
+            if (!destMap.containsKey("lib"))
+            {
+                destMap.put("lib","lib");
+            }
+            if (!destMap.containsKey("war"))
+            {
+                destMap.put("war", "webapps");
+            }
+            if (!destMap.containsKey("deploy"))
+            {
+                destMap.put("deploy", ((String)destMap.get("war"))+"/"+portalName+"/WEB-INF/deploy");
+            }
+            if (!destMap.containsKey("local"))
+            {
+                destMap.put("local", ((String)destMap.get("deploy"))+"/local");
+            }
+    	}
+    }
+}