portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r513671 - in /portals/jetspeed-2/trunk/installer: ./ etc/ant-installer/ etc/ant-installer/resources/ etc/database/ etc/tomcat/conf/
Date Fri, 02 Mar 2007 09:12:11 GMT
Author: ate
Date: Fri Mar  2 01:12:10 2007
New Revision: 513671

URL: http://svn.apache.org/viewvc?view=rev&rev=513671
Log:
Completion of the new Jetspeed-2.1 installer

Added:
    portals/jetspeed-2/trunk/installer/etc/ant-installer/resources/Jetspeed_blue_med.png   (with props)
    portals/jetspeed-2/trunk/installer/etc/database/
    portals/jetspeed-2/trunk/installer/etc/database/build.xml   (with props)
    portals/jetspeed-2/trunk/installer/etc/database/database.properties.template
Modified:
    portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config-demo.xml
    portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config.xml
    portals/jetspeed-2/trunk/installer/etc/ant-installer/build.xml
    portals/jetspeed-2/trunk/installer/etc/tomcat/conf/context.xml
    portals/jetspeed-2/trunk/installer/maven.xml

Modified: portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config-demo.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config-demo.xml?view=diff&rev=513671&r1=513670&r2=513671
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config-demo.xml (original)
+++ portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config-demo.xml Fri Mar  2 01:12:10 2007
@@ -1,115 +1,230 @@
 <?xml version="1.0"?>
+<!--
+  Copyright 2004 The Apache Software Foundation
+  
+  Licensed 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$
+-->
 <!DOCTYPE installer PUBLIC "-//tp23 //DTD Ant Installer Config//EN"
     "http://antinstaller.sourceforge.net/dtd/antinstall-config-0.8.dtd">
-<!--
-
-This is an example installer from which you can start a project
-Edit this file to select the properties you want decided, at the end
-of the installation screen the properties will be available in a file
-in the current directory for your ant script
 
+<installer ui="swing,text" verbose="false" lookAndFeel="jgoodies" name="Jetspeed Enterprise Portal 2.1 Installer"
+  windowIcon="/resources/feather-small.png" defaultImageResource="/resources/Jetspeed_blue_med.png" minJavaVersion="1.4"
+  wide="650:250" antialiased="true">
+
+  <page type="input" name="intro" displayText="Welcome to the Jetspeed Enterprise Portal 2.1">
+    <comment displayText="" />
+    <comment displayText="This installer program will guide you through setting up the demo Jetspeed Portal." />
+  </page>
+
+  <page type="license" name="license" displayText="License conditions" resource="/LICENSE.TXT"></page>
+
+  <page type="input" name="properties" displayText="Installation location">
+    <directory property="installDir" defaultValue="${java.user.home}/Jetspeed-2.1"
+      defaultValueWin="C:\Program Files\Jetspeed-2.1" displayText="Select an installation directory" create="true"
+      checkExists="true" />
+  </page>
+
+  <page type="input" name="requiredComponents" displayText="Components selection">
+    <comment displayText="Jetspeed Enterprise Portal version 2.1" bold="true" />
+    <target displayText="Tomcat 5.5.20 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="RSS Portlets" property="dummy" defaultValue="true" force="true" />
+    <checkbox displayText="Demo Portlets" property="dummy" defaultValue="true" force="true" />
+    <checkbox displayText="JPetstore Demo Portlet" property="dummy" defaultValue="true" force="true" />
+    <checkbox displayText="JSF Demo Portlets" property="dummy" defaultValue="true" force="true" />
+  </page>
+
+  <page type="input" name="databaseSelection" displayText="Database selection">
+    <hidden property="checkdb" value="false" />
+    <hidden property="dbvalid" value="false" />
+    <hidden property="db.type" value="derby" />
+    <hidden property="db.username" value="" />
+    <hidden property="db.password" value="" />
+    <hidden property="jdbc.url" value="" />
+    <hidden property="jdbc.driver.class" value="" />
+    <hidden property="jdbc.driver.jar" value="" />
+    <hidden property="dbSetupAntTarget" value="doSetupDB" />
+
+    <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="dbtwo" />
+      <option text="Derby" value="derby" />
+      <option text="Microsoft SQL Server" value="mssql" />
+      <option text="MySql" value="mysql" />
+      <option text="PostgreSQL" value="postgres" />
+      <option text="Oracle (9i or higher)" value="oracle" />
+      <option text="SapDB" value="sapdb" />
+      <option text="Manual database setup" value="manual" />
+    </select>
+  </page>
+
+  <page type="input" name="manual" displayText="Manual Database setup" ifProperty="${dbName}=manual">
+    <hidden property="checkdb" value="false" />
+    <hidden property="dbvalid" value="false" />
+    <hidden property="db.type" value="" />
+    <hidden property="db.username" value="" />
+    <hidden property="db.password" value="" />
+    <hidden property="jdbc.url" value="" />
+    <hidden property="jdbc.driver.class" value="" />
+    <hidden property="jdbc.driver.jar" value="" />
+    <hidden property="dbSetupAntTarget" value="noDbSetup" />
+    <comment displayText="After the installation you must manually setup the Jetspeed database." bold="true" />
+    <comment displayText="" />
+    <comment displayText="An ant build.xml script is provided in the installation database directory." />
+    <comment displayText="" />
+    <comment displayText="The database configuration must be configured in the database.properties" />
+    <comment displayText="provided in the same directory." />
+    <comment displayText="" />
+    <comment displayText="Initialize the database by running ant from the database directory." />
+  </page>
+
+  <page type="input" name="mysql" displayText="MySQL Database connection parameters" ifProperty="${dbName}=mysql">
+    <hidden property="checkdb" value="true" />
+    <hidden property="dbvalid" value="false" />
+
+    <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"
+      displayText="JDBC driver" checkExists="true" />
+  </page>
+
+  <page type="input" name="postgres" displayText="PostgreSQL Database connection parameters"
+    ifProperty="${dbName}=postgres">
+    <hidden property="checkdb" value="true" />
+    <hidden property="dbvalid" value="false" />
+
+    <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" />
+
+    <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" />
+
+    <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" />
+    <hidden property="dbvalid" value="false" />
+
+    <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"
+      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="dbtwo" displayText="DB2 Database connection parameters" ifProperty="${dbName}=mssql">
+    <hidden property="checkdb" value="true" />
+    <hidden property="dbvalid" value="false" />
+
+    <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}" />
+    <hidden property="db.username" value="${dbUser}" />
+    <hidden property="db.password" value="${dbPassword}" />
+    <hidden property="jdbc.url" value="${jdbcUrl}" />
+    <hidden property="jdbc.driver.class" value="${jdbcDriverClass}" />
+    <hidden property="jdbc.driver.jar" value="${jdbcDriverJar}" />
+    <hidden property="dbSetupAntTarget" value="doSetupDB" />
+    <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" />
+    <hidden property="db.type" value="" />
+    <hidden property="db.username" value="" />
+    <hidden property="db.password" value="" />
+    <hidden property="jdbc.url" value="" />
+    <hidden property="jdbc.driver.class" value="" />
+    <hidden property="jdbc.driver.jar" value="" />
+    <hidden property="dbSetupAntTarget" value="noDbSetup" />
+
+    <comment displayText="Please go back and specify the correct database configurtion parameters." bold="true" />
+    <comment displayText="" />
+    <comment displayText="Continuing will require a manual setup of the database after the installation." bold="true" />
+  </page>
 
-lookAndFeel="com.jgoodies.plaf.windows.ExtWindowsLookAndFeel"  - not recommended since it is not linux compatible due to Micro$oft License restrictions
+  <page type="progress" name="progress" displayText="Installation progress" />
 
-lookAndFeel="net.sourceforge.mlf.metouia.MetouiaLookAndFeel"  - good, and cross platform
+</installer>
 
-lookAndFeel="com.jgoodies.plaf.plastic.Plastic3DLookAndFeel"  - good, and cross platform
-
-lookAndFeel="com.jgoodies.plaf.plastic.PlasticXPLookAndFeel"  - good, and cross platform
-
-lookAndFeel="com.jgoodies.plaf.plastic.PlasticLookAndFeel" - good but flat, and cross platform
--->
-
-<!--
-
-defaultImageResource,windowIcon,resource and imageResource load from the classpath
-the installer script should put the locations of these resources on the classpath
-
--->
-<installer ui="swing,text" verbose="false"
-    lookAndFeel="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel"
-    name="Jetspeed 2.1 Installer" windowIcon="/resources/feather-small.png"
-    defaultImageResource="/resources/apache-portals.gif" minJavaVersion="1.4" wide="650:250">
-    <!--  each page element represents a page of the installer -->
-    <page type="input" name="intro" displayText="Jetspeed 2.1">
-        <comment displayText="Welcome to Jetspeed 2.1!" title="true"/>
-        <comment
-            displayText="This installer program will guide you through an install of the complete Jetspeed 2.1 Portal, including sample portal applications."/>
-    </page>
-    <!--  type="license" shows a license page to click through -->
-    <page type="license" name="license" displayText="License conditions"
-        resource="/resources/LICENSE.TXT">
-    </page>
-    <!--  type="input" shows a list of editable options for the installer -->
-    <page type="input" name="properties" displayText="Required install options">
-        <directory property="installDir" 
-            defaultValue="/usr/local/ApacheJetspeed-2.1"
-            defaultValueWin="c:/ApacheJetspeed-2.1"
-            displayText="Select an installation directory" create="true" checkExists="true"/>
-    </page>
-    <page type="input" name="requiredComponents" displayText="Required Components">
-        <comment displayText="Required Components - Click Next" bold="true"/>
-        <target displayText="Core components" target="install" defaultValue="true"
-            force="true"/>
-        <target displayText="Create Database" target="generateDb"
-            defaultValue="true" force="true"/>
-        <target displayText="Populate Database" target="populateDB"
-            defaultValue="true" force="true"/>
-        <target displayText="Layout Portlets" target="layoutPortlets"
-            defaultValue="true" force="true"/>
-        <target displayText="Portal Administration Portlets"
-            target="j2admin" defaultValue="true" force="true"/>
-        
-    </page>
-    
-    <page type="input" name="optionalPortlets" displayText="Optional Portlets">
-        
-        <comment displayText="Choose the components you want to install" bold="true"/>
-        <target displayText="Demo Portlets" target="demoPortlets"
-            defaultValue="true" force="false"/>
-        <target displayText="JPetstore Portlets" target="jpetstorePortlets"
-            defaultValue="true" force="false"/>
-        <target displayText="JSF Portlets" target="jsfPortlets" defaultValue="true"
-            force="false"/>
-        <target displayText="RSS Portlets" target="rssPortlets" defaultValue="true"
-            force="false"/>
-    </page>
-    
-    <!--  These are some other input types       -->
-        
-    <page type="input" name="databaseInfo" displayText="Database information">
-        
-        <comment
-            displayText="Please fill in the fields below with the approriate database information."/>
-        <comment  displayText=" The default values should install Apache Derby as the Database."/>
-        <large-select property="dbName" displayText="Database type" defaultValue="derby" >
-           <option text="derby"  value="derby" />
-           <option text="mysql"  value="mysql" />
-           <option text="hsql"  value="hsql" />
-           <option text="postgres"  value="postgres" />
-           <option text="sapdb"  value="sapdb" />
-           <option text="oracle"  value="oracle" />
-           <option text="mssql"  value="mssql" />
-        </large-select> 
-<!--        <text property="dbName" displayText="Database type"
-            defaultValue="derby"/>
--->
-        <text property="dbUser" displayText="Database User Name" defaultValue=""/>
-        <text property="dbPassword" displayText="Database Password" defaultValue=""/>
-        
-        <text property="jdbcUrl" displayText="JDBC Connection String"
-            defaultValue="jdbc:derby:${installDir}/webapps/jetspeed/WEB-INF/productiondb;create=true"/>
-        <text property="jdbcDriverClass" displayText="JDBC Driver Classname"
-            defaultValue="org.apache.derby.jdbc.EmbeddedDriver"/>
-        
-        <file property="jdbcDriverJar"
-            defaultValue="${installDir}/shared/lib/derby-10.1.1.0.jar"
-            defaultValueWin="${installDir}/shared/lib/derby-10.1.1.0.jar"
-            displayText="JDBC driver" checkExists="false"/>
-        
-    </page> 
-    <!--  page type="progress" shows a progress page with the install button 
-    
-    Its target is set to cleanuptarget since it is the last page this target will be run last-->
-    <page type="progress" name="progress" displayText="Installation progress">
-    </page> </installer>

Modified: portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config.xml?view=diff&rev=513671&r1=513670&r2=513671
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config.xml (original)
+++ portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config.xml Fri Mar  2 01:12:10 2007
@@ -1,85 +1,225 @@
+<?xml version="1.0"?>
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed 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.
-
+  Copyright 2004 The Apache Software Foundation
+  
+  Licensed 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$
 -->
-<?xml version="1.0"?>
 <!DOCTYPE installer PUBLIC "-//tp23 //DTD Ant Installer Config//EN"
     "http://antinstaller.sourceforge.net/dtd/antinstall-config-0.8.dtd">
 
-<installer ui="swing,text" verbose="false" lookAndFeel="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel"
-  name="Jetspeed 2.1 Installer" windowIcon="/resources/feather-small.png"
-  defaultImageResource="/resources/apache-portals.gif" minJavaVersion="1.4" wide="650:250" antialiased="true">
+<installer ui="swing,text" verbose="false" lookAndFeel="jgoodies" name="Jetspeed Enterprise Portal 2.1 Installer"
+  windowIcon="/resources/feather-small.png" defaultImageResource="/resources/Jetspeed_blue_med.png" minJavaVersion="1.4"
+  wide="650:250" antialiased="true">
+
+  <page type="input" name="intro" displayText="Welcome to the Jetspeed Enterprise Portal 2.1">
+    <comment displayText="" />
+    <comment displayText="This installer program will guide you through setting up the core Jetspeed Portal." />
+  </page>
+
+  <page type="license" name="license" displayText="License conditions" resource="/LICENSE.TXT"></page>
 
-  <page type="input" name="intro" displayText="Jetspeed 2.1">
-    <comment displayText="Welcome to Jetspeed 2.1 Enterprise Portal!" title="true" />
-    <comment displayText="This installer program will guide you through an install of the core Jetspeed 2.1 Portal." />
+  <page type="input" name="properties" displayText="Installation location">
+    <directory property="installDir" defaultValue="${java.user.home}/Jetspeed-2.1"
+      defaultValueWin="C:\Program Files\Jetspeed-2.1" displayText="Select an installation directory" create="true"
+      checkExists="true" />
   </page>
 
-  <page type="license" name="license" displayText="License conditions" resource="/LICENSE.TXT">
+  <page type="input" name="requiredComponents" displayText="Components selection">
+    <comment displayText="Jetspeed Enterprise Portal version 2.1" bold="true" />
+    <target displayText="Tomcat 5.5.20 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" />
   </page>
-  
-  <page type="input" name="properties" displayText="Required install options">
-    <directory property="installDir" defaultValue="/usr/local/ApacheJetspeed-2.1"
-      defaultValueWin="c:/ApacheJetspeed-2.1" displayText="Select an installation directory" create="true"
-      checkExists="true" />
+
+  <page type="input" name="databaseSelection" displayText="Database selection">
+    <hidden property="checkdb" value="false" />
+    <hidden property="dbvalid" value="false" />
+    <hidden property="db.username" value="" />
+    <hidden property="db.password" value="" />
+    <hidden property="db.type" value="derby" />
+    <hidden property="jdbc.url" value="" />
+    <hidden property="jdbc.driver.class" value="" />
+    <hidden property="jdbc.driver.jar" value="" />
+    <hidden property="dbSetupAntTarget" value="doSetupDB" />
+
+    <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" />
+      <option text="Derby" value="derby" />
+      <option text="Microsoft SQL Server" value="mssql" />
+      <option text="MySql" value="mysql" />
+      <option text="PostgreSQL" value="postgres" />
+      <option text="Oracle (9i or higher)" value="oracle" />
+      <option text="SapDB" value="sapdb" />
+      <option text="Manual database setup" value="manual" />
+    </select>
   </page>
-  
-  <page type="input" name="requiredComponents" displayText="Required Components">
-    <comment displayText="Required Components - Click Next" bold="true" />
-    <target displayText="Core components" target="install" defaultValue="true" force="true" />
-    <target displayText="Create Database" target="generateDb" defaultValue="true" force="true" />
-    <target displayText="MinInstall" target="MinInstall" defaultValue="true" force="true" />
-    <target displayText="Populate Database" target="populateDB" defaultValue="true" force="true" />
-    <target displayText="Layout Portlets" target="layoutPortlets" defaultValue="true" force="true" />
-    <target displayText="Portal Administration Portlets" target="j2admin" defaultValue="true" force="true" />
-  </page>
-
-  <!--  These are some other input types       -->
-
-  <page type="input" name="databaseInfo" displayText="Database information">
-
-    <comment displayText="Please fill in the fields below with the approriate database information." />
-    <comment displayText=" The default values should install Apache Derby as the Database." />
-    <large-select property="dbName" displayText="Database type" defaultValue="derby">
-      <option text="derby" value="derby" />
-      <option text="mysql" value="mysql" />
-      <option text="hsql" value="hsql" />
-      <option text="postgres" value="postgres" />
-      <option text="sapdb" value="sapdb" />
-      <option text="oracle" value="oracle" />
-      <option text="mssql" value="mssql" />
-    </large-select>
-    <!--        <text property="dbName" displayText="Database type"
-      defaultValue="derby"/>
-    -->
+
+  <page type="input" name="manual" displayText="Manual Database setup" ifProperty="${dbName}=manual">
+    <hidden property="checkdb" value="false" />
+    <hidden property="dbvalid" value="false" />
+    <hidden property="db.type" value="" />
+    <hidden property="db.username" value="" />
+    <hidden property="db.password" value="" />
+    <hidden property="jdbc.url" value="" />
+    <hidden property="jdbc.driver.class" value="" />
+    <hidden property="jdbc.driver.jar" value="" />
+    <hidden property="dbSetupAntTarget" value="noDbSetup" />
+    <comment displayText="After the installation you must manually setup the Jetspeed database." bold="true" />
+    <comment displayText="" />
+    <comment displayText="An ant build.xml script is provided in the installation database directory." />
+    <comment displayText="" />
+    <comment displayText="The database configuration must be configured in the database.properties" />
+    <comment displayText="provided in the same directory." />
+    <comment displayText="" />
+    <comment displayText="Initialize the database by running ant from the database directory." />
+  </page>
+
+  <page type="input" name="mysql" displayText="MySQL Database connection parameters" ifProperty="${dbName}=mysql">
+    <hidden property="checkdb" value="true" />
+    <hidden property="dbvalid" value="false" />
+
+    <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:derby:${installDir}/webapps/jetspeed/WEB-INF/productiondb;create=true" />
+      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"
+      displayText="JDBC driver" checkExists="true" />
+  </page>
+
+  <page type="input" name="postgres" displayText="PostgreSQL Database connection parameters"
+    ifProperty="${dbName}=postgres">
+    <hidden property="checkdb" value="true" />
+    <hidden property="dbvalid" value="false" />
+
+    <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" />
+
+    <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" />
+
+    <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" />
+    <hidden property="dbvalid" value="false" />
+
+    <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"
-      defaultValue="org.apache.derby.jdbc.EmbeddedDriver" />
+      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>
 
-    <file property="jdbcDriverJar" defaultValue="${installDir}/shared/lib/derby-10.1.1.0.jar"
-      defaultValueWin="${installDir}/shared/lib/derby-10.1.1.0.jar" displayText="JDBC driver" checkExists="false" />
+  <page type="input" name="db2" displayText="DB2 Database connection parameters" ifProperty="${dbName}=mssql">
+    <hidden property="checkdb" value="true" />
+    <hidden property="dbvalid" value="false" />
+
+    <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="" />
 
-    <hidden property="dataFileDirectory" value="database/min" />
+    <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}" />
+    <hidden property="db.username" value="${dbUser}" />
+    <hidden property="db.password" value="${dbPassword}" />
+    <hidden property="jdbc.url" value="${jdbcUrl}" />
+    <hidden property="jdbc.driver.class" value="${jdbcDriverClass}" />
+    <hidden property="jdbc.driver.jar" value="${jdbcDriverJar}" />
+    <hidden property="dbSetupAntTarget" value="doSetupDB" />
+    <comment displayText="Press Next to test the database connection ..." />
   </page>
-  <!--  page type="progress" shows a progress page with the install button 
-    
-    Its target is set to cleanuptarget since it is the last page this target will be run last-->
-  <page type="progress" name="progress" displayText="Installation progress"></page>
+
+  <page type="input" name="dbCheckFailed" displayText="Connection to the database failed"
+    ifProperty="(${checkdb}=true) AND (${dbvalid}=false)">
+    <hidden property="checkdb" value="false" />
+    <hidden property="db.type" value="" />
+    <hidden property="db.username" value="" />
+    <hidden property="db.password" value="" />
+    <hidden property="jdbc.url" value="" />
+    <hidden property="jdbc.driver.class" value="" />
+    <hidden property="jdbc.driver.jar" value="" />
+    <hidden property="dbSetupAntTarget" value="noDbSetup" />
+
+    <comment displayText="Please go back and specify the correct database configurtion parameters." bold="true" />
+    <comment displayText="" />
+    <comment displayText="Continuing will require a manual setup of the database after the installation." bold="true" />
+  </page>
+
+  <page type="progress" name="progress" displayText="Installation progress" />
+
 </installer>

Modified: portals/jetspeed-2/trunk/installer/etc/ant-installer/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/ant-installer/build.xml?view=diff&rev=513671&r1=513670&r2=513671
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/ant-installer/build.xml (original)
+++ portals/jetspeed-2/trunk/installer/etc/ant-installer/build.xml Fri Mar  2 01:12:10 2007
@@ -1,314 +1,79 @@
 <!--
-	Copyright 2004 The Apache Software Foundation
-	
-	Licensed 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$
+  Copyright 2004 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  
+  $Id$
 -->
-<project name="JetspeedInstaller" default="install" basedir="${basedir}"> 
-	
-    <property name="jetspeedDir" value="${installDir}/webapps/jetspeed" />
-    <property name="portletAppsDir" value="${installDir}/portlet_apps"/> 
-    <property name="dbName" value="derby"/> 
-    <property name="dbUser" value=""/> 
-    <property name="dbPassword" value=""/> 
-    <property name="jdbcUrl" value="jdbc:derby:${installDir}/webapps/jetspeed/WEB-INF/productiondb;create=true"/> 
-    <property name="jdbcDriverClass" value="org.apache.derby.jdbc.EmbeddedDriver"/> 
-	
-	
-    <target name="install" >
-	<echo>basic install starting</echo>
-        <mkdir dir="${basedir}/temp"/>
-        <unzip src="installpack.zip" dest="${basedir}/temp"/>
+<project name="JetspeedInstaller" default="install" basedir=".">
 
-    	
-    	<condition property="fork.db" value="true">
-    		<equals arg1="${dbName}" arg2="derby"/> 
-    	</condition>
-	
-    <property name="dataFileDirectory" value="database"/>
+  <taskdef name="checkConnection" classname="org.apache.jetspeed.anttasks.AntInstallerCheckConnection" />
 
-    <property name="DATAFILE" value="${basedir}/${dataFileDirectory}/j2-seed.xml"/>		
-    	
-    <echo>install unpack done</echo>
-        
-	<echo> moving stuff from the temp dir </echo>
-	<echo>now configuring</echo>
-        <copy todir="${installDir}" overwrite="true">
-            <fileset dir="${basedir}/temp">
-                <exclude name="**/jetspeed.xml"/>
-            </fileset>
-        </copy>
+  <property file="ant.install.properties" />
 
-	<echo>unpacking jetspeed war</echo>	
-        <unwar src="${installDir}/webapps/jetspeed.war" dest="${installDir}/webapps/jetspeed" />
-        <copy file="temp/jetspeed-tomcat-5.5.xml"
-          tofile="${installDir}/conf/Catalina/localhost/jetspeed.xml" overwrite="true">
-          <filterset begintoken="@" endtoken="@">
-            <filter token="CONTEXT" value="jetspeed"/>
-            <filter token="USERNAME" value="${dbUser}"/>
-            <filter token="PASSWORD" value="${dbPassword}"/>
-            <filter token="DRIVER" value="${jdbcDriverClass}"/>
-            <filter token="URL" value="${jdbcUrl}"/>
-          </filterset>
-        </copy>
-	
-	<echo>copying database driver jar</echo>
-	<!-- place db jar in shared.. we assume the Catalina will not need to talk to this -->
-    	<copy failonerror="false" file="${jdbcDriverJar}" todir="${installDir}/shared/lib" overwrite="true" />
-	<echo>fixing permissions</echo>
-	<chmod perm="700" dir="${installDir}/bin" includes="**/*.sh"/>
-	<echo>basic install finished</echo>
-    </target>    
+  <target name="install">
+    <echo>basic install starting</echo>
 
-	   <target name="MinInstall">
-	  		
-<!--	   		<property name="DATAFILE" value="${basedir}/database/min/j2-seed.xml"/>		 -->
- 			<echo>resetting DATAFILE for seed data to ${DATAFILE}</echo>
-			<echo>resetting dataFileDirectory for seed data to ${dataFileDirectory}</echo>
-	 	   	
-		</target>
-	
-	   <target name="generateStandardDb" unless="fork.db">
-	   	<echo>cleaning up possible exiting Db</echo>
-  	   	  <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
-	   		  password="${dbPassword}"
-	   		  src="${basedir}/database/drop.sql"
-	   		  autocommit="true"
-	   		  onerror="continue"
-	   		  print="yes" output="outputfile.txt">
-	   		  <classpath>
-	   			  <pathelement location="${jdbcDriverJar}"/>
-	   		  </classpath>
-	   	  </sql>
-	   	<echo>starting Db generation</echo>
-	        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
-	            password="${dbPassword}"
-	            src="${basedir}/database/${dbName}/schema/phase1-schema.sql"
-	            print="yes" output="outputfile.txt">
-	            <classpath>
-	                <pathelement location="${jdbcDriverJar}"/>
-	            </classpath>
-	        </sql>
-	        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
-	            password="${dbPassword}"
-	            src="${basedir}/database/${dbName}/schema/phase2-schema.sql"
-	            print="yes" output="outputfile.txt">
-	            <classpath>
-	                <pathelement location="${jdbcDriverJar}"/>
-	            </classpath>
-	        </sql>
-	        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
-	            password="${dbPassword}"
-	            src="${basedir}/database/${dbName}/schema/phase3ojb-schema.sql"
-	            print="yes" output="outputfile.txt">
-	            <classpath>
-	                <pathelement location="${jdbcDriverJar}"/>
-	            </classpath>
-	        </sql>
-	        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
-	            password="${dbPassword}"
-	            src="${basedir}/database/${dbName}/schema/prefs-schema.sql"
-	            print="yes" output="outputfile.txt">
-	            <classpath>
-	                <pathelement location="${jdbcDriverJar}"/>
-	            </classpath>
-	        </sql>
-	        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
-	            password="${dbPassword}"
-	            src="${basedir}/database/${dbName}/schema/registry-schema.sql"
-	            print="yes" output="outputfile.txt">
-	            <classpath>
-	                <pathelement location="${jdbcDriverJar}"/>
-	            </classpath>
-	        </sql>
-	        <sql driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}"
-	            password="${dbPassword}"
-	            src="${basedir}/database/${dbName}/schema/security-schema.sql"
-	            print="yes" output="outputfile.txt">
-	            <classpath>
-	                <pathelement location="${jdbcDriverJar}"/>
-	            </classpath>
-	        </sql>
-	        <echo>DB generation done!</echo>
-	    </target>
-	
-	
-
-	
-	
-   <target name="generateDerby" if="fork.db">
-	  <antcall target="createDerbyDB">
-    <param name="databaseScript" value="${basedir}/database/${dbName}/schema/phase1-schema.sql"/>
-	  </antcall>
-	  <antcall target="createDerbyDB">
-    <param name="databaseScript" value="${basedir}/database/${dbName}/schema/phase2-schema.sql"/>
-	  </antcall>
-	  <antcall target="createDerbyDB">
-    <param name="databaseScript" value="${basedir}/database/${dbName}/schema/phase3ojb-schema.sql"/>
-	  </antcall>
-	  <antcall target="createDerbyDB">
-    <param name="databaseScript" value="${basedir}/database/${dbName}/schema/prefs-schema.sql"/>
-	  </antcall>
-	  <antcall target="createDerbyDB">
-    <param name="databaseScript" value="${basedir}/database/${dbName}/schema/registry-schema.sql"/>
-	  </antcall>
-	  <antcall target="createDerbyDB">
-    <param name="databaseScript" value="${basedir}/database/${dbName}/schema/security-schema.sql"/>
-	  </antcall>
-
-   </target>
-	
-	
-    <target name="generateDb" depends="generateStandardDb, generateDerby" >
-    </target>
-    
-	<target name="layoutPortlets">
-		<copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy" file="${basedir}/portlet_apps/jetspeed-layouts.war" />		   
-    </target>
-	<target name="demoPortlets">
-		<copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy" file="${basedir}/portlet_apps/demo.war" />		   
-    </target>
-	<target name="j2admin">
-			<copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy" file="${basedir}/portlet_apps/j2-admin.war" />		   
-	</target>
-	<target name="jpetstorePortlets">
-			<copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy" file="${basedir}/portlet_apps/jpetstore.war" />		   
-	</target>
-	<target name="jsfPortlets">
-			<copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy" file="${basedir}/portlet_apps/jsf-demo.war" />		   
-	</target>
-	<target name="perlPortlets">
-	  	   <copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy" file="${basedir}/portlet_apps/perl.war" />		   
-	</target>
-    <target name="phpPortlets">
-    	<copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy" file="${basedir}/portlet_apps/php.war" />		   
-    </target>
-	<target name="rssPortlets">
-	  	<copy todir="${installDir}/webapps/jetspeed/WEB-INF/deploy" file="${basedir}/portlet_apps/rss.war" />		   
-	</target>
-
-	
-	
-    <!-- ============== Data-Serializer for seed data============== -->
-    <target name='populateDB'>
-
-    <mkdir dir="${basedir}/temp/dbseed"/>
-
-    <property name="assemblyDir" value="${basedir}/temp/dbseed/assembly"/>	
-   
-    	
-	<echo> Data-Serializer based on ${assemblyDir}</echo>
-
-    	<!-- copy assembly files -->
-    	<mkdir dir="${assemblyDir}"/>
-    	<copy todir="${assemblyDir}" overwrite="true" failonerror="true">
-    	      <fileset dir="${installDir}/webapps/jetspeed/WEB-INF/assembly">
-    	        <include name="security*.xml"/>
-    			<include name="capabilities.xml"/>           
-    			<include name="prefs.xml"/>           
-    			<include name="profiler.xml"/>      
-    			<include name="registry.xml"/>       
-    			<include name="transaction.xml"/>       
-    			<include name="cache.xml"/>    
-    	      </fileset>
-    	     </copy>
-
-
-		<copy todir="${assemblyDir}" overwrite="true" failonerror="true">
-	      <fileset dir="${installDir}/webapps/jetspeed/WEB-INF/assembly/alternate/">
-	        <include name="request-context.xml"/> 
-	      </fileset>
-	     </copy>
-
-    	
-    	
-    	<!-- copy boot files -->
-
-    	
-    <mkdir dir="${assemblyDir}/boot"/>
-
-	<copy todir="${assemblyDir}/boot" overwrite="true" failonerror="true">
-      <fileset dir="${jetspeedDir}/WEB-INF/assembly/boot">
-        <include name="*.xml"/>
+    <condition property="jdk15Installed">
+      <equals arg1="${ant.java.version}" arg2="1.5" />
+    </condition>
+
+    <unzip src="${antinstaller.jar}" dest="${installDir}">
+      <patternset>
+        <include name="portal.zip" />
+        <include name="database.zip" />
+        <include name="tomcat-compat.zip" unless="jdk15Installed" />
+      </patternset>
+    </unzip>
+    <unzip dest="${installDir}">
+      <fileset dir="${installDir}">
+        <include name="*.zip" />
       </fileset>
-    </copy>
-
-	<echo> running seed with data: ${DATAFILE}  arguments: -b ${assemblyDir}/boot/ -c ${assemblyDir}/  database-url: ${jdbcUrl}</echo>
-    	
-  	
-    <java classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication" fork="yes">
-        <classpath>
-          <pathelement path="${classpath}"/>
-            <fileset dir="${installDir}/shared/lib">
-              <include name="**/*.jar"/>
-            </fileset>
-          <fileset dir="${jetspeedDir}/WEB-INF/lib">
-            <include name="**/*.jar"/>
-          </fileset>
-            <fileset dir="${installDir}/temp_install">
-              <include name="**/*.jar"/>
-            </fileset>
-            <fileset dir="${installDir}/common/lib">
-              <include name="**/*.jar"/>
-            </fileset>
-          <pathelement location="${jdbcDriverJar}"/>
-          <pathelement location="${installDir}/shared/classes"/>
-          <pathelement location="${jetspeedDir}/WEB-INF/classes"/>
-        </classpath>
-		
-        <arg line="-I &quot;${DATAFILE}&quot; -a ${jetspeedDir} -b file:${assemblyDir}/boot/ -c file:${assemblyDir}/ -dc ${jdbcDriverClass} -ds ${jdbcUrl} -du ${dbUser} -dp ${dbPassword}"/>  
-    </java>
-   </target>
-
-    <!-- ============== Data-Serializer for seed data============== -->
-    <target name='createDerbyDB'>
+    </unzip>
+    <delete>
+      <fileset dir="${installDir}">
+        <include name="*.zip" />
+      </fileset>
+    </delete>
+    <chmod perm="700" dir="${installDir}/bin" includes="**/*.sh" />
 
-    	
-	<echo> createDerbyDB for ${databaseScript}</echo>
-    	
-  	
-		
-	     <java classname="org.apache.jetspeed.anttasks.ExecuteJavaSQL" fork="yes">
-	        <classpath>
-	          <pathelement path="${classpath}"/>
-	            <fileset dir="${installDir}/shared/lib">
-	              <include name="**/*.jar"/>
-	            </fileset>
-	          <fileset dir="${jetspeedDir}/WEB-INF/lib">
-	            <include name="**/*.jar"/>
-	          </fileset>
-	            <fileset dir="${installDir}/temp_install">
-	              <include name="**/*.jar"/>
-	            </fileset>
-	            <fileset dir="${installDir}/common/lib">
-	              <include name="**/*.jar"/>
-	            </fileset>
-	          <pathelement location="${jdbcDriverJar}"/>
-	          <pathelement location="${installDir}/shared/classes"/>
-	          <pathelement location="${jetspeedDir}/WEB-INF/classes"/>
-	        </classpath>
+    <condition property="jdbcjar" value="${installDir}/database/lib/derby-10.1.1.0.jar">
+      <equals arg1="${jdbc.driver.jar}" arg2="" />
+    </condition>
+    <property name="jdbcjar" value="${jdbc.driver.jar}" />
+    <copy failonerror="false" todir="${installDir}/shared/lib" file="${jdbcjar}" />
+
+    <move file="${installDir}/database/database.properties.template" tofile="${installDir}/database/database.properties"
+      overwrite="true">
+      <filterset begintoken="@" endtoken="@">
+        <filter token="db.type" value="${db.type}" />
+        <filter token="db.username" value="${db.username}" />
+        <filter token="db.password" value="${db.password}" />
+        <filter token="jdbc.url" value="${jdbc.url}" />
+        <filter token="jdbc.driver.class" value="${jdbc.driver.class}" />
+      </filterset>
+    </move>
+    <ant antfile="${installDir}/database/build.xml" target="${dbSetupAntTarget}" dir="${installDir}/database" />
+  </target>
+
+  <target name="antinstaller-checkdb" depends="">
+
+    <checkConnection driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}" password="${dbPassword}">
+      <classpath>
+        <pathelement location="${jdbcDriverJar}" />
+      </classpath>
+    </checkConnection>
+    <antinstaller-property name="dbvalid" value="true" />
+  </target>
 
-	     	
-	     	<arg line="driver=${jdbcDriverClass} 
-	      url=${jdbcUrl}
-	      userid=${dbUser} 
-	      password=${dbPassword}
-	      src=&quot;${databaseScript}&quot; autocommit=true
-	      onerror=abort"/>
-	    </java>
-	 
-	  </target>
-	  
-    	
 </project>

Added: portals/jetspeed-2/trunk/installer/etc/ant-installer/resources/Jetspeed_blue_med.png
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/ant-installer/resources/Jetspeed_blue_med.png?view=auto&rev=513671
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/resources/Jetspeed_blue_med.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: portals/jetspeed-2/trunk/installer/etc/database/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/database/build.xml?view=auto&rev=513671
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/database/build.xml (added)
+++ portals/jetspeed-2/trunk/installer/etc/database/build.xml Fri Mar  2 01:12:10 2007
@@ -0,0 +1,298 @@
+<!--
+  Copyright 2004 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  
+  $Id$
+-->
+<project name="JetspeedDatabaseSetup" default="setupDB" basedir=".">
+
+  <property file="${basedir}/database.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}/../webapps/jetspeed/WEB-INF/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">
+
+    <echo>Setting up the Jetspeed database for ${db.type}</echo>
+
+    <echo>All exiting Jetspeed data is going to be deleted from the database.</echo>
+    <echo></echo>
+    <echo>Selected database configuration:</echo>
+    <echo>database type: ${db.type}</echo>
+    <echo>username: ${db.user}</echo>
+    <echo>jdbc url: ${jdbc.url}</echo>
+    <echo></echo>
+    <echo>Make sure that the appropriate jdbc driver jar is placed in the Tomcat shared/lib folder.</echo>
+    <echo>For using the Derby database, the correct driver jar is provided in the lib folder.</echo>
+    <echo>Also make sure Tomcat is stopped 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>
+
+    <antcall target="doSetupDB" />
+
+  </target>
+
+  <target name="noDbSetup" />
+
+  <target name="doSetupDB" unless="failSetup"
+    depends="checkDerby,generateStandardDb, generateDerby, setupSeed, seedStandardDb, seedDerbyDb,copyStandardDbContext,copyDerbyDbContext" />
+
+  <target name="checkDerby">
+    <condition property="_derby">
+      <equals arg1="${db.type}" arg2="derby" />
+    </condition>
+  </target>
+
+  <target name="copyStandardDbContext" unless="_derby">
+    <copy file="jetspeed.xml" tofile="${basedir}/../conf/Catalina/localhost/jetspeed.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>
+
+  <target name="copyDerbyDbContext" if="_derby">
+    <copy file="jetspeed.xml" tofile="${basedir}/../conf/Catalina/localhost/jetspeed.xml" overwrite="true">
+      <filterset begintoken="@" endtoken="@">
+        <filter token="USERNAME" value="" />
+        <filter token="PASSWORD" value="" />
+        <filter token="DRIVER" value="org.apache.derby.jdbc.EmbeddedDriver" />
+        <filter token="URL" value="jdbc:derby:${basedir}/derby/productiondb" />
+      </filterset>
+    </copy>
+  </target>
+
+  <target name="generateDerby" if="_derby">
+    <delete dir="${basedir}/derby/productiondb" quiet="true" />
+    <antcall target="createDerbyDB">
+      <param name="databaseScript" value="${basedir}/derby/phase1-schema.sql" />
+    </antcall>
+    <antcall target="createDerbyDB">
+      <param name="databaseScript" value="${basedir}/derby/phase2-schema.sql" />
+    </antcall>
+    <antcall target="createDerbyDB">
+      <param name="databaseScript" value="${basedir}/derby/phase3ojb-schema.sql" />
+    </antcall>
+    <antcall target="createDerbyDB">
+      <param name="databaseScript" value="${basedir}/derby/prefs-schema.sql" />
+    </antcall>
+    <antcall target="createDerbyDB">
+      <param name="databaseScript" value="${basedir}/derby/registry-schema.sql" />
+    </antcall>
+    <antcall target="createDerbyDB">
+      <param name="databaseScript" value="${basedir}/derby/security-schema.sql" />
+    </antcall>
+
+  </target>
+
+  <target name="generateStandardDb" unless="_derby">
+    <echo>cleaning up possible exiting Db</echo>
+
+    <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="database.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="database.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="database.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="database.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="database.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="database.log">
+      <classpath>
+        <fileset dir="${basedir}/../shared/lib">
+          <include name="**/*.jar" />
+        </fileset>
+      </classpath>
+    </sql>
+    <echo>DB generation done!</echo>
+
+  </target>
+
+  <target name="setupSeed">
+
+    <delete dir="${basedir}/assembly" />
+    <mkdir dir="${basedir}/assembly" />
+    <echo>Seeding the database</echo>
+
+    <copy todir="${basedir}/assembly" overwrite="true" failonerror="true">
+      <fileset dir="${basedir}/../webapps/jetspeed/WEB-INF/assembly">
+        <include name="security*.xml" />
+        <include name="capabilities.xml" />
+        <include name="prefs.xml" />
+        <include name="profiler.xml" />
+        <include name="registry.xml" />
+        <include name="transaction.xml" />
+        <include name="cache.xml" />
+      </fileset>
+    </copy>
+
+
+    <copy todir="${basedir}/assembly" overwrite="true" failonerror="true">
+      <fileset dir="${basedir}/../webapps/jetspeed/WEB-INF/assembly/alternate/">
+        <include name="request-context.xml" />
+      </fileset>
+    </copy>
+
+    <mkdir dir="${basedir}/assembly/boot" />
+
+    <copy todir="${basedir}/assembly/boot" overwrite="true" failonerror="true">
+      <fileset dir="${basedir}/../webapps/jetspeed/WEB-INF/assembly/boot">
+        <include name="*.xml" />
+      </fileset>
+    </copy>
+
+  </target>
+
+  <target name="seedStandardDb" unless="_derby">
+    <java classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication" fork="yes">
+      <classpath>
+        <fileset dir="${basedir}/../shared/lib">
+          <include name="**/*.jar" />
+        </fileset>
+        <fileset dir="${basedir}/../webapps/jetspeed/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/jetspeed/WEB-INF/classes" />
+      </classpath>
+
+      <arg
+        line="-I &quot;${basedir}/j2-seed.xml&quot; -a ${basedir}/../webapps/jetspeed -b file:${basedir}/assembly/boot/ -c file:${basedir}/assembly/ -dc ${jdbc.driver.class} -ds ${jdbc.url} -du ${db.username} -dp ${db.password}" />
+    </java>
+
+  </target>
+
+  <target name="seedDerbyDb" if="_derby">
+    <java classname="org.apache.jetspeed.serializer.JetspeedSerializerApplication" fork="yes">
+      <classpath>
+        <fileset dir="${basedir}/../shared/lib">
+          <include name="**/*.jar" />
+        </fileset>
+        <fileset dir="${basedir}/../webapps/jetspeed/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/jetspeed/WEB-INF/classes" />
+      </classpath>
+
+      <arg
+        line="-I &quot;${basedir}/j2-seed.xml&quot; -a ${basedir}/../webapps/jetspeed -b file:${basedir}/assembly/boot/ -c file:${basedir}/assembly/ -dc org.apache.derby.jdbc.EmbeddedDriver -ds jdbc:derby:${basedir}/derby/productiondb;create=true -du -dp" />
+    </java>
+
+  </target>
+
+  <target name='createDerbyDB'>
+
+    <java classname="org.apache.jetspeed.anttasks.ExecuteJavaSQL" fork="yes">
+      <classpath>
+        <fileset dir="${basedir}/../shared/lib">
+          <include name="**/*.jar" />
+        </fileset>
+        <fileset dir="${basedir}/../webapps/jetspeed/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/jetspeed/WEB-INF/classes" />
+      </classpath>
+      <arg
+        line="driver=org.apache.derby.jdbc.EmbeddedDriver 
+	          url=jdbc:derby:${basedir}/derby/productiondb;create=true
+	          userid= 
+	          password=
+	          src=&quot;${databaseScript}&quot; autocommit=true
+	          onerror=abort" />
+    </java>
+
+  </target>
+
+</project>

Propchange: portals/jetspeed-2/trunk/installer/etc/database/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/installer/etc/database/build.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/trunk/installer/etc/database/database.properties.template
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/database/database.properties.template?view=auto&rev=513671
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/database/database.properties.template (added)
+++ portals/jetspeed-2/trunk/installer/etc/database/database.properties.template Fri Mar  2 01:12:10 2007
@@ -0,0 +1,9 @@
+; Jetspeed Enterprise Portal 2.1 Database setup configuration
+
+; db.type supported values: db2, derby, mssql, mysql, oracle, postgres, sapdb
+db.type=@db.type@
+: for db.type other than derby, the properties below need to be specified
+db.username=@db.username@
+db.password=@db.password@
+jdbc.url=@jdbc.url@
+jdbc.driver.class=@jdbc.driver.class@

Modified: portals/jetspeed-2/trunk/installer/etc/tomcat/conf/context.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/tomcat/conf/context.xml?view=diff&rev=513671&r1=513670&r2=513671
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/tomcat/conf/context.xml (original)
+++ portals/jetspeed-2/trunk/installer/etc/tomcat/conf/context.xml Fri Mar  2 01:12:10 2007
@@ -1,5 +1,5 @@
 <!-- The contents of this file will be loaded for each web application -->
-<Context antiJARLocking="true>
+<Context antiJARLocking="true">
 
     <!-- Default set of monitored resources -->
     <WatchedResource>WEB-INF/web.xml</WatchedResource>

Modified: portals/jetspeed-2/trunk/installer/maven.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/maven.xml?view=diff&rev=513671&r1=513670&r2=513671
==============================================================================
--- portals/jetspeed-2/trunk/installer/maven.xml (original)
+++ portals/jetspeed-2/trunk/installer/maven.xml Fri Mar  2 01:12:10 2007
@@ -36,11 +36,12 @@
     <attainGoal name="clean" />
 
     <mkdir dir="${basedir}/resources" />
+<!--
     <get usetimestamp="true" dest="${basedir}/resources/tomcat-5.5.20.zip"
       src="http://www.bluesunrise.com/maven/tomcat/dist/tomcat-5.5.20.zip" />
     <get usetimestamp="true" dest="${basedir}/resources/tomcat-5.5.20-compat.zip"
       src="http://www.bluesunrise.com/maven/tomcat/dist/tomcat-5.5.20-compat.zip" />
-
+-->
     <unzip src="${basedir}/resources/tomcat-5.5.20.zip" dest="${maven.build.dir}/tomcat" />
     <unzip src="${basedir}/resources/tomcat-5.5.20-compat.zip" dest="${maven.build.dir}/tomcat-compat" />
 
@@ -50,7 +51,8 @@
       <fileset dir="${basedir}/etc/tomcat" />
     </copy>
 
-    <mkdir dir="${maven.build.dir}/tomcat/webapps/jetspeed" />
+    <j:set var="maven.war.build.dir" value="${maven.build.dir}/tomcat/webapps"/>
+    <attainGoal name="war:webapp"/>
 
     <attainGoal name="j2:portal.copy.webapp" />
     <attainGoal name="j2:portal.conf.ojb" />
@@ -61,15 +63,7 @@
     </move>
 
     <mkdir dir="${maven.build.dir}/database" />
-    <copy todir="${maven.build.dir}/database/lib">
-      <fileset dir="${maven.repo.local}/tyrex/jars/">
-        <include name="tyrex-1.0.1.jar" />
-      </fileset>
-      <fileset dir="${maven.repo.local}/${org.apache.jetspeed.portal.groupId}/jars/">
-        <include name="ant-tasks-${jetspeed.version}.jar" />
-      </fileset>
-    </copy>
-
+    
     <copy file="${basedir}/../etc/sql/drop.sql" todir="${maven.build.dir}/database" />
     <copy todir="${maven.build.dir}/database/derby">
       <fileset dir="${basedir}/../etc/sql/derby/schema" />
@@ -141,45 +135,58 @@
       </j:otherwise>
     </j:choose>
 
-    <zip file="${maven.build.dir}/installpack.zip">
-      <zipfileset dir="${maven.build.dir}/tomcat" prefix="portal" excludes="shared/lib/derby*" />
-      <zipfileset dir="${maven.build.dir}/tomcat-compat" prefix="jdk14" />
-      <zipfileset dir="${maven.build.dir}/database" prefix="database" />
-    </zip>
+    <copy todir="${maven.build.dir}/database/lib">
+      <fileset dir="${maven.repo.local}/tyrex/jars/">
+        <include name="tyrex-1.0.1.jar" />
+      </fileset>
+      <fileset dir="${maven.repo.local}/${org.apache.jetspeed.portal.groupId}/jars/">
+        <include name="ant-tasks-${jetspeed.version}.jar" />
+      </fileset>
+      <fileset dir="${maven.build.dir}/tomcat/shared/lib/" includes="derby-*.jar"/>
+    </copy>
 
     <j:choose>
       <j:when test="${build_type=='minimal'}">
         <j:set var="build_name" value="" />
+        <copy file="${basedir}/etc/ant-installer/antinstall-config.xml" todir="${maven.build.dir}"/>
       </j:when>
       <j:otherwise>
         <j:set var="build_name" value="-demo" />
+        <copy file="${basedir}/etc/ant-installer/antinstall-config-demo.xml" tofile="${maven.build.dir}/antinstall-config.xml"/>
       </j:otherwise>
     </j:choose>
 
+    <zip file="${maven.build.dir}/portal.zip">
+      <zipfileset dir="${maven.build.dir}/tomcat" excludes="shared/lib/derby*"/>
+    </zip>
+    <zip file="${maven.build.dir}/tomcat-compat.zip">
+      <zipfileset dir="${maven.build.dir}/tomcat-compat"/>
+    </zip>
+    <zip file="${maven.build.dir}/database.zip">
+      <zipfileset dir="${maven.build.dir}/database" prefix="database" />
+      <zipfileset dir="${basedir}/etc/database" prefix="database" />
+    </zip>
+    
     <jar file="${maven.build.dir}/jetspeed-${jetspeed.version}${build_name}-installer.jar" compress="true">
       <manifest>
         <attribute name="Manifest-Version" value="1.0" />
-        <attribute name="Main-Class" value="org.tp23.antinstaller.selfextract.SelfExtractor" />
-        <attribute name="Look-And-Feel" value="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel" />
+        <attribute name="Main-Class" value="org.tp23.antinstaller.selfextract.NonExtractor" />
       </manifest>
       <zipgroupfileset dir="${basedir}/etc/ant-installer/lib" includes="*.jar" />
+      <zipgroupfileset dir="${maven.repo.local}/${org.apache.jetspeed.portal.groupId}/jars/" includes="ant-tasks-${jetspeed.version}.jar"/>
       <fileset dir="${basedir}/etc/ant-installer">
         <include name="resources/*" prefix="resources" />
         <include name="license/*" />
         <include name="build.xml" />
-        <include name="$antinstall-config{build_name}.xml" />
-      </fileset>
-      <fileset dir="${maven.build.dir}/tomcat/shared/lib">
-        <include name="derby*" />
-      </fileset>
-      <fileset dir="${maven.build.dir}">
-        <include name="installpack.zip" />
       </fileset>
+      <fileset file="${maven.build.dir}/antinstall-config.xml"/>
       <fileset dir="${basedir}/..">
         <include name="LICENSE.TXT" />
       </fileset>
+      <fileset file="${maven.build.dir}/portal.zip"/>
+      <fileset file="${maven.build.dir}/tomcat-compat.zip"/>
+      <fileset file="${maven.build.dir}/database.zip"/>
     </jar>
-
   </goal>
 
   <goal name="build">



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message