Index: jetspeed-ant-tasks/pom.xml
===================================================================
--- jetspeed-ant-tasks/pom.xml	(revision 0)
+++ jetspeed-ant-tasks/pom.xml	(revision 0)
@@ -0,0 +1,49 @@
+<?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.
+
+  $Id: pom.xml 647793 2008-04-14 13:27:32Z ate $
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>2.0.9</maven>
+  </prerequisites>
+
+  <artifactId>jetspeed-ant-tasks</artifactId>
+  <name>Jetspeed-2 Ant Tasks</name>
+  <description>Ant Tasks Required for the Jetspeed-2 Product Build.</description>
+  <parent>
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <artifactId>jetspeed-2</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    
+    <!-- Provided Dependencies -->
+    <dependency>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
+      <scope>provided</scope>
+      <version>1.6.5</version>
+    </dependency>
+    
+  </dependencies>
+
</project>
Index: jetspeed-installer/BUILD.txt
===================================================================
--- jetspeed-installer/BUILD.txt	(revision 0)
+++ jetspeed-installer/BUILD.txt	(revision 0)
@@ -0,0 +1,15 @@
+
+There are two Jetspeed installers that can be built from command line: a portal
+with minimal functionality and a demo portal with more portlet applications.
+
+To build either of these installers, the Jetspeed Maven plugin for Maven-2 
+should be used as follows:  
+
+> mvn jetspeed:mvn -Dtarget=installer-minimal
+
+  or	
+
+> mvn jetspeed:mvn -Dtarget=installer-demo
+
+
+NB: the target directory will be cleaned so you cannot build both installers at 
\ No newline at end of file
Index: jetspeed-installer/etc/ant-installer/antinstall-config-min.xml
===================================================================
--- .	(revision 728672)
+++ .	(working copy)
@@ -24,7 +24,7 @@
 -->
 
 <installer ui="swing,text" verbose="false" lookAndFeel="jgoodies" name="Jetspeed Enterprise Portal 2.2-SNAPSHOT Installer"
-  windowIcon="/resources/feather-small.png" defaultImageResource="/resources/Jetspeed_blue_med.png" minJavaVersion="1.4"
+  windowIcon="/resources/feather-small.png" defaultImageResource="/resources/Jetspeed_blue_med.png" minJavaVersion="1.5"
   wide="700:250" antialiased="true">
 
   <page type="input" name="intro" displayText="Welcome to the Jetspeed Enterprise Portal 2.2-SNAPSHOT">
@@ -32,7 +32,7 @@
     <comment displayText="This installer will guide you through setting up the Jetspeed Portal." />
   </page>
 
-  <page type="license" name="license" displayText="License conditions" resource="/LICENSE.TXT"></page>
+  <page type="license" name="license" displayText="License conditions" resource="/LICENSE-ant-install.txt"></page>
 
   <page type="input" name="properties" displayText="Installation location">
     <directory property="installDir" defaultValue="${java.user.home}/Jetspeed-2.2-SNAPSHOT"
@@ -44,10 +44,10 @@
 
   <page type="input" name="requiredComponents" displayText="Components selection">
     <comment displayText="Jetspeed Enterprise Portal version 2.2-SNAPSHOT" bold="true" />
-    <target displayText="Tomcat 5.5.20 Webserver" target="install" defaultValue="true" force="true" />
+    <target displayText="Tomcat 5.5.27 Webserver" target="install" defaultValue="true" force="true" />
     <checkbox displayText="Jetspeed Portal" property="dummy" defaultValue="true" force="true" />
-    <checkbox displayText="Layout Portlets" property="dummy" defaultValue="true" force="true" />
-    <checkbox displayText="Portal Administration Portlets" 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" />
     <checkbox displayText="Store PSML in the database?" property="dbImportPsml" defaultValue="false" />
   </page>
 
@@ -85,7 +85,7 @@
       defaultValue="jdbc:mysql://localhost:3306/&lt;dbname&gt;" />
     <text property="jdbcDriverClass" displayText="JDBC Driver Classname" defaultValue="com.mysql.jdbc.Driver" />
 
-    <file property="jdbcDriverJar" defaultValue="${java.user.home}${java.file.separator}mysql-connector-java-5.0.4.jar"
+    <file property="jdbcDriverJar" defaultValue="${java.user.home}${java.file.separator}mysql-connector-java-5.1.7.jar"
       displayText="JDBC driver" checkExists="true" />
   </page>
 
@@ -190,7 +190,7 @@
     <hidden property="jdbc.driver.class" value="${jdbcDriverClass}" />
     <hidden property="jdbc.driver.jar" value="${jdbcDriverJar}" />
     <hidden property="setupDBAntTarget" value="runSetupDB" />
-    <comment displayText="Press Next to test the database connection ..." />
+    <comment displayText="Press Next to test the database connection.." />
   </page>
 
   <page type="input" name="dbCheckFailed" displayText="Connection to the database failed"
@@ -198,7 +198,7 @@
     <hidden property="checkdb" value="false" />
     <hidden property="setupDBAntTarget" value="setupNoDB" />
 
-    <comment displayText="Please go back and specify the correct database configurtion parameters." bold="true" />
+    <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>
@@ -203,7 +203,7 @@
     <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}=setupNoDB)">
     <hidden property="db.username" value="" />
     <hidden property="db.password" value="" />
     <hidden property="jdbc.url" value="" />
@@ -210,9 +210,9 @@
     <hidden property="jdbc.driver.class" value="" />
     <hidden property="jdbc.driver.jar" value="" />
     <hidden property="setupDBAntTarget" value="setupNoDB" />
-    <comment displayText="Jetspeed will be installed without yet an configured database to:" bold="true"/>
+    <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"/>
+    <comment displayText="Warning: all content in this directory will be deleted first!" bold="true"/>
     <comment displayText=""/>
     <comment displayText="After the installation you must manually setup the database."/>
     <comment displayText="An ant script is provided within the installation database directory." />
@@ -221,10 +221,10 @@
     <comment displayText="Initialize the database by running ant from the database directory." />
   </page>
 
-  <page type="input" name="beforeInstall" displayText="Before you install ..." ifProperty="${setupDBAntTarget}=runSetupDB">
+  <page type="input" name="beforeInstall" displayText="Before you install.." ifProperty="${setupDBAntTarget}=runSetupDB">
     <comment displayText="Jetspeed will be installed using a ${dbDisplayName} database to:" bold="true"/>
     <comment displayText="  ${installDir}"/>
-    <comment displayText="Warning: All content in this directory will be deleted first!" bold="true"/>
+    <comment displayText="Warning: all content in this directory will be deleted first!" bold="true"/>
     <comment displayText=""/>
     <comment displayText="After the installation you can manually reinitialize the database"/>
     <comment displayText="or even switch to another database using an ant script"/>

Property changes on: .
___________________________________________________________________
Name: svn:eol-style
   + native
Name: svn:keywords
   + Id

Index: jetspeed-installer/etc/ant-installer/antinstall-config.xml
===================================================================
--- .	(revision 729289)
+++ .	(working copy)
@@ -24,9 +24,9 @@
 -->
 
 <installer ui="swing,text" verbose="false" lookAndFeel="jgoodies" name="Jetspeed Enterprise Portal 2.2-SNAPSHOT Installer"
-  windowIcon="/resources/feather-small.png" defaultImageResource="/resources/Jetspeed_blue_med.png" minJavaVersion="1.4"
+  windowIcon="/resources/feather-small.png" defaultImageResource="/resources/Jetspeed_blue_med.png" minJavaVersion="1.5"
   wide="700:250" antialiased="true">
-
+  
   <page type="input" name="intro" displayText="Welcome to the Jetspeed Enterprise Portal 2.2-SNAPSHOT">
     <comment displayText="" />
     <comment displayText="This installer will guide you through setting up the Jetspeed Portal." />
@@ -31,9 +31,9 @@
     <comment displayText="" />
     <comment displayText="This installer will guide you through setting up the Jetspeed Portal." />
   </page>
-
-  <page type="license" name="license" displayText="License conditions" resource="/LICENSE.TXT"></page>
-
+  
+  <page type="license" name="license" displayText="License conditions" resource="/LICENSE-ant-install.txt"></page>
+  
   <page type="input" name="properties" displayText="Installation location">
     <directory property="installDir" defaultValue="${java.user.home}/Jetspeed-2.2-SNAPSHOT"
       defaultValueWin="C:\Apache\Jetspeed-2.2-SNAPSHOT" displayText="Select an installation directory" create="true"
@@ -41,16 +41,19 @@
     <comment displayText=""/>
     <comment displayText="Warning: on Windows, the location must not contain spaces." bold="true"/>
   </page>
-
+  
   <page type="input" name="requiredComponents" displayText="Components selection">
     <comment displayText="Jetspeed Enterprise Portal version 2.2-SNAPSHOT" bold="true" />
-    <target displayText="Tomcat 5.5.20 Webserver" target="install" defaultValue="true" force="true" />
+    <target displayText="Tomcat 5.5.27 Webserver" target="install" defaultValue="true" force="true" />
     <checkbox displayText="Jetspeed Portal" property="dummy" defaultValue="true" force="true" />
-    <checkbox displayText="Layout Portlets" property="dummy" defaultValue="true" force="true" />
-    <checkbox displayText="Portal Administration Portlets" 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" />
+    <checkbox displayText="Demo Portlets" property="dummy" defaultValue="true" force="true" />
+    <checkbox displayText="RSS Portlets" property="dummy" defaultValue="true" force="true" />
+    <checkbox displayText="JPetstore Portlets" property="dummy" defaultValue="true" force="true" />
     <checkbox displayText="Store PSML in the database?" property="dbImportPsml" defaultValue="false" />
   </page>
-
+  
   <page type="input" name="databaseSelection" displayText="Database selection">
     <hidden property="checkdb" value="false" />
     <hidden property="dbvalid" value="false" />
@@ -57,7 +60,7 @@
     <hidden property="db.type" value="derby" />
     <hidden property="dbDisplayName" value="Derby"/>
     <hidden property="setupDBAntTarget" value="runSetupDB" />
-
+    
     <comment displayText="Please select the target database type you want to use for the portal." />
     <select property="dbName" displayText="Database type" defaultValue="derby">
       <option text="DB2" value="db2" />
@@ -70,7 +73,7 @@
       <option text="Manual database setup" value="manual" />
     </select>
   </page>
-
+  
   <page type="input" name="mysql" displayText="MySQL Database connection parameters" ifProperty="${dbName}=mysql">
     <hidden property="checkdb" value="true" />
     <hidden property="dbvalid" value="false" />
@@ -75,20 +78,20 @@
     <hidden property="checkdb" value="true" />
     <hidden property="dbvalid" value="false" />
     <hidden property="dbDisplayName" value="MySQL"/>
-
+    
     <comment displayText="Please fill in the fields below for connecting to the MySQL database." />
-
+    
     <text property="dbUser" displayText="Database User Name" defaultValue="" />
     <text property="dbPassword" displayText="Database Password" defaultValue="" />
-
+    
     <text property="jdbcUrl" displayText="JDBC Connection String"
       defaultValue="jdbc:mysql://localhost:3306/&lt;dbname&gt;" />
     <text property="jdbcDriverClass" displayText="JDBC Driver Classname" defaultValue="com.mysql.jdbc.Driver" />
-
-    <file property="jdbcDriverJar" defaultValue="${java.user.home}${java.file.separator}mysql-connector-java-5.0.4.jar"
+    
+    <file property="jdbcDriverJar" defaultValue="${java.user.home}${java.file.separator}mysql-connector-java-5.1.7.jar"
       displayText="JDBC driver" checkExists="true" />
   </page>
-
+  
   <page type="input" name="postgres" displayText="PostgreSQL Database connection parameters"
     ifProperty="${dbName}=postgres">
     <hidden property="checkdb" value="true" />
@@ -94,20 +97,20 @@
     <hidden property="checkdb" value="true" />
     <hidden property="dbvalid" value="false" />
     <hidden property="dbDisplayName" value="PostgreSQL"/>
-
+    
     <comment displayText="Please fill in the fields below for connecting to the PostgreSQL database." />
-
+    
     <text property="dbUser" displayText="Database User Name" defaultValue="" />
     <text property="dbPassword" displayText="Database Password" defaultValue="" />
-
+    
     <text property="jdbcUrl" displayText="JDBC Connection String"
       defaultValue="jdbc:postgresql://localhost:5432/&lt;dbname&gt;" />
     <text property="jdbcDriverClass" displayText="JDBC Driver Classname" defaultValue="org.postgresql.Driver" />
-
+    
     <file property="jdbcDriverJar" defaultValue="${java.user.home}${java.file.separator}postgresql-8.1-405.jdbc3.jar"
       displayText="JDBC driver" checkExists="true" />
   </page>
-
+  
   <page type="input" name="sapdb" displayText="SapDB Database connection parameters" ifProperty="${dbName}=sapdb">
     <hidden property="checkdb" value="true" />
     <hidden property="dbvalid" value="false" />
@@ -112,19 +115,19 @@
     <hidden property="checkdb" value="true" />
     <hidden property="dbvalid" value="false" />
     <hidden property="dbDisplayName" value="SapDB"/>
-
+    
     <comment displayText="Please fill in the fields below for connecting to the SapDB database." />
-
+    
     <text property="dbUser" displayText="Database User Name" defaultValue="" />
     <text property="dbPassword" displayText="Database Password" defaultValue="" />
-
+    
     <text property="jdbcUrl" displayText="JDBC Connection String" defaultValue="jdbc:sapdb://localhost/&lt;dbname&gt;" />
     <text property="jdbcDriverClass" displayText="JDBC Driver Classname" defaultValue="com.sap.dbtech.jdbc.DriverSapDB" />
-
+    
     <file property="jdbcDriverJar" defaultValue="${java.user.home}${java.file.separator}sapdb-jdbc-bin-7.4.04.03a.jar"
       displayText="JDBC driver" checkExists="true" />
   </page>
-
+  
   <page type="input" name="oracle" displayText="Oracle Database connection parameters" ifProperty="${dbName}=oracle">
     <hidden property="checkdb" value="true" />
     <hidden property="dbvalid" value="false" />
@@ -129,20 +132,20 @@
     <hidden property="checkdb" value="true" />
     <hidden property="dbvalid" value="false" />
     <hidden property="dbDisplayName" value="Oracle"/>
-
+    
     <comment displayText="Please fill in the fields below for connecting to the Oracle database." />
-
+    
     <text property="dbUser" displayText="Database User Name" defaultValue="" />
     <text property="dbPassword" displayText="Database Password" defaultValue="" />
-
+    
     <text property="jdbcUrl" displayText="JDBC Connection String"
       defaultValue="jdbc:oracle:thin:@localhost:1521:&lt;instance&gt;" />
     <text property="jdbcDriverClass" displayText="JDBC Driver Classname" defaultValue="oracle.jdbc.driver.OracleDriver" />
-
+    
     <file property="jdbcDriverJar" defaultValue="${java.user.home}${java.file.separator}ojdbc14.jar"
       displayText="JDBC driver" checkExists="true" />
   </page>
-
+  
   <page type="input" name="mssql" displayText="Microsoft SQL Server connection parameters"
     ifProperty="${dbName}=mssql">
     <hidden property="checkdb" value="true" />
@@ -148,12 +151,12 @@
     <hidden property="checkdb" value="true" />
     <hidden property="dbvalid" value="false" />
     <hidden property="dbDisplayName" value="MSSQL"/>
-
+    
     <comment displayText="Please fill in the fields below for connecting to the Microsoft SQL Server." />
-
+    
     <text property="dbUser" displayText="Database User Name" defaultValue="" />
     <text property="dbPassword" displayText="Database Password" defaultValue="" />
-
+    
     <text property="jdbcUrl" displayText="JDBC Connection String"
       defaultValue="jdbc:jtds:sqlserver://localhost:1433/&lt;dbname&gt;" />
     <text property="jdbcDriverClass" displayText="JDBC Driver Classname"
@@ -158,11 +161,11 @@
       defaultValue="jdbc:jtds:sqlserver://localhost:1433/&lt;dbname&gt;" />
     <text property="jdbcDriverClass" displayText="JDBC Driver Classname"
       defaultValue="net.sourceforge.jtds.jdbc.Driver" />
-
+    
     <file property="jdbcDriverJar" defaultValue="${java.user.home}${java.file.separator}jtds-1.2.jar"
       displayText="JDBC driver" checkExists="true" />
   </page>
-
+  
   <page type="input" name="db2" displayText="DB2 Database connection parameters" ifProperty="${dbName}=db2">
     <hidden property="checkdb" value="true" />
     <hidden property="dbvalid" value="false" />
@@ -167,20 +170,20 @@
     <hidden property="checkdb" value="true" />
     <hidden property="dbvalid" value="false" />
     <hidden property="dbDisplayName" value="DB2"/>
-
+    
     <comment displayText="Please fill in the fields below for connecting to the DB2 database." />
-
+    
     <text property="dbUser" displayText="Database User Name" defaultValue="" />
     <text property="dbPassword" displayText="Database Password" defaultValue="" />
-
+    
     <text property="jdbcUrl" displayText="JDBC Connection String"
       defaultValue="jdbc:db2://localhost:1527/&lt;dbname&gt;" />
     <text property="jdbcDriverClass" displayText="JDBC Driver Classname" defaultValue="COM.ibm.db2.jdbc.app.DB2Driver" />
-
+    
     <file property="jdbcDriverJar" defaultValue="${java.user.home}${java.file.separator}db2jcc.jar"
       displayText="JDBC driver" checkExists="true" />
   </page>
-
+  
   <page type="input" name="preDBCheck" displayText="Testing the database connection"
     ifProperty="(${checkdb}=true) AND (${dbvalid}=false)" postDisplayTarget="antinstaller-checkdb">
     <hidden property="db.type" value="${dbName}" />
@@ -190,9 +193,9 @@
     <hidden property="jdbc.driver.class" value="${jdbcDriverClass}" />
     <hidden property="jdbc.driver.jar" value="${jdbcDriverJar}" />
     <hidden property="setupDBAntTarget" value="runSetupDB" />
-    <comment displayText="Press Next to test the database connection ..." />
+    <comment displayText="Press Next to test the database connection.." />
   </page>
-
+  
   <page type="input" name="dbCheckFailed" displayText="Connection to the database failed"
     ifProperty="(${checkdb}=true) AND (${dbvalid}=false)">
     <hidden property="checkdb" value="false" />
@@ -197,13 +200,13 @@
     ifProperty="(${checkdb}=true) AND (${dbvalid}=false)">
     <hidden property="checkdb" value="false" />
     <hidden property="setupDBAntTarget" value="setupNoDB" />
-
-    <comment displayText="Please go back and specify the correct database configurtion parameters." bold="true" />
+    
+    <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}=setupNoDB)">
     <hidden property="db.username" value="" />
     <hidden property="db.password" value="" />
     <hidden property="jdbc.url" value="" />
@@ -210,9 +213,9 @@
     <hidden property="jdbc.driver.class" value="" />
     <hidden property="jdbc.driver.jar" value="" />
     <hidden property="setupDBAntTarget" value="setupNoDB" />
-    <comment displayText="Jetspeed will be installed without yet an configured database to:" bold="true"/>
+    <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"/>
+    <comment displayText="Warning: all content in this directory will be deleted first!" bold="true"/>
     <comment displayText=""/>
     <comment displayText="After the installation you must manually setup the database."/>
     <comment displayText="An ant script is provided within the installation database directory." />
@@ -220,11 +223,11 @@
     <comment displayText="file provided in the same directory before running ant." />
     <comment displayText="Initialize the database by running ant from the database directory." />
   </page>
-
-  <page type="input" name="beforeInstall" displayText="Before you install ..." ifProperty="${setupDBAntTarget}=runSetupDB">
+  
+  <page type="input" name="beforeInstall" displayText="Before you install.." ifProperty="${setupDBAntTarget}=runSetupDB">
     <comment displayText="Jetspeed will be installed using a ${dbDisplayName} database to:" bold="true"/>
     <comment displayText="  ${installDir}"/>
-    <comment displayText="Warning: All content in this directory will be deleted first!" bold="true"/>
+    <comment displayText="Warning: all content in this directory will be deleted first!" bold="true"/>
     <comment displayText=""/>
     <comment displayText="After the installation you can manually reinitialize the database"/>
     <comment displayText="or even switch to another database using an ant script"/>
@@ -233,7 +236,7 @@
     <comment displayText="file provided in the same directory before running ant." />
     <comment displayText="Reinitialize the database by running ant from the database directory." />
   </page>
-
+  
   <page type="progress" name="progress" displayText="Installation progress" />
-
+  
 </installer>
Index: jetspeed-installer/etc/ant-installer/build.xml
===================================================================
--- .	(revision 729289)
+++ .	(working copy)
@@ -38,9 +38,8 @@
     <echo>Installing Jetspeed-2.2-SNAPSHOT Enterprise Portal</echo>
     <unzip src="${antinstaller.jar}" dest="${installDir}">
       <patternset>
-        <include name="portal.zip" />
+        <include name="tomcat-portal.zip" />
         <include name="database.zip" />
-        <include name="tomcat-compat.zip" unless="jdk15Installed" />
       </patternset>
     </unzip>
     <unzip dest="${installDir}">
@@ -52,11 +51,10 @@
     <chmod perm="700" dir="${installDir}/bin" includes="**/*.sh" />
 
     <echo>Setting up the database configuration</echo>
-    <condition property="jdbcjar" value="${installDir}/database/lib/derby-10.1.1.0.jar">
+    <condition property="jdbcjar" value="${installDir}/database/lib/derby-10.3.2.1.jar">
       <equals arg1="${jdbc.driver.jar}" arg2="" />
     </condition>
-<!--    <copy file="${installDir}/webapps/${portalName}/WEB-INF/assembly/page-manager.xml" tofile="${installDir}/webapps/${portalName}/WEB-INF/assembly/alternate/fs-page-manager.xml"/>
-  -->
+    
     <property name="jdbcjar" value="${jdbc.driver.jar}" />
     <copy failonerror="false" todir="${installDir}/shared/lib" file="${jdbcjar}" />
 
Index: jetspeed-installer/etc/database/build.xml
===================================================================
--- .	(revision 729289)
+++ .	(working copy)
@@ -19,359 +19,231 @@
 -->
 <project name="JetspeedDatabaseSetup" default="setupDB" basedir=".">
 
-  <property file="${basedir}/database.properties" />
-  <property file="build.properties"/>
+	<property file="${basedir}/database.properties" />
+	<property file="build.properties" />
 
-  <condition property="_db.username" value="">
-    <equals arg1="${db.type}" arg2="derby" />
-  </condition>
-  <property name="_db.username" value="${db.username}" />
-  <condition property="_db.password" value="">
-    <equals arg1="${db.type}" arg2="derby" />
-  </condition>
-  <property name="_db.password" value="${db.password}" />
-  <condition property="_jdbc.url" value="jdbc:derby:${basedir}/derby/productiondb;create=true">
-    <equals arg1="${db.type}" arg2="derby" />
-  </condition>
-  <property name="_jdbc.url" value="${jdbc.url}" />
-  <condition property="_jdbc.driver.class" value="org.apache.derby.jdbc.EmbeddedDriver">
-    <equals arg1="${db.type}" arg2="derby" />
-  </condition>
-  <property name="_jdbc.driver.class" value="${jdbc.driver.class}" />
+	<condition property="_db.username" value="">
+		<equals arg1="${db.type}" arg2="derby" />
+	</condition>
+	<property name="_db.username" value="${db.username}" />
+	<condition property="_db.password" value="">
+		<equals arg1="${db.type}" arg2="derby" />
+	</condition>
+	<property name="_db.password" value="${db.password}" />
+	<condition property="_jdbc.url" value="jdbc:derby:${basedir}/derby/productiondb;create=true">
+		<equals arg1="${db.type}" arg2="derby" />
+	</condition>
+	<property name="_jdbc.url" value="${jdbc.url}" />
+	<condition property="_jdbc.driver.class" value="org.apache.derby.jdbc.EmbeddedDriver">
+		<equals arg1="${db.type}" arg2="derby" />
+	</condition>
+	<property name="_jdbc.driver.class" value="${jdbc.driver.class}" />
 
-  <target name="setupDB">
+	<property name="jetspeedWebInfDir" value="${basedir}/../webapps/${portalName}/WEB-INF" />
 
-    <echo>Setting up the Jetspeed database for ${db.type}</echo>
+	<target name="setupDB">
 
-    <echo>All existing Jetspeed data is going to be deleted from the database.</echo>
-    <echo></echo>
-    <echo>Selected database configuration:</echo>
-    <echo></echo>
-    <echo>database type: ${db.type}</echo>
-    <echo>username: ${_db.username}</echo>
-    <echo>jdbc url: ${_jdbc.url}</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>Also make sure Tomcat is not running before continuing.</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}" />
-    </condition>
+		<echo>Setting up the Jetspeed database for ${db.type}</echo>
 
-    <antcall target="checkInput" />
+		<echo>All existing Jetspeed data is going to be deleted from the database.</echo>
+		<echo>
+		</echo>
+		<echo>Selected database configuration:</echo>
+		<echo>
+		</echo>
+		<echo>database type: ${db.type}</echo>
+		<echo>username: ${_db.username}</echo>
+		<echo>jdbc url: ${_jdbc.url}</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>Also make sure Tomcat is not running before continuing.</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}" />
+		</condition>
 
-  </target>
+		<antcall target="checkInput" />
 
-  <target name="setupNoDB">
-  	<antcall target="setupDBPSML"/>
-  </target>
+	</target>
 
-  <target name="checkInput" unless="failSetup">
-    <antcall target="runSetupDB"/>
-  </target>
-  
-  <target name='setupDBPSML'>
-    <copy file="${basedir}/../webapps/${portalName}/WEB-INF/assembly/page-manager.xml" tofile="${basedir}/../webapps/${portalName}/WEB-INF/assembly/alternate/fs-page-manager.xml"/>
+	<target name="setupNoDB">
+		<antcall target="setupDBPSML" />
+	</target>
+
+	<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,seedDB,copyJetspeedContext,do-psml" />
-	
-  <target name="checkDerby">
-    <condition property="_derby">
-      <equals arg1="${db.type}" arg2="derby" />
-    </condition>
-  </target>
+
+	<target name="runSetupDB" depends="setupDBPSML,checkDerby,generateStandardDB,generateDerbyDB,copyJetspeedContext,filterSpringDatasource,seedDB,do-psml" />
 
-  <target name="generateDerbyDB" if="_derby">
-    <delete dir="${basedir}/derby/productiondb" quiet="true" />
-    <antcall target="sqlDerbyDB">
-      <param name="databaseScript" value="${basedir}/derby/phase1-schema.sql" />
-    </antcall>
-    <antcall target="sqlDerbyDB">
-      <param name="databaseScript" value="${basedir}/derby/phase2-schema.sql" />
-    </antcall>
-    <antcall target="sqlDerbyDB">
-      <param name="databaseScript" value="${basedir}/derby/phase3ojb-schema.sql" />
-    </antcall>
-    <antcall target="sqlDerbyDB">
-      <param name="databaseScript" value="${basedir}/derby/prefs-schema.sql" />
-    </antcall>
-    <antcall target="sqlDerbyDB">
-      <param name="databaseScript" value="${basedir}/derby/registry-schema.sql" />
-    </antcall>
-    <antcall target="sqlDerbyDB">
-      <param name="databaseScript" value="${basedir}/derby/security-schema.sql" />
-    </antcall>
+	<target name="checkDerby">
+		<condition property="_derby">
+			<equals arg1="${db.type}" arg2="derby" />
+		</condition>
+	</target>
 
-  </target>
+	<target name="generateDerbyDB" if="_derby">
+		<delete dir="${basedir}/derby/productiondb" quiet="true" />
+		<echo>Executing file ${basedir}/derby/create-schema.sql</echo>
 
-  <target name="generateStandardDB" unless="_derby">
-    <echo>cleaning up possible existing Db</echo>
+		<java classname="org.apache.jetspeed.anttasks.ExecuteJavaSQL" 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" />
+			</classpath>
+			<arg line="driver=&quot;${_jdbc.driver.class}&quot; 
+	          url=&quot;${_jdbc.url}&quot;
+	          userid=&quot;${_db.username}&quot; 
+	          password=&quot;{_db.password}&quot;
+	          src=&quot;${basedir}/derby/create-schema.sql&quot; autocommit=true
+	          onerror=abort" />
+		</java>
+	</target>
 
-    <sql driver="${_jdbc.driver.class}" url="${_jdbc.url}" userid="${_db.username}" password="${_db.password}"
-      src="${basedir}/drop.sql" autocommit="true" onerror="continue" print="no" output="setup.log">
-      <classpath>
-        <fileset dir="${basedir}/../shared/lib">
-          <include name="**/*.jar" />
-        </fileset>
-      </classpath>
-    </sql>
-    <echo>starting Db generation</echo>
-    <sql driver="${_jdbc.driver.class}" url="${_jdbc.url}" userid="${_db.username}" password="${_db.password}"
-      src="${basedir}/${db.type}/phase1-schema.sql">
-      <classpath>
-        <fileset dir="${basedir}/../shared/lib">
-          <include name="**/*.jar" />
-        </fileset>
-      </classpath>
-    </sql>
-    <sql driver="${_jdbc.driver.class}" url="${_jdbc.url}" userid="${_db.username}" password="${_db.password}"
-      src="${basedir}/${db.type}/phase2-schema.sql" print="yes" output="setup.log">
-      <classpath>
-        <fileset dir="${basedir}/../shared/lib">
-          <include name="**/*.jar" />
-        </fileset>
-      </classpath>
-    </sql>
-    <sql driver="${_jdbc.driver.class}" url="${_jdbc.url}" userid="${_db.username}" password="${_db.password}"
-      src="${basedir}/${db.type}/phase3ojb-schema.sql" print="yes" output="setup.log">
-      <classpath>
-        <fileset dir="${basedir}/../shared/lib">
-          <include name="**/*.jar" />
-        </fileset>
-      </classpath>
-    </sql>
-    <sql driver="${_jdbc.driver.class}" url="${_jdbc.url}" userid="${_db.username}" password="${_db.password}"
-      src="${basedir}/${db.type}/prefs-schema.sql" print="yes" output="setup.log">
-      <classpath>
-        <fileset dir="${basedir}/../shared/lib">
-          <include name="**/*.jar" />
-        </fileset>
-      </classpath>
-    </sql>
-    <sql driver="${_jdbc.driver.class}" url="${_jdbc.url}" userid="${_db.username}" password="${_db.password}"
-      src="${basedir}/${db.type}/registry-schema.sql" print="yes" output="setup.log">
-      <classpath>
-        <fileset dir="${basedir}/../shared/lib">
-          <include name="**/*.jar" />
-        </fileset>
-      </classpath>
-    </sql>
-    <sql driver="${_jdbc.driver.class}" url="${_jdbc.url}" userid="${_db.username}" password="${_db.password}"
-      src="${basedir}/${db.type}/security-schema.sql" print="yes" output="setup.log">
-      <classpath>
-        <fileset dir="${basedir}/../shared/lib">
-          <include name="**/*.jar" />
-        </fileset>
-      </classpath>
-    </sql>
-    <echo>DB generation done!</echo>
+	<target name="generateStandardDB" unless="_derby">
+		<echo>Cleaning up possible existing database</echo>
 
-  </target>
+		<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">
+					<include name="**/*.jar" />
+				</fileset>
+			</classpath>
+		</sql>
 
-  <target name="seedDB">
+		<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">
+					<include name="**/*.jar" />
+				</fileset>
+			</classpath>
+		</sql>
+		<echo>Database generation done!</echo>
 
-    <delete dir="${basedir}/assembly" />
-    <mkdir dir="${basedir}/assembly" />
-    <echo>Seeding the database</echo>
+	</target>
 
-    <copy todir="${basedir}/assembly" overwrite="true" failonerror="true">
-      <fileset dir="${basedir}/../webapps/${portalName}/WEB-INF/assembly">
-        <include name="security*.xml" />
-        <include name="capabilities.xml" />
-        <include name="prefs.xml" />
-        <include name="profiler.xml" />
-        <include name="transaction.xml" />
-        <include name="cache.xml" />
-      </fileset>
-    </copy>
+	<target name="copyJetspeedContext">
+		<copy file="${portalName}.xml" tofile="${basedir}/../conf/Catalina/localhost/${portalName}.xml" overwrite="true">
 
+			<!-- note that the $ is escaped here -->
+			<filterset begintoken="$${" endtoken="}">
+				<filter token="org.apache.jetspeed.production.database.user" value="${_db.username}" />
+				<filter token="org.apache.jetspeed.production.database.password" value="${_db.password}" />
+				<filter token="org.apache.jetspeed.production.database.driver" value="${_jdbc.driver.class}" />
+				<filter token="org.apache.jetspeed.production.database.url" value="${_jdbc.url}" />
+			</filterset>
+		</copy>
+	</target>
 
-    <copy todir="${basedir}/assembly" overwrite="true" failonerror="true">
-      <fileset dir="${basedir}/../webapps/${portalName}/WEB-INF/assembly/alternate/">
-        <include name="request-context.xml" />
-        <include name="db-page-manager.xml" />
-        <include name="interceptors.xml" />
-        <include name="seed-registry.xml" />
-      </fileset>
-    </copy>
+	<target name="filterSpringDatasource">
+		<copy file="${jetspeedWebInfDir}/assembly/boot/datasource.xml" tofile="${jetspeedWebInfDir}/assembly/boot/datasource_filtered.xml">
+			<!-- 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}" />
+			</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>
 
-    <mkdir dir="${basedir}/assembly/boot" />
+	<target name="seedDB">
 
-    <copy todir="${basedir}/assembly/boot" overwrite="true" failonerror="true">
-      <fileset dir="${basedir}/../webapps/${portalName}/WEB-INF/assembly/boot">
-        <include name="*.xml" />
-      </fileset>
-    </copy>
+		<echo>Seeding the database</echo>
 
-    <java classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication" fork="yes">
-      <classpath>
-        <fileset dir="${basedir}/../shared/lib">
-          <include name="**/*.jar" />
-        </fileset>
-        <fileset dir="${basedir}/../webapps/${portalName}/WEB-INF/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="${basedir}/../webapps/${portalName}/WEB-INF/classes" />
-      </classpath>
+		<java classname="org.apache.jetspeed.tools.db.serializer.JetspeedSerializerApplicationImpl" 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" />
+			</classpath>
 
-      <arg
-        line="-I &quot;${basedir}/j2-seed.xml&quot; 
+			<arg line="-I &quot;${basedir}/j2-seed.xml&quot; 
               -a &quot;${basedir}/../webapps/${portalName}&quot;
-              -b &quot;file:${basedir}/assembly/boot/&quot;
-              -c &quot;file:${basedir}/assembly/&quot;
-              -dc &quot;${_jdbc.driver.class}&quot;
-              -ds &quot;${_jdbc.url}&quot;
-              -du &quot;${_db.username}&quot;
-              -dp &quot;${_db.password}&quot;" />
-    </java>
+      		  -c &quot;serializer&quot;
+      	      -p &quot;${jetspeedWebInfDir}/conf/spring-filter.properties&quot;" />
+		</java>
 
-  </target>
+	</target>
 
-  <target name='sqlDerbyDB'>
-    <echo>Excuting file: ${databaseScript}</echo>
-    <java classname="org.apache.jetspeed.anttasks.ExecuteJavaSQL" fork="yes">
-      <classpath>
-        <fileset dir="${basedir}/../shared/lib">
-          <include name="**/*.jar" />
-        </fileset>
-        <fileset dir="${basedir}/../webapps/${portalName}/WEB-INF/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="${basedir}/../webapps/${portalName}/WEB-INF/classes" />
-      </classpath>
-      <arg
-        line="driver=&quot;${_jdbc.driver.class}&quot; 
-	          url=&quot;${_jdbc.url}&quot;
-	          userid=&quot;${_db.username}&quot; 
-	          password=&quot;{_db.password}&quot;
-	          src=&quot;${databaseScript}&quot; autocommit=true
-	          onerror=abort" />
-    </java>
+	<!-- Populate database with pages the user has selected so -->
+	<target name="do-psml" depends="test-import-psml,db-psml,fs-psml" />
+
+	<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">
 
-  </target>
+	    <echo>Importing psml into the database</echo>
 
-  <target name="copyJetspeedContext">
-    <copy file="${portalName}.xml" tofile="${basedir}/../conf/Catalina/localhost/${portalName}.xml" overwrite="true">
-      <filterset begintoken="@" endtoken="@">
-        <filter token="USERNAME" value="${_db.username}" />
-        <filter token="PASSWORD" value="${_db.password}" />
-        <filter token="DRIVER" value="${_jdbc.driver.class}" />
-        <filter token="URL" value="${_jdbc.url}" />
-      </filterset>
-    </copy>
-  </target>
+	    <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" />
+	      </classpath>
 
-<!-- Import of PSML -->
-  <property name="import.jdbc.driver.class" value="${_jdbc.driver.class}"/>
-  <property name="import.jdbc.username" value="${_db.username}"/>
-  <property name="import.jdbc.password" value="${_db.password}"/>
-  <property name="import.jdbc.url" value="${_jdbc.url}"/>
-  
-  <property name="jetspeedWebinfDir" value="${basedir}/../webapps/${portalName}/WEB-INF"/>
-  <property name="pagesLocation" value="${jetspeedWebinfDir}/pages"/>
-  <property name="importDir" value="${basedir}/import"/>
-  <property name="importTargetDir" value="${importDir}/target"/>
-  <property name="org.apache.jetspeed.page.import.configuration" value="${basedir}/import/import.properties"/>
-  <property name="org.apache.jetspeed.page.import.pages" value="${jetspeedWebinfDir}/pages"/>
-  
-  <path id="import-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" />
-    <pathelement location="${importTargetDir}/classes" />
-  </path>
-  
- 
-  <!-- Populate Database -->
-  
-  <target name="test-import-psml">
-    <condition property="_doImportPsml">
-      <equals arg1="${dbImportPsml}" arg2="true"/>
-    </condition>
-  </target>
-  
-  <target name="do-psml" depends="test-import-psml,db-psml,fs-psml"/>
-  
-  <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">
-    
-    <!-- prepare a classes directory with resources and libraries to execute import -->
-    <delete dir="${importTargetDir}/classes"/>
-    <mkdir dir="${importTargetDir}/classes"/>
-    <echo>Import dir: ${importDir}</echo>
-    <copy todir="${importTargetDir}/classes" flatten="on">
-      <fileset dir="${importDir}" >
-        <include name="db-ojb/*"/>
-        <include name="log4j.properties"/>
-        <include name="assembly/import-page-manager.xml"/>
-        <include name="assembly/repository-datasource-spring.xml"/>
-      </fileset>
-      <fileset dir="${jetspeedWebinfDir}" >
-        <include name="assembly/transaction.xml"/>
-        <include name="assembly/alternate/interceptors.xml"/>
-      </fileset>
-    </copy>    
-  
-    <!-- create sysproperty set to configure import utility -->
-    <propertyset id="import.syspropertyset.id">
-      <propertyref name="org.apache.jetspeed.page.import.configuration"/>
-      <propertyref name="org.apache.jetspeed.page.import.pages"/>
-      <propertyref name="import.jdbc.driver.class"/>
-      <propertyref name="import.jdbc.username"/>
-      <propertyref name="import.jdbc.password"/>
-      <propertyref name="import.jdbc.url"/>
-    </propertyset>
-    
-    <!-- execute import utility within the page manager component -->
-    <antcall target="execute-import" inheritall="on" inheritrefs="on"/>
-    
-    <copy file="${jetspeedWebinfDir}/assembly/alternate/db-page-manager.xml" tofile="${jetspeedWebinfDir}/assembly/page-manager.xml" overwrite="true"/>
-    <copy file="${jetspeedWebinfDir}/assembly/alternate/interceptors.xml" todir="${jetspeedWebinfDir}/assembly" overwrite="true"/>
-  </target>
-  
-  <target name="execute-import">
-    
-    <!-- execute import utility with drivers path in classpath -->
-    <java classpathref="import-classpath" classname="org.apache.jetspeed.page.PageImporter" fork="yes" dir="${basedir}">
-      <syspropertyset>
-        <propertyset refid="import.syspropertyset.id"/>
-      </syspropertyset>
-    </java>
-    
-  </target>
+	      <arg
+	        line="-I &quot;/&quot;
+	              -a &quot;${basedir}/../webapps/${portalName}&quot;
+	      		  -c &quot;pageSerializer&quot;
+	      	      -p &quot;${jetspeedWebInfDir}/conf/spring-filter.properties&quot;" />
+	    </java>
+	</target>
 
 </project>
Index: jetspeed-installer/etc/database/database.properties.template
===================================================================
--- .	(revision 729289)
+++ .	(working copy)
@@ -1,4 +1,4 @@
-; Jetspeed Enterprise Portal 2.1.1 Database setup configuration
+; Jetspeed Enterprise Portal 2.2-SNAPSHOT Database setup configuration
 
 ; db.type supported values: db2, derby, mssql, mysql, oracle, postgres, sapdb
 db.type=@db.type@
Index: jetspeed-installer/final-assembly-descriptor.xml
===================================================================
--- jetspeed-installer/final-assembly-descriptor.xml	(revision 0)
+++ jetspeed-installer/final-assembly-descriptor.xml	(revision 0)
@@ -0,0 +1,235 @@
+<?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.
+
+  $Id:  $
+-->
+
<assembly xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/xsd/assembly-1.0.0.xsd">
+  <id>installer</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <dependencySets>
+    <dependencySet>
+      <unpack>true</unpack>
+      <includes>
+        <include>jetspeed-ant-tasks*</include>
+      </includes>
+      <useProjectArtifact>false</useProjectArtifact>
+    </dependencySet>
+  </dependencySets>
+  <fileSets>
+    <fileSet>
+      <directory>target/ant-installer-classes</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>etc/ant-installer/license</directory>
+      <outputDirectory>license</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>etc/ant-installer/resources</directory>
+      <outputDirectory>resources</outputDirectory>
+    </fileSet>
+  </fileSets>
+  <files>
+    <file>
+      <source>etc/ant-installer/build.xml</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+    <file>
+      <source>target/resources/ant-installer/antinstall-config.xml</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+    <file>
+      <source>target/database.zip</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+    <file>
+      <source>target/tomcat-portal.zip</source>
+      <outputDirectory>/</outputDirectory>
+    </file>
+  </files>
+</assembly>
+    
+<!--
+<assembly>
+  <id/>
+  <formats/>
+  <includeBaseDirectory/>
+  <baseDirectory/>
+  <includeSiteDirectory/>
+  <containerDescriptorHandlers>
+    <containerDescriptorHandler
+      >
+      <handlerName/>
+    </containerDescriptorHandler>
+  </containerDescriptorHandlers>
+  <moduleSets>
+    <moduleSet
+      >
+      <includeSubModules/>
+      <includes/>
+      <excludes/>
+      <sources
+        >
+        <fileSets>
+          <fileSet
+            >
+            <directory/>
+            <lineEnding/>
+            <filtered/>
+            <useStrictFiltering/>
+            <useDefaultExcludes/>
+            <outputDirectory/>
+            <includes/>
+            <excludes/>
+            <fileMode/>
+            <directoryMode/>
+          </fileSet>
+        </fileSets>
+        <includeModuleDirectory/>
+        <excludeSubModuleDirectories/>
+        <outputDirectoryMapping/>
+        <useStrictFiltering/>
+        <useDefaultExcludes/>
+        <outputDirectory/>
+        <includes/>
+        <excludes/>
+        <fileMode/>
+        <directoryMode/>
+      </sources>
+      <binaries>
+        <attachmentClassifier/>
+        <includeDependencies/>
+        <dependencySets>
+          <dependencySet>
+            <outputFileNameMapping/>
+            <unpack/>
+            <unpackOptions>
+              <includes/>
+              <excludes/>
+              <filtered/>
+            </unpackOptions>
+            <scope/>
+            <useProjectArtifact/>
+            <useProjectAttachments/>
+            <useTransitiveDependencies/>
+            <useTransitiveFiltering/>
+            <useStrictFiltering/>
+            <useDefaultExcludes/>
+            <outputDirectory/>
+            <includes/>
+            <excludes/>
+            <fileMode/>
+            <directoryMode/>
+          </dependencySet>
+        </dependencySets>
+        <unpack/>
+        <unpackOptions>
+          <includes/>
+          <excludes/>
+          <filtered/>
+        </unpackOptions>
+        <outputFileNameMapping/>
+        <useStrictFiltering/>
+        <useDefaultExcludes/>
+        <outputDirectory/>
+        <includes/>
+        <excludes/>
+        <fileMode/>
+        <directoryMode/>
+      </binaries>
+    </moduleSet>
+  </moduleSets>
+  <fileSets>
+    <fileSet
+      >
+      <directory/>
+      <lineEnding/>
+      <filtered/>
+      <useStrictFiltering/>
+      <useDefaultExcludes/>
+      <outputDirectory/>
+      <includes/>
+      <excludes/>
+      <fileMode/>
+      <directoryMode/>
+    </fileSet>
+  </fileSets>
+  <files>
+    <file
+      >
+      <source/>
+      <outputDirectory/>
+      <destName/>
+      <fileMode/>
+      <lineEnding/>
+      <filtered/>
+    </file>
+  </files>
+  <dependencySets>
+    <dependencySet
+      >
+      <outputFileNameMapping/>
+      <unpack/>
+      <unpackOptions
+        >
+        <includes/>
+        <excludes/>
+        <filtered/>
+      </unpackOptions>
+      <scope/>
+      <useProjectArtifact/>
+      <useProjectAttachments/>
+      <useTransitiveDependencies/>
+      <useTransitiveFiltering/>
+      <useStrictFiltering/>
+      <useDefaultExcludes/>
+      <outputDirectory/>
+      <includes/>
+      <excludes/>
+      <fileMode/>
+      <directoryMode/>
+    </dependencySet>
+  </dependencySets>
+  <repositories>
+    <repository
+      >
+      <includeMetadata/>
+      <groupVersionAlignments>
+        <groupVersionAlignment
+          >
+          <id/>
+          <version/>
+          <excludes/>
+        </groupVersionAlignment>
+      </groupVersionAlignments>
+      <scope/>
+      <useStrictFiltering/>
+      <useDefaultExcludes/>
+      <outputDirectory/>
+      <includes/>
+      <excludes/>
+      <fileMode/>
+      <directoryMode/>
+    </repository>
+  </repositories>
+  <componentDescriptors/>
+</assembly>
\ No newline at end of file
Index: jetspeed-installer/jetspeed-mvn-ant-installer-pom.xml
===================================================================
--- jetspeed-installer/jetspeed-mvn-ant-installer-pom.xml	(revision 0)
+++ jetspeed-installer/jetspeed-mvn-ant-installer-pom.xml	(revision 0)
@@ -0,0 +1,148 @@
+<?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.
+  
+  $Id: jetspeed-mvn-demo-pom.xml 723742 2008-12-05 14:37:00Z vkumar $
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>2.0.9</maven>
+  </prerequisites>
+
+  <artifactId>jetspeed-installer</artifactId>
+  <name>Jetspeed-2 Maven Invoker Configuration for installer</name>
+  <description>Jetspeed-2 Maven Invoker Configuration for installer</description>
+  <parent>
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <artifactId>jetspeed-2</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+
+  <packaging>jar</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-ant-tasks</artifactId>
+      <version>${pom.version}</version>
+      <type>jar</type>
+    </dependency>
+  </dependencies>
+
   <build>
+    <defaultGoal>package</defaultGoal>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.2</version>
+        <executions>
+
+          <!-- expand etc/antinstaller/lib/* to target/ant-installer-classes  -->
+          <execution>
+            <id>unpack-ant-installer</id>
+            <phase>generate-resources</phase>
+            <configuration>
+              <tasks>
+                <unjar src="etc/ant-installer/lib/ai-icons-eclipse.jar"
+                  dest="${project.build.directory}/ant-installer-classes" overwrite="false"/>
+                <unjar src="etc/ant-installer/lib/ant.jar"
+                  dest="${project.build.directory}/ant-installer-classes" overwrite="false"/>
+                <unjar src="etc/ant-installer/lib/ant-installer.jar"
+                  dest="${project.build.directory}/ant-installer-classes" overwrite="false"/>
+                <unjar src="etc/ant-installer/lib/ant-launcher.jar"
+                  dest="${project.build.directory}/ant-installer-classes" overwrite="false"/>
+                <unjar src="etc/ant-installer/lib/jgoodies-edited-1_2_2.jar"
+                  dest="${project.build.directory}/ant-installer-classes" overwrite="false"/>
+                <unjar src="etc/ant-installer/lib/xml-apis.jar"
+                  dest="${project.build.directory}/ant-installer-classes" overwrite="false"/>
+                <delete dir="${project.build.directory}/ant-installer-classes/META-INF"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.2</version>
+        <executions>
+          
+          <!-- copy some ant-installer configuration file to target/resources/ant-installer -->
+          <execution>
+            <id>copy-configuration</id>
+            <phase>generate-resources</phase>
+            <configuration>
+              <tasks>
+                <copy file="etc/ant-installer/@antinstall.filename@" 
+                  tofile="${project.build.directory}/resources/ant-installer/antinstall-config.xml"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
      <!-- assembly: create self extracting jar -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>final-assembly</id>
+            <phase>package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>final-assembly-descriptor.xml</descriptor>
+              </descriptors>
+              <appendAssemblyId>false</appendAssemblyId>
+              <archive>
+                <manifest>
+                  <mainClass>org.tp23.antinstaller.selfextract.NonExtractor</mainClass>
+                </manifest>
+              </archive>
+            </configuration>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+   </build>
+  
+  <profiles>
+    <profile>
+      <id>demo</id>
+      <build>
+        <finalName>${artifactId}-demo-${pom.version}</finalName>
+      </build> 
+    </profile>
+    <profile>
+      <id>minimal</id>
+      <build>
+        <finalName>${artifactId}-minimal-${pom.version}</finalName>
+      </build> 
+    </profile>
+  </profiles>
+</project>
Index: jetspeed-installer/jetspeed-mvn-database-pom.xml
===================================================================
--- jetspeed-installer/jetspeed-mvn-database-pom.xml	(revision 0)
+++ jetspeed-installer/jetspeed-mvn-database-pom.xml	(revision 0)
@@ -0,0 +1,266 @@
+<?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.
+  
+  $Id: jetspeed-mvn-demo-pom.xml 723742 2008-12-05 14:37:00Z vkumar $
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>2.0.9</maven>
+  </prerequisites>
+
+  <artifactId>jetspeed-mvn-installer-pom</artifactId>
+  <name>Jetspeed-2 Maven Invoker Configuration for installer's database</name>
+  <description>Jetspeed-2 Maven Invoker Configuration for installer's database</description>
+  <parent>
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <artifactId>jetspeed-2</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+
+  <packaging>pom</packaging>
+
+  <properties>
+    <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>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>${ant.version}</version>
+      <type>jar</type>
+    </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>
+      <type>jar</type>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-ant-tasks</artifactId>
+      <version>${org.apache.portals.jetspeed.version}</version>
+      <type>jar</type>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
+      <artifactId>jetspeed-db-tools</artifactId>
+      <version>${org.apache.portals.jetspeed.version}</version>
+      <type>jar</type>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.portlet</groupId>
+          <artifactId>portlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.pluto</groupId>
+          <artifactId>pluto-container-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>${pom.groupId}</groupId>
+          <artifactId>jetspeed-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>${pom.groupId}</groupId>
+          <artifactId>jetspeed-commons</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>${pom.groupId}</groupId>
+          <artifactId>jetspeed-cm</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.portals.jetspeed-2</groupId>
+          <artifactId>jetspeed-search</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.portals.jetspeed-2</groupId>
+          <artifactId>jetspeed-security</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-id-generator</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.portals.jetspeed-2</groupId>
+          <artifactId>jetspeed-file-cache</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.portals.jetspeed-2</groupId>
+          <artifactId>jetspeed-locator</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.portals.jetspeed-2</groupId>
+          <artifactId>jetspeed-capability</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.portals.jetspeed-2</groupId>
+          <artifactId>jetspeed-profiler</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.portals.jetspeed-2</groupId>
+          <artifactId>jetspeed-page-manager</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.portals.jetspeed-2</groupId>
+          <artifactId>jetspeed-serializer</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <defaultGoal>package</defaultGoal>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.2</version>
+        <executions>
+
+          <!-- prepare database files to be zipped  -->
+          <execution>
+            <id>prepare-database-files</id>
+            <phase>generate-resources</phase>
+            <configuration>
+              <tasks>
+                <!-- copy database files from subproject to target  -->
+                <copy todir="${project.build.directory}/database">
+                  <fileset dir="etc/database"/>
+                </copy>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+
+          <!-- copy context.xml to database. NB this occurs after unpack-portal-resources -->
+          <execution>
+            <id>copy-context-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"
+                />
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+
+        </executions>
+      </plugin>
+
+      <!-- extract needed resources from the portal-resources artifact -->
+      <plugin>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>jetspeed-unpack-maven-plugin</artifactId>
+        <version>${org.apache.portals.jetspeed.version}</version>
+        <executions>
+          <execution>
+            <id>unpack-portal-resources</id>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <phase>generate-resources</phase>
+            <configuration>
+              <unpack>
+                <artifact>org.apache.portals.jetspeed-2:jetspeed-portal-resources:jar</artifact>
+                <resources>
+                  <resource>
+                    <path>conf</path>
+                    <include>tomcat/context.xml</include>
+                    <destination>resources</destination>
+                  </resource>
+                  <resource>
+                    <path>@seed.path@</path>
+                    <include>j2-seed.xml</include>
+                    <destination>database</destination>
+                  </resource>
+                  <resource>
+                    <path>db-ojb</path>
+                    <destination>database/import/db-ojb</destination>
+                  </resource>
+                  <resource>
+                    <path>ddl</path>
+                    <destination>database</destination>
+                  </resource>
+                </resources>
+              </unpack>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-portal-resources</artifactId>
+            <version>${org.apache.portals.jetspeed.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+
+      <!-- assembly: zip database -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>zip-database</id>
+            <phase>package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>zip-database-descriptor.xml</descriptor>
+              </descriptors>
+              <finalName>database</finalName>
+              <appendAssemblyId>false</appendAssemblyId>
+            </configuration>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+
+  </build>
+
+</project>
Index: jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
===================================================================
--- jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml	(revision 0)
+++ jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml	(revision 0)
@@ -0,0 +1,526 @@
+<?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.
+  
+  $Id: jetspeed-mvn-demo-pom.xml 723742 2008-12-05 14:37:00Z vkumar $
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>2.0.9</maven>
+  </prerequisites>
+
+  <artifactId>jetspeed-mvn-tomcat-portal-pom</artifactId>
+  <name>Jetspeed-2 Maven Invoker Configuration for installer's Tomcat Portal</name>
+  <description>Jetspeed-2 Maven Invoker Configuration for installer's Tomcat Portal</description>
+  <parent>
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <artifactId>jetspeed-2</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+
+  <packaging>pom</packaging>
+
+  <properties>
+    <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>
+  </properties>
+
+  <build>
+    <defaultGoal>process-resources</defaultGoal>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>unpack</id>
+      <build>
+        <defaultGoal>package</defaultGoal>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.2</version>
+            <executions>
+              <!-- get tomcat zip file remotely and expand to target/tomcat-portal  -->
+              <execution>
+                <id>get-unpacked-tomcat</id>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <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}"
+                      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"/>
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
+          <!-- extract needed resources from the portal-resources artifact -->
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-unpack-maven-plugin</artifactId>
+            <version>${org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>unpack-portal-resources</id>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <unpack>
+                    <artifact>org.apache.portals.jetspeed-2:jetspeed-portal-resources:jar</artifact>
+                    <resources>
+                      <resource>
+                        <path>conf</path>
+                        <include>tomcat/context.xml</include>
+                        <destination>resources</destination>
+                      </resource>
+                    </resources>
+                  </unpack>
+                </configuration>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-portal-resources</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>minimal</id>
+      <build>
+        <defaultGoal>package</defaultGoal>
+
+        <!-- create a minimal jetspeed deployment into the expanded tomcat -->
+        <plugins>
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-deploy-maven-plugin</artifactId>
+            <version>${org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>deploy</id>
+                <goals>
+                  <goal>deploy</goal>
+                </goals>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <targetBaseDir>${org.apache.jetspeed.portal.home}</targetBaseDir>
+                  <portalName>${org.apache.jetspeed.portal.context.name}</portalName>
+                  <destinations>
+                    <context>webapps/jetspeed/META-INF</context>
+                  </destinations>
+                  <deployments>
+                    <deployment>
+                      <artifact>javax.portlet:portlet-api:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>javax.ccpp:ccpp:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:jetspeed-api:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:jetspeed-commons:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.pluto:pluto-container-api:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.pluto:pluto-taglib:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.bridges:portals-bridges-common:jar</artifact>
+                    </deployment>
+                    <!-- jetspeed portal expanded -->
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:jetspeed-demo:war</artifact>
+                      <expand>true</expand>
+                      <targetName>${org.apache.jetspeed.portal.context.name}</targetName>
+                      <delete>./${org.apache.jetspeed.portal.context.name}</delete>
+                    </deployment>
+                    <!-- demo portal tomcat context -->
+                    <deployment>
+                      <file>${project.build.directory}/resources/tomcat/context.xml</file>
+                      <destination>context</destination>
+                    </deployment>
+                    <!-- admin pa -->
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:j2-admin:war</artifact>
+                      <expand>true</expand>
+                      <delete>./j2-admin</delete>
+                    </deployment>
+                  </deployments>
+                </configuration>
+              </execution>
+            </executions>
+
+            <dependencies>
+
+              <dependency>
+                <groupId>javax.portlet</groupId>
+                <artifactId>portlet-api</artifactId>
+                <version>${portlet-api.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>javax.ccpp</groupId>
+                <artifactId>ccpp</artifactId>
+                <version>${ccpp.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-api</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+                <scope>runtime</scope>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-commons</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.pluto</groupId>
+                <artifactId>pluto-container-api</artifactId>
+                <version>${org.apache.pluto.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.pluto</groupId>
+                <artifactId>pluto-taglib</artifactId>
+                <version>${org.apache.pluto.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.bridges</groupId>
+                <artifactId>portals-bridges-common</artifactId>
+                <version>${org.apache.portals.bridges.common.version}</version>
+              </dependency>
+              <!-- jetspeed-demo -->
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-demo</artifactId>
+                <version>${pom.version}</version>
+                <type>war</type>
+              </dependency>
+              <!-- j2-admin -->
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>j2-admin</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+                <type>war</type>
+              </dependency>
+
+              <!-- plugin own dependencies -->
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-deploy-tools</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+
+          <!-- remove pages and move min-pages to pages -->
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-fileutils-maven-plugin</artifactId>
+            <version>${org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>delete-pages</id>
+                <goals>
+                  <goal>event</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <srcDirectoryPath>${org.apache.jetspeed.portal.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/pages</srcDirectoryPath>
+                  <event>delete</event>
+                </configuration>
+              </execution>
+              <execution>
+                <id>move-min-pages</id>
+                <goals>
+                  <goal>event</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <srcDirectoryPath>${org.apache.jetspeed.portal.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/min-pages</srcDirectoryPath>
+                  <destDirectoryPath>${org.apache.jetspeed.portal.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/pages</destDirectoryPath>
+                  <event>move</event>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>demo</id>
+      <build>
+        <defaultGoal>package</defaultGoal>
+        <plugins>
+          <!-- create a demo jetspeed deployment into the expanded tomcat -->
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-deploy-maven-plugin</artifactId>
+            <version>${org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>deploy</id>
+                <goals>
+                  <goal>deploy</goal>
+                </goals>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <targetBaseDir>${org.apache.jetspeed.portal.home}</targetBaseDir>
+                  <portalName>${org.apache.jetspeed.portal.context.name}</portalName>
+                  <destinations>
+                    <context>webapps/jetspeed/META-INF</context>
+                  </destinations>
+                  <deployments>
+                    <deployment>
+                      <artifact>javax.portlet:portlet-api:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>javax.ccpp:ccpp:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:jetspeed-api:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:jetspeed-commons:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.pluto:pluto-container-api:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.pluto:pluto-taglib:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.bridges:portals-bridges-common:jar</artifact>
+                    </deployment>
+                    <!-- jetspeed portal expanded -->
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:jetspeed-demo:war</artifact>
+                      <expand>true</expand>
+                      <targetName>${org.apache.jetspeed.portal.context.name}</targetName>
+                      <delete>./${org.apache.jetspeed.portal.context.name}</delete>
+                    </deployment>
+                    <!-- demo portal tomcat context -->
+                    <deployment>
+                      <file>${project.build.directory}/resources/tomcat/context.xml</file>
+                      <destination>context</destination>
+                    </deployment>
+                    <!-- admin pa -->
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:j2-admin:war</artifact>
+                      <expand>true</expand>
+                      <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>
+                      <delete>./demo</delete>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.applications:rss:war</artifact>
+                      <infuse>true</infuse>
+                      <expand>true</expand>
+                      <delete>./rss</delete>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.bridges:jpetstore:war</artifact>
+                      <infuse>true</infuse>
+                      <expand>true</expand>
+                      <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>
+            </executions>
+
+            <dependencies>
+              <dependency>
+                <groupId>javax.portlet</groupId>
+                <artifactId>portlet-api</artifactId>
+                <version>${portlet-api.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>javax.ccpp</groupId>
+                <artifactId>ccpp</artifactId>
+                <version>${ccpp.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-api</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+                <scope>runtime</scope>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-commons</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.pluto</groupId>
+                <artifactId>pluto-container-api</artifactId>
+                <version>${org.apache.pluto.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.pluto</groupId>
+                <artifactId>pluto-taglib</artifactId>
+                <version>${org.apache.pluto.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.bridges</groupId>
+                <artifactId>portals-bridges-common</artifactId>
+                <version>${org.apache.portals.bridges.common.version}</version>
+              </dependency>
+              <!-- jetspeed-demo -->
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-demo</artifactId>
+                <version>${pom.version}</version>
+                <type>war</type>
+              </dependency>
+              <!-- j2-admin -->
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>j2-admin</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+                <type>war</type>
+              </dependency>
+
+              <!-- demo pa's, not for minimal! -->
+              <dependency>
+                <groupId>org.apache.portals.applications</groupId>
+                <artifactId>demo</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+                <type>war</type>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.applications</groupId>
+                <artifactId>rss</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</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>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-deploy-tools</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+
+          <!-- remove min-pages from deployed jetspeed -->
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-fileutils-maven-plugin</artifactId>
+            <version>${org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>delete-min-pages</id>
+                <goals>
+                  <goal>event</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <srcDirectoryPath>${org.apache.jetspeed.portal.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/min-pages</srcDirectoryPath>
+                  <event>delete</event>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <!-- pack: zip tomcat-portal -->
+    <profile>
+      <id>pack</id>
+      <build>
+        <defaultGoal>package</defaultGoal>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>zip-tomcat-portal</id>
+                <phase>package</phase>
+                <configuration>
+                  <descriptors>
+                    <descriptor>zip-tomcat-portal-descriptor.xml</descriptor>
+                  </descriptors>
+                  <finalName>tomcat-portal</finalName>
+                  <appendAssemblyId>false</appendAssemblyId>
+                </configuration>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
Index: jetspeed-installer/pom.xml
===================================================================
--- jetspeed-installer/pom.xml	(revision 0)
+++ jetspeed-installer/pom.xml	(revision 0)
@@ -0,0 +1,114 @@
+<?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.
+
+  $Id: pom.xml  $
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <prerequisites>
+    <maven>2.0.9</maven>
+  </prerequisites>
+
+  <artifactId>jetspeed-installer-pom</artifactId>
+  <name>Jetspeed-2 Installer</name>
+  <parent>
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <artifactId>jetspeed-2</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+
   <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>jetspeed-mvn-maven-plugin</artifactId>
+        <version>${pom.version}</version>
+        <configuration>
+          <targets combine.children="append">
+            <target>
+              <id>clean</id>
+              <dir>./</dir>
+              <goals>clean</goals>
+            </target>
+            <target>
+              <id>database-minimal</id>
+              <name>database</name>
+              <properties>
+                <seed.path>seed/min</seed.path>
+              </properties>
+            </target>
+            <target>
+              <id>database-demo</id>
+              <name>database</name>
+              <properties>
+                <seed.path>seed</seed.path>
+              </properties>
+            </target>
+            <target>
+              <id>tomcat-portal-unpack</id>
+              <name>tomcat-portal</name>
+              <profiles>unpack</profiles>
+            </target>
+            <target>
+              <id>tomcat-portal-minimal</id>
+              <name>tomcat-portal</name>
+              <profiles>minimal</profiles>
+            </target>
+            <target>
+              <id>tomcat-portal-demo</id>
+              <name>tomcat-portal</name>
+              <profiles>demo</profiles>
+            </target>
+            <target>
+              <id>tomcat-portal-pack</id>
+              <name>tomcat-portal</name>
+              <profiles>pack</profiles>
+            </target>
+            <target>
+              <id>ant-installer-demo</id>
+              <name>ant-installer</name>
+              <profiles>demo</profiles>
+              <properties>
+                <antinstall.filename>antinstall-config.xml</antinstall.filename>
+              </properties>
+            </target>
+            <target>
+              <id>ant-installer-minimal</id>
+              <name>ant-installer</name>
+              <profiles>minimal</profiles>
+              <properties>
+                <antinstall.filename>antinstall-config-min.xml</antinstall.filename>
+              </properties>
+            </target>
+            <target>
+              <id>installer-demo</id>
+              <depends>clean,database-demo,tomcat-portal-unpack,tomcat-portal-demo,tomcat-portal-pack,ant-installer-demo</depends>
+            </target>
+            <target>
+              <id>installer-minimal</id>
+              <depends>clean,database-minimal,tomcat-portal-unpack,tomcat-portal-minimal,tomcat-portal-pack,ant-installer-minimal</depends>
+            </target>
+          </targets>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+
+</project>
Index: jetspeed-installer/zip-database-descriptor.xml
===================================================================
--- jetspeed-installer/zip-database-descriptor.xml	(revision 0)
+++ jetspeed-installer/zip-database-descriptor.xml	(revision 0)
@@ -0,0 +1,40 @@
+<?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.
+
+  $Id:  $
+-->
+
<assembly xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/xsd/assembly-1.0.0.xsd">
+  <id>zip-database</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <dependencySets>
+    <dependencySet>
+      <useProjectArtifact>false</useProjectArtifact>
+      <outputDirectory>database/lib</outputDirectory>
+    </dependencySet>
+  </dependencySets>
+  <fileSets>
+    <fileSet>
+      <directory>target/database</directory>
+      <outputDirectory>database</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
Index: jetspeed-installer/zip-tomcat-portal-descriptor.xml
===================================================================
--- jetspeed-installer/zip-tomcat-portal-descriptor.xml	(revision 0)
+++ jetspeed-installer/zip-tomcat-portal-descriptor.xml	(revision 0)
@@ -0,0 +1,33 @@
+<?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.
+
+  $Id:  $
+-->
+
<assembly xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/xsd/assembly-1.0.0.xsd">
+  <id>zip-tomcat-portal</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>target/${tomcat.version}</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
\ No newline at end of file
Index: pom.xml
===================================================================
--- .	(revision 729289)
+++ .	(working copy)
@@ -266,9 +266,9 @@
       <org.apache.maven.plugins.maven-surefire-plugin.version>2.1.3</org.apache.maven.plugins.maven-surefire-plugin.version>
     -->
     <torque.version>3.2-rc3</torque.version>
-    <tyrex.version>1.0.1</tyrex.version>
 
     <!-- Project Dependency Version Properties -->
+    <ant.version>1.6.5</ant.version>
     <aopalliance.version>1.0</aopalliance.version>
     <castor.version>1.1.1-xml</castor.version>
     <cglib.version>2.1_3</cglib.version>
@@ -338,6 +338,7 @@
     <asm.version>2.2</asm.version>
     <ccpp.version>1.0</ccpp.version>
     <commonj.version>1.1</commonj.version>
+    <tyrex.version>1.0.1</tyrex.version>
   </properties>
 
   <!-- Dependency Configuration -->
@@ -889,12 +890,6 @@
         <version>${mockrunner.version}</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>tyrex</groupId>
-        <artifactId>tyrex</artifactId>
-        <version>${tyrex.version}</version>
-        <scope>test</scope>
-      </dependency>
 
       <!-- XML -->
       <dependency>
@@ -1189,7 +1184,13 @@
         <scope>provided</scope>
       </dependency>
 
-    </dependencies>
+      <!--- Tyrex -->
+      <dependency>
+        <groupId>tyrex</groupId>
+        <artifactId>tyrex</artifactId>
+        <version>${tyrex.version}</version>
+      </dependency>
+    </dependencies>`
   </dependencyManagement>
 
   <distributionManagement>

Property changes on: .
___________________________________________________________________
Name: svn:eol-style
   - native