Index: jetspeed-installer/etc/database/import/assembly/repository-datasource-spring.xml
===================================================================
--- jetspeed-installer/etc/database/import/assembly/repository-datasource-spring.xml	(revision 732350)
+++ 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 732350)
+++ 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 732350)
+++ 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 732350)
+++ 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/build.xml
===================================================================
--- jetspeed-installer/etc/database/build.xml	(revision 732350)
+++ jetspeed-installer/etc/database/build.xml	(working copy)
@@ -46,23 +46,17 @@
 		<echo>Setting up the Jetspeed database for ${db.type}</echo>
 
 		<echo>All existing Jetspeed data is going to be deleted from the database.</echo>
-		<echo>
-		</echo>
+		<echo></echo>
 		<echo>Selected database configuration:</echo>
-		<echo>
-		</echo>
+		<echo></echo>
 		<echo>database type: ${db.type}</echo>
 		<echo>username: ${_db.username}</echo>
 		<echo>jdbc url: ${_jdbc.url}</echo>
-		<echo>
-		</echo>
+		<echo></echo>
 		<echo>Make sure that the appropriate jdbc driver jar for the ${db.type} database is placed in the Tomcat shared/lib folder.</echo>
-		<echo>For using the Derby database, the correct driver jar is available in the lib folder.</echo>
-		<echo>
-		</echo>
+		<echo></echo>
 		<echo>Also make sure Tomcat is not running before continuing.</echo>
-		<echo>
-		</echo>
+		<echo></echo>
 		<input validargs="y,n" defaultvalue="n" addproperty="do.continue">Are you sure to continue?</input>
 		<condition property="failSetup">
 			<equals arg1="n" arg2="${do.continue}" />
@@ -72,26 +66,24 @@
 
 	</target>
 
-	<target name="setupNoDB">
-		<antcall target="setupDBPSML" />
-	</target>
+	<target name="runSetupDB" depends="checkDerby,checkImportPsml,generateStandardDB,generateDerbyDB,copyJetspeedContext,filterSpringDatasource,filterSpringFilterKey,seedDB,dbPsml" />
 
 	<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>
@@ -146,7 +138,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="}">
@@ -159,7 +151,8 @@
 	</target>
 
 	<target name="filterSpringDatasource">
-		<copy file="${jetspeedWebInfDir}/assembly/boot/datasource.xml" tofile="${jetspeedWebInfDir}/assembly/boot/datasource_filtered.xml">
+		<delete file="${jetspeedWebInfDir}/assembly/boot/datasource.xml" />
+		<copy file="resources/datasource.xml" tofile="${jetspeedWebInfDir}/assembly/boot/datasource.xml">
 			<!-- note that the $ is escaped here -->
 			<filterset begintoken="$${" endtoken="}">
 				<filter token="org.apache.jetspeed.database.user" value="${_db.username}" />
@@ -168,10 +161,34 @@
 				<filter token="org.apache.jetspeed.database.url" value="${_jdbc.url}" />
 			</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">
+		<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.spring.filter.key" value="portal.dbPageManager" />
+			</filterset>
+		</copy>
+	</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>
@@ -194,7 +211,7 @@
 				<pathelement location="${jetspeedWebInfDir}/classes" />
 			</classpath>
 
-			<arg line="-I &quot;${basedir}/j2-seed.xml&quot; 
+			<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,22 +219,8 @@
 
 	</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">
Index: jetspeed-installer/jetspeed-mvn-database-pom.xml
===================================================================
--- jetspeed-installer/jetspeed-mvn-database-pom.xml	(revision 732350)
+++ jetspeed-installer/jetspeed-mvn-database-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"
@@ -51,13 +51,6 @@
     </dependency>
 
     <dependency>
-      <artifactId>derby</artifactId>
-      <groupId>org.apache.derby</groupId>
-      <version>${org.apache.derby.version}</version>
-      <type>jar</type>
-    </dependency>
-
-    <dependency>
       <groupId>tyrex</groupId>
       <artifactId>tyrex</artifactId>
       <version>${tyrex.version}</version>
@@ -172,15 +165,17 @@
             </goals>
           </execution>
 
-          <!-- copy context.xml to database. NB this occurs after unpack-portal-resources -->
+          <!-- copy context.xml and datasource.xml to database directory.
+                NB this should occur after unpack-portal-resources -->
           <execution>
-            <id>copy-context-to-database</id>
+            <id>copy-resources-to-database</id>
             <phase>process-resources</phase>
             <configuration>
               <tasks>
                 <copy file="${project.build.directory}/resources/tomcat/context.xml"
-                  tofile="${project.build.directory}/database/${org.apache.jetspeed.portal.context.name}.xml"
-                />
+                  tofile="${project.build.directory}/database/resources/${org.apache.jetspeed.portal.context.name}.xml" />
+                <copy file="${project.build.directory}/resources/assembly/boot/datasource.xml"
+                  tofile="${project.build.directory}/database/resources/datasource.xml" />
               </tasks>
             </configuration>
             <goals>
@@ -213,15 +208,15 @@
                     <destination>resources</destination>
                   </resource>
                   <resource>
+                    <include>assembly/boot/datasource.xml</include>
+                    <destination>resources</destination>
+                  </resource>
+                  <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 +260,4 @@
   </build>
 
 </project>
+