svnno****@sourc*****
svnno****@sourc*****
2007年 11月 30日 (金) 07:16:26 JST
Revision: 732
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=732
Author: shinsuke
Date: 2007-11-30 07:16:26 +0900 (Fri, 30 Nov 2007)
Log Message:
-----------
updated installer.
Modified Paths:
--------------
pal-portal/trunk/installer/build.xml
pal-portal/trunk/installer/etc/ant-installer/antinstall-config.xml
pal-portal/trunk/installer/etc/ant-installer/build.xml
pal-portal/trunk/installer/etc/ant-installer/lib/ant-installer.jar
pal-portal/trunk/installer/etc/database/build.xml
pal-portal/trunk/installer/maven.xml
Added Paths:
-----------
pal-portal/trunk/installer/etc/ant-installer/resources/icon.png
pal-portal/trunk/installer/etc/ant-installer/resources/logo.gif
pal-portal/trunk/installer/etc/portal/
pal-portal/trunk/installer/etc/portal/temp/
pal-portal/trunk/installer/etc/tomcat/temp/index.jsp
Removed Paths:
-------------
pal-portal/trunk/installer/etc/ant-installer/resources/feather-small.png
pal-portal/trunk/installer/etc/ant-installer/resources/palportal.gif
pal-portal/trunk/installer/etc/tomcat/temp/administration.xml
pal-portal/trunk/installer/etc/tomcat/webapps/ROOT/index.jsp
-------------- next part --------------
Modified: pal-portal/trunk/installer/build.xml
===================================================================
--- pal-portal/trunk/installer/build.xml 2007-11-29 22:15:42 UTC (rev 731)
+++ pal-portal/trunk/installer/build.xml 2007-11-29 22:16:26 UTC (rev 732)
@@ -59,15 +59,5 @@
</exec>
</target>
- <target name="build.installer.without.tomcat"
- description="--> Build Installer">
- <exec
- executable="${shell.cmd}"
- failonerror="true"
- dir="${installer.dir}"
- >
- <arg line="${shell.options} 'maven ${jetspeed2.installer.options} build.without.tomcat'"/>
- </exec>
- </target>
</project>
Modified: pal-portal/trunk/installer/etc/ant-installer/antinstall-config.xml
===================================================================
--- pal-portal/trunk/installer/etc/ant-installer/antinstall-config.xml 2007-11-29 22:15:42 UTC (rev 731)
+++ pal-portal/trunk/installer/etc/ant-installer/antinstall-config.xml 2007-11-29 22:16:26 UTC (rev 732)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
- Copyright 2004 The Apache Software Foundation
+ Copyright 2005-2007 Portal Application Laboratory
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,240 +13,206 @@
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: antinstall-config.xml,v 1.2 2007/03/11 14:16:31 shinsuke Exp $
-->
-<!-- JS2-657: Installer fails with firewall
-
- <!DOCTYPE installer PUBLIC "-//tp23 //DTD Ant Installer Config//EN"
- "http://antinstaller.sourceforge.net/dtd/antinstall-config-0.8.dtd">
--->
-
-
-<installer ui="swing,text" verbose="true" lookAndFeel="jgoodies" name="PAL Portal Installer"
- windowIcon="/resources/feather-small.png" defaultImageResource="/resources/palportal.gif" minJavaVersion="1.5"
- wide="700:250" antialiased="true">
-
- <page type="input" name="intro" displayText="Welcome to the PAL Portal">
- <comment displayText="" />
- <comment displayText="This installer will guide you through setting up the PAL Portal." />
+<installer ui="swing,text" verbose="true" lookAndFeel="native" name="@PORTAL_NAME@ Installer" windowIcon="/resources/icon.png" defaultImageResource="/resources/logo.gif" minJavaVersion="1.5" wide="700:200" antialiased="true">
+<!-- Welcome Page -->
+ <page type="input" name="intro" displayText="Welcome to the @PORTAL_NAME@">
+ <comment displayText=""/>
+ <comment displayText="This installer will guide you through setting up the @PORTAL_NAME ＠ ."/>
+ <hidden property="portalContext" value="@PORTAL_CONTEXT@"/>
+ <hidden property="mailServer" value="localhost"/>
+ <hidden property="msUsername" value=""/>
+ <hidden property="msPassword" value=""/>
+ <hidden property="msAuth" value="false"/>
</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}/PALPortal"
- defaultValueWin="C:\Apache\PALPortal" displayText="Select an installation directory" create="true"
- checkExists="true" />
+<!-- License -->
+ <page type="license" name="license" displayText="License Conditions" resource="/LICENSE.TXT"/>
+<!-- Install or Upgrade -->
+ <page type="input" name="installationSelection" displayText="Installation selection">
+ <comment displayText="Please select the installation type."/>
+ <select property="installType" displayText="Installation type" defaultValue="new">
+ <option text="New Installation" value="new"/>
+ <option text="Upgrade Installation" value="upgrade"/>
+ </select>
+ </page>
+<!-- Installation Location -->
+ <page type="input" name="properties" displayText="Installation Location">
+ <directory property="installDir" defaultValue="${java.user.home}/Portal" defaultValueWin="C:\Apache\Portal" displayText="Select an installation directory" create="true" checkExists="true"/>
<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="PAL Portal" bold="true" />
- <target displayText="Tomcat 5.5.20 Webserver" target="install" defaultValue="true" force="true" />
- <checkbox displayText="PAL 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" />
- <target displayText="Mail Server Configuration" target="mailServerConfiguration"
- defaultValue="true" force="true"/>
- <checkbox displayText="Store PSML in the database?" property="dbImportPsml" defaultValue="false" force="true" />
+<!-- Components For New Installation -->
+ <page type="input" name="requiredComponents" displayText="Components Selection" ifProperty="${installType}=new">
+ <comment displayText="@PORTAL_NAME@" bold="true"/>
+ <target displayText="Tomcat 5.5.23" target="install.tomcat" defaultValue="true"/>
+ <target displayText="@PORTAL_NAME@" target="install.portal" defaultValue="true" force="true"/>
+ <target displayText="@PORTAL_NAME@ Configration for Tomcat" target="install.tomcat.config" defaultValue="true"/>
+ <target displayText="Mail Server Configuration" target="mailServerConfiguration" defaultValue="true"/>
+ <checkbox displayText="DB Configuration" property="dummy" defaultValue="true" force="true"/>
+ <checkbox displayText="Store PSML in DB" property="dbImportPsml" defaultValue="false" force="true"/>
</page>
-
- <!-- Mail Server Configuration -->
- <page type="input" name="mailServerConfig" displayText="Mail Server Configuration">
- <comment
- displayText="Please fill in the fields below with the approriate mail server information. The default values should work"/>
-
+<!-- Components For Upgrade Installation -->
+ <page type="input" name="requiredUpgradeComponents" displayText="Components Selection" ifProperty="${installType}=upgrade">
+ <comment displayText="@PORTAL_NAME@" bold="true"/>
+ <text property="portalContext" displayText="Portal Context" defaultValue="@PORTAL_CONTEXT@"/>
+ <target displayText="@PORTAL_NAME@" target="upgrade.portal" defaultValue="true" force="true"/>
+ <target displayText="Portlets" target="upgrade.portlets" defaultValue="true"/>
+ <target displayText="Not Update PSML Files" target="use.old.pages" defaultValue="true"/>
+ <target displayText="Not Update Configuration files" target="use.old.conf" defaultValue="true"/>
+ <target displayText="Not Update Component files" target="use.old.assembly" defaultValue="true"/>
+ <target displayText="Not Update Decorator files" target="use.old.decorations" defaultValue="true"/>
+ <target displayText="Clean up" target="clean.up.upgrade" defaultValue="true" force="true"/>
+ </page>
+<!-- Mail Server Configuration -->
+ <page type="input" name="mailServerConfig" displayText="Mail Server Configuration" ifProperty="(${mailServerConfiguration}=true) AND (${installType}=new)">
+ <comment displayText="Please fill in the fields below with the approriate mail server information. The default values should work"/>
<text property="mailServer" displayText="Mail server name" defaultValue="localhost"/>
<text property="msUsername" displayText="User name"/>
<text property="msPassword" displayText="Password"/>
<checkbox property="msAuth" displayText="User authentication" defaultValue="false"/>
</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" />
+<!-- DB Configuration -->
+ <page type="input" name="databaseSelection" displayText="Database Selection" ifProperty="(${installType}=new)">
+ <hidden property="checkdb" value="false"/>
+ <hidden property="dbvalid" value="false"/>
+ <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." />
+ <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" />
- <option text="Derby" value="derby" />
- <option text="MSSQL" 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" />
+ <option text="DB2" value="db2"/>
+ <option text="Derby" value="derby"/>
+ <option text="MSSQL" 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="mysql" displayText="MySQL Database connection parameters" ifProperty="${dbName}=mysql">
- <hidden property="checkdb" value="true" />
- <hidden property="dbvalid" value="false" />
+<!-- MySQL Configuration -->
+ <page type="input" name="mysql" displayText="MySQL Database Connection Parameters" ifProperty="(${dbName}=mysql) AND (${installType}=new)">
+ <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/<dbname>" />
- <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" />
+ <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/<dbname>"/>
+ <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" />
+<!-- Postgres Configuration -->
+ <page type="input" name="postgres" displayText="PostgreSQL Database Connection Parameters" ifProperty="(${dbName}=postgres) AND (${installType}=new)">
+ <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/<dbname>" />
- <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" />
+ <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/<dbname>"/>
+ <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" />
+<!-- SAPDB Configuration -->
+ <page type="input" name="sapdb" displayText="SapDB Database Connection Parameters" ifProperty="(${dbName}=sapdb) AND (${installType}=new)">
+ <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/<dbname>" />
- <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" />
+ <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/<dbname>"/>
+ <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" />
+<!-- Oracle Configuration -->
+ <page type="input" name="oracle" displayText="Oracle Database Connection Parameters" ifProperty="(${dbName}=oracle) AND (${installType}=new)">
+ <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:<instance>" />
- <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" />
+ <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:<instance>"/>
+ <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" />
+<!-- MSSQL Configuration -->
+ <page type="input" name="mssql" displayText="Microsoft SQL Server Connection Parameters" ifProperty="(${dbName}=mssql) AND (${installType}=new)">
+ <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/<dbname>" />
- <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" />
+ <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/<dbname>"/>
+ <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" />
+<!-- DB2 Configuration -->
+ <page type="input" name="db2" displayText="DB2 Database Connection Parameters" ifProperty="(${dbName}=db2) AND (${installType}=new)">
+ <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/<dbname>" />
- <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" />
+ <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/<dbname>"/>
+ <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="setupDBAntTarget" value="runSetupDB" />
- <comment displayText="Press Next to test the database connection ..." />
+<!-- Check DB Configuration -->
+ <page type="input" name="preDBCheck" displayText="Testing Database Connection" ifProperty="(${checkdb}=true) AND (${dbvalid}=false) AND (${installType}=new)" 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="setupDBAntTarget" value="runSetupDB"/>
+ <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="setupDBAntTarget" value="setupNoDB" />
-
- <comment displayText="Please go back and specify the correct database configurtion parameters." bold="true" />
- <comment displayText="" />
+<!-- Failed DB Configuration -->
+ <page type="input" name="dbCheckFailed" displayText="Connection to Database Failed" ifProperty="(${checkdb}=true) AND (${dbvalid}=false) AND (${installType}=new)">
+ <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=""/>
<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)">
- <hidden property="db.username" value="" />
- <hidden property="db.password" value="" />
- <hidden property="jdbc.url" value="" />
- <hidden property="jdbc.driver.class" value="" />
- <hidden property="jdbc.driver.jar" value="" />
- <hidden property="setupDBAntTarget" value="setupNoDB" />
- <comment displayText="PAL Portal will be installed without yet an configured database to:" bold="true"/>
+<!-- Before Installation -->
+ <page type="input" name="beforeInstall" displayText="Before Your Install ..." ifProperty="(${setupDBAntTarget}=setupNoDB) AND (${installType}=new)">
+ <hidden property="db.username" value=""/>
+ <hidden property="db.password" value=""/>
+ <hidden property="jdbc.url" value=""/>
+ <hidden property="jdbc.driver.class" value=""/>
+ <hidden property="jdbc.driver.jar" value=""/>
+ <hidden property="setupDBAntTarget" value="setupNoDB"/>
+ <comment displayText="@PORTAL_NAME@ will be installed without yet an configured database to:" bold="true"/>
<comment displayText=" ${installDir}"/>
- <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." />
- <comment displayText="The database configuration must be defined in a database.properties" />
- <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">
- <comment displayText="PAL Portal will be installed using a ${dbDisplayName} database to:" bold="true"/>
+<!-- Before Installation -->
+ <page type="input" name="beforeInstall" displayText="Before Your Install ..." ifProperty="(${dbName}=manual) AND (${installType}=new)">
+ <hidden property="db.username" value=""/>
+ <hidden property="db.password" value=""/>
+ <hidden property="jdbc.url" value=""/>
+ <hidden property="jdbc.driver.class" value=""/>
+ <hidden property="jdbc.driver.jar" value=""/>
+ <hidden property="setupDBAntTarget" value="setupNoDB"/>
+ <comment displayText="@PORTAL_NAME@ will be installed without yet an configured database to:" bold="true"/>
<comment displayText=" ${installDir}"/>
- <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"/>
- <comment displayText="provided within the installation database directory." />
- <comment displayText="The database configuration is defined in the database.properties" />
- <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" />
-
+<!-- Before Installation -->
+ <page type="input" name="beforeInstall" displayText="Before Your Install ..." ifProperty="(${setupDBAntTarget}=runSetupDB) AND (${installType}=new)">
+ <comment displayText="@PORTAL_NAME@ will be installed using a ${dbDisplayName} database to:" bold="true"/>
+ <comment displayText=" ${installDir}"/>
+ </page>
+<!-- Before Upgrade Installation -->
+ <page type="input" name="beforeUpgrade" displayText="Before Your Upgrade..." ifProperty="(${installType}=upgrade)">
+ <comment displayText="@PORTAL_NAME@ will be upgraded:" bold="true"/>
+ <comment displayText=" ${installDir}"/>
+ </page>
+<!-- Installing -->
+ <page type="progress" name="progress" displayText="Installation Progress"/>
</installer>
Modified: pal-portal/trunk/installer/etc/ant-installer/build.xml
===================================================================
--- pal-portal/trunk/installer/etc/ant-installer/build.xml 2007-11-29 22:15:42 UTC (rev 731)
+++ pal-portal/trunk/installer/etc/ant-installer/build.xml 2007-11-29 22:16:26 UTC (rev 732)
@@ -1,5 +1,6 @@
+<?xml version="1.0"?>
<!--
- Copyright 2004 The Apache Software Foundation
+ Copyright 2005-2007 Portal Application Laboratory
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -12,35 +13,57 @@
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: build.xml,v 1.2 2007/03/11 14:16:31 shinsuke Exp $
-->
-<project name="JetspeedInstaller" default="install" basedir=".">
-
- <taskdef name="checkConnection" classname="org.apache.jetspeed.anttasks.AntInstallerCheckConnection" />
-
- <property file="ant.install.properties" />
-
- <target name="install">
- <echo>Starting the installation</echo>
-
- <condition property="jdk15Installed">
- <equals arg1="${ant.java.version}" arg2="1.5" />
- </condition>
-
- <echo>Deleting all content from the installation target directory</echo>
-<!--
- <delete includeemptydirs="true">
- <fileset dir="${installDir}" includes="**/*"/>
+<project name="Installer" basedir=".">
+ <taskdef name="checkConnection" classname="org.apache.jetspeed.anttasks.AntInstallerCheckConnection"/>
+ <property file="ant.install.properties"/>
+<!-- Install Tomcat -->
+ <target name="install.tomcat">
+ <echo>Installing Tomcat</echo>
+ <unzip src="${antinstaller.jar}" dest="${installDir}" overwrite="false">
+ <patternset>
+ <include name="tomcat.zip"/>
+ </patternset>
+ </unzip>
+ <unzip dest="${installDir}" overwrite="false">
+ <fileset dir="${installDir}" includes="*.zip"/>
+ </unzip>
+ <delete>
+ <fileset dir="${installDir}" includes="*.zip"/>
</delete>
--->
-
- <echo>Installing PAL Portal</echo>
+ <chmod perm="700" dir="${installDir}/bin" includes="**/*.sh"/>
+ </target>
+<!-- Install Portal Configuration for Tomcat -->
+ <target name="install.tomcat.config">
+ <echo>Installing Portal Configuration for Tomcat</echo>
+ <unzip src="${antinstaller.jar}" dest="${installDir}" overwrite="true">
+ <patternset>
+ <include name="tomcat-config.zip"/>
+ </patternset>
+ </unzip>
+ <unzip dest="${installDir}" overwrite="false">
+ <fileset dir="${installDir}" includes="*.zip"/>
+ </unzip>
+ <delete>
+ <fileset dir="${installDir}" includes="*.zip"/>
+ </delete>
+ <chmod perm="700" dir="${installDir}/bin" includes="**/*.sh"/>
+ <echo>Copying index.jsp</echo>
+ <copy file="${installDir}/temp/index.jsp" tofile="${installDir}/webapps/ROOT/index.jsp" overwrite="true">
+ <filterset begintoken="@" endtoken="@">
+ <filter token="PORTAL_CONTEXT" value="${portalContext}"/>
+ </filterset>
+ </copy>
+ <delete file="${installDir}/temp/index.jsp" failonerror="false"/>
+ </target>
+<!-- Install Portal -->
+ <target name="install.portal">
+ <echo>Installing Portal</echo>
+<!-- Unzip Portal -->
<unzip src="${antinstaller.jar}" dest="${installDir}" overwrite="false">
<patternset>
- <include name="portal.zip" />
- <include name="database.zip" />
- <include name="tomcat-compat.zip" unless="jdk15Installed" />
+ <include name="portal.zip"/>
+ <include name="database.zip"/>
</patternset>
</unzip>
<unzip dest="${installDir}" overwrite="false">
@@ -49,44 +72,50 @@
<delete>
<fileset dir="${installDir}" includes="*.zip"/>
</delete>
- <chmod perm="700" dir="${installDir}/bin" includes="**/*.sh" />
-
+<!-- Unzip portlets -->
+ <unzip src="${antinstaller.jar}" dest="${installDir}" overwrite="false">
+ <patternset>
+ <include name="portlets.zip"/>
+ </patternset>
+ </unzip>
+ <unzip dest="${installDir}/webapps/${portalContext}/WEB-INF/deploy" overwrite="false">
+ <fileset dir="${installDir}" includes="*.zip"/>
+ </unzip>
+ <delete>
+ <fileset dir="${installDir}" includes="*.zip"/>
+ </delete>
<echo>Setting up the database configuration</echo>
<condition property="jdbcjar" value="${installDir}/database/lib/derby-10.1.1.0.jar">
- <equals arg1="${jdbc.driver.jar}" arg2="" />
+ <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">
+ <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}" />
- <filter token="dbImportPsml" value="${dbImportPsml}" />
+ <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}"/>
+ <filter token="dbImportPsml" value="${dbImportPsml}"/>
</filterset>
</move>
<echo>Setting up the Jetspeed database (if selected)</echo>
- <ant antfile="${installDir}/database/build.xml" target="${setupDBAntTarget}" dir="${installDir}/database" />
+ <ant antfile="${installDir}/database/build.xml" target="${setupDBAntTarget}" dir="${installDir}/database"/>
</target>
-
+<!-- Check DB -->
<target name="antinstaller-checkdb" depends="">
-
<checkConnection driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}" password="${dbPassword}">
<classpath>
- <pathelement location="${jdbcDriverJar}" />
+ <pathelement location="${jdbcDriverJar}"/>
</classpath>
</checkConnection>
- <antinstaller-property name="dbvalid" value="true" />
+ <antinstaller-property name="dbvalid" value="true"/>
</target>
-
+<!-- Mail Server Configuration -->
<target name="mailServerConfiguration">
<echo>starting Mail server configuration</echo>
- <copy file="${installDir}/temp/administration.xml"
- tofile="${installDir}/webapps/palportal/WEB-INF/assembly/administration.xml" overwrite="true">
+ <copy file="${installDir}/temp/administration.xml" tofile="${installDir}/webapps/${portalContext}/WEB-INF/assembly/administration.xml" overwrite="true">
<filterset begintoken="@" endtoken="@">
<filter token="MAIL_SERVER" value="${mailServer}"/>
<filter token="MAIL_USERNAME" value="${msUsername}"/>
@@ -97,5 +126,120 @@
<delete file="${installDir}/temp/administration.xml" failonerror="false"/>
<echo>Mail server configuration done!</echo>
</target>
-
+<!-- Upgrade Portal -->
+ <target name="upgrade.portal" description="--> Upgrade Portal and Portlets">
+ <echo>Upgrade Portal</echo>
+<!-- Portal Dir -->
+ <available file="${installDir}" type="dir" property="installed.portal.present"/>
+ <condition property="installed.portal.emty">
+ <equals arg1="" arg2="${installDir}"/>
+ </condition>
+ <fail if="installed.portal.emty">The path is empty..</fail>
+ <fail unless="installed.portal.present">Portal does not exist.</fail>
+<!-- Unzip portal -->
+ <mkdir dir="${installDir}/temp/upgrade-portal"/>
+ <unzip src="${antinstaller.jar}" dest="${installDir}/temp/upgrade-portal" overwrite="false">
+ <patternset>
+ <include name="portal.zip"/>
+ </patternset>
+ </unzip>
+ <unzip dest="${installDir}/temp/upgrade-portal" overwrite="false">
+ <fileset dir="${installDir}/temp/upgrade-portal" includes="*.zip"/>
+ </unzip>
+ <delete>
+ <fileset dir="${installDir}/temp/upgrade-portal" includes="*.zip"/>
+ </delete>
+<!-- Delete Shared Jar Files -->
+ <delete>
+ <fileset dir="${installDir}/shared/lib/">
+ <include name="jetspeed*"/>
+ <include name="portlet*"/>
+ <include name="portals*"/>
+ <include name="derby*"/>
+ <include name="pluto*"/>
+ </fileset>
+ </delete>
+<!-- Copy Shared Jar Files -->
+ <copy todir="${installDir}/shared/lib/">
+ <fileset dir="${installDir}/temp/upgrade-portal/shared/lib/">
+ <include name="*.jar"/>
+ </fileset>
+ </copy>
+<!-- Delete Portal Jar Files -->
+ <delete>
+ <fileset dir="${installDir}/webapps/${portalContext}/WEB-INF/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </delete>
+<!-- Move pages -->
+ <move todir="${installDir}/webapps/${portalContext}/WEB-INF/pages.orig">
+ <fileset dir="${installDir}/webapps/${portalContext}/WEB-INF/pages"/>
+ </move>
+<!-- Move conf -->
+ <move todir="${installDir}/webapps/${portalContext}/WEB-INF/conf.orig">
+ <fileset dir="${installDir}/webapps/${portalContext}/WEB-INF/conf"/>
+ </move>
+<!-- Move assembly -->
+ <move todir="${installDir}/webapps/${portalContext}/WEB-INF/assembly.orig">
+ <fileset dir="${installDir}/webapps/${portalContext}/WEB-INF/assembly"/>
+ </move>
+<!-- Move decorations -->
+ <move todir="${installDir}/webapps/${portalContext}/decorations.orig">
+ <fileset dir="${installDir}/webapps/${portalContext}/decorations"/>
+ </move>
+<!-- Copy Portal Files -->
+ <copy todir="${installDir}/webapps/${portalContext}">
+ <fileset dir="${installDir}/temp/upgrade-portal/webapps/${portalContext}">
+ <include name="**"/>
+ </fileset>
+ </copy>
+<!-- Copy j2-admin TODO remove -->
+ <copy file="${installDir}/temp/upgrade-portal/webapps/j2-admin.war" todir="${installDir}/webapps/"/>
+<!-- Clean up -->
+ </target>
+ <target name="upgrade.portlets">
+<!-- Unzip portlets -->
+ <unzip src="${antinstaller.jar}" dest="${installDir}" overwrite="false">
+ <patternset>
+ <include name="portlets.zip"/>
+ </patternset>
+ </unzip>
+ <unzip dest="${installDir}/webapps/${portalContext}/WEB-INF/deploy" overwrite="false">
+ <fileset dir="${installDir}" includes="*.zip"/>
+ </unzip>
+ <delete>
+ <fileset dir="${installDir}" includes="*.zip"/>
+ </delete>
+ </target>
+ <target name="use.old.pages">
+ <delete dir="${installDir}/webapps/${portalContext}/WEB-INF/pages"/>
+ <move todir="${installDir}/webapps/${portalContext}/WEB-INF/pages">
+ <fileset dir="${installDir}/webapps/${portalContext}/WEB-INF/pages.orig"/>
+ </move>
+ </target>
+ <target name="use.old.conf">
+ <delete dir="${installDir}/webapps/${portalContext}/WEB-INF/conf"/>
+ <move todir="${installDir}/webapps/${portalContext}/WEB-INF/conf">
+ <fileset dir="${installDir}/webapps/${portalContext}/WEB-INF/conf.orig"/>
+ </move>
+ </target>
+ <target name="use.old.assembly">
+ <delete dir="${installDir}/webapps/${portalContext}/WEB-INF/assembly"/>
+ <move todir="${installDir}/webapps/${portalContext}/WEB-INF/assembly">
+ <fileset dir="${installDir}/webapps/${portalContext}/WEB-INF/assembly.orig"/>
+ </move>
+ </target>
+ <target name="use.old.decorations">
+ <delete dir="${installDir}/webapps/${portalContext}/decorations"/>
+ <move todir="${installDir}/webapps/${portalContext}/decorations">
+ <fileset dir="${installDir}/webapps/${portalContext}/decorations.orig"/>
+ </move>
+ </target>
+ <target name="clean.up.upgrade">
+ <delete dir="${installDir}/webapps/${portalContext}/WEB-INF/pages.orig"/>
+ <delete dir="${installDir}/webapps/${portalContext}/WEB-INF/conf.orig"/>
+ <delete dir="${installDir}/webapps/${portalContext}/WEB-INF/assembly.orig"/>
+ <delete dir="${installDir}/webapps/${portalContext}/decorations.orig"/>
+ <delete dir="${installDir}/temp/upgrade-portal"/>
+ </target>
</project>
Modified: pal-portal/trunk/installer/etc/ant-installer/lib/ant-installer.jar
===================================================================
(Binary files differ)
Deleted: pal-portal/trunk/installer/etc/ant-installer/resources/feather-small.png
===================================================================
(Binary files differ)
Copied: pal-portal/trunk/installer/etc/ant-installer/resources/icon.png (from rev 729, pal-portal/trunk/installer/etc/ant-installer/resources/feather-small.png)
Copied: pal-portal/trunk/installer/etc/ant-installer/resources/logo.gif (from rev 729, pal-portal/trunk/installer/etc/ant-installer/resources/palportal.gif)
Deleted: pal-portal/trunk/installer/etc/ant-installer/resources/palportal.gif
===================================================================
(Binary files differ)
Modified: pal-portal/trunk/installer/etc/database/build.xml
===================================================================
--- pal-portal/trunk/installer/etc/database/build.xml 2007-11-29 22:15:42 UTC (rev 731)
+++ pal-portal/trunk/installer/etc/database/build.xml 2007-11-29 22:16:26 UTC (rev 732)
@@ -1,10 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2004 The Apache Software Foundation
+ 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
- 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
@@ -13,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
- $Id: build.xml,v 1.1 2007/03/10 01:16:10 shinsuke Exp $
+ $Id: build.xml 593555 2007-11-09 15:15:34Z woonsan $
-->
<project name="JetspeedDatabaseSetup" default="setupDB" basedir=".">
@@ -64,7 +66,7 @@
</target>
<target name="setupNoDB">
- <antcall target="setupDBPSML"/>
+ <antcall target="setupDBPSML"/>
</target>
<target name="checkInput" unless="failSetup">
@@ -72,12 +74,12 @@
</target>
<target name='setupDBPSML'>
- <copy file="${installDir}/webapps/${portalName}/WEB-INF/assembly/page-manager.xml" tofile="${installDir}/webapps/${portalName}/WEB-INF/assembly/alternate/fs-page-manager.xml"/>
- </target>
-
+ <copy file="${basedir}/../webapps/${portalName}/WEB-INF/assembly/page-manager.xml" tofile="${basedir}/../webapps/${portalName}/WEB-INF/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" />
@@ -183,7 +185,6 @@
<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>
@@ -195,6 +196,7 @@
<include name="request-context.xml" />
<include name="db-page-manager.xml" />
<include name="interceptors.xml" />
+ <include name="seed-registry.xml" />
</fileset>
</copy>
Copied: pal-portal/trunk/installer/etc/portal/temp (from rev 729, pal-portal/trunk/installer/etc/tomcat/temp)
Deleted: pal-portal/trunk/installer/etc/tomcat/temp/administration.xml
===================================================================
--- pal-portal/trunk/installer/etc/tomcat/temp/administration.xml 2007-11-29 22:15:42 UTC (rev 731)
+++ pal-portal/trunk/installer/etc/tomcat/temp/administration.xml 2007-11-29 22:16:26 UTC (rev 732)
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<beans>
- <bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
- <property name="host"><value>@MAIL_SERVER@</value></property>
- <property name="username"><value>@MAIL_USERNAME@</value></property>
- <property name="password"><value>@MAIL_PASSWORD@</value></property>
- <property name="javaMailProperties">
- <props>
- <prop key="mail.smtp.auth">@MAIL_AUTH@</prop>
- </props>
- </property>
- </bean>
-
-<bean id="adminVelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
- <property name="resourceLoaderPath"><value>/WEB-INF/templates/</value></property>
- <property name="velocityProperties">
- <props>
- <!-- use webapp-logging CommonsLoggingLog4JLogSystem for logging through IsolatedLog4JLogger -->
- <prop key="runtime.log.logsystem.class">org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem</prop>
- <prop key="runtime.log.logsystem.log4j.category">velocity</prop>
- <!-- clear out default global VM_global_library.vm leading to ERROR logging because its not available -->
- <prop key="velocimacro.library"></prop>
- </props>
- </property>
- <!-- use our own CommonsLoggingLog4JLogSystem specified above, not the default one provided by Spring -->
- <property name="overrideLogging"><value>false</value></property>
-</bean>
-
-<bean id='PortalAdministrationImpl' init-method="start"
- class='org.apache.jetspeed.administration.PortalAdministrationImpl'>
- <constructor-arg index='0'>
- <ref bean="org.apache.jetspeed.security.UserManager"/>
- </constructor-arg>
- <constructor-arg index='1'>
- <ref bean="org.apache.jetspeed.security.RoleManager"/>
- </constructor-arg>
- <constructor-arg index='2'>
- <ref bean="org.apache.jetspeed.security.GroupManager"/>
- </constructor-arg>
- <constructor-arg index='3'>
- <ref bean="org.apache.jetspeed.page.PageManager"/>
- </constructor-arg>
- <constructor-arg index='4'>
- <ref bean="org.apache.jetspeed.prefs.PreferencesProvider"/>
- </constructor-arg>
- <constructor-arg index='5'>
- <ref bean="org.apache.jetspeed.profiler.Profiler"/>
- </constructor-arg>
- <constructor-arg index='6'>
- <ref bean="mailSender"/>
- </constructor-arg>
- <constructor-arg index='7'>
- <ref bean="adminVelocityEngine"/>
- </constructor-arg>
-</bean>
-
-<bean id="PortalAdministration" parent="baseTransactionProxy">
- <property name="proxyInterfaces">
- <value>org.apache.jetspeed.administration.PortalAdministration</value>
- </property>
-
- <property name="target">
- <ref bean="PortalAdministrationImpl" />
- </property>
- <property name="transactionAttributes">
- <props>
- <prop key="register*">PROPAGATION_REQUIRED,-org.apache.jetspeed.administration.RegistrationException</prop>
- </props>
- </property>
-</bean>
-
-<bean id="org.apache.jetspeed.security.SecurityAccessController"
- class='org.apache.jetspeed.security.impl.SecurityAccessControllerImpl'>
- <constructor-arg index='0'>
- <ref bean="org.apache.jetspeed.page.PageManager"/>
- </constructor-arg>
- <!--
- Security Mode:
- 1 = Permissions = use Jetspeed Java Security Policy
- 2 = Constraints = use Jetspeed (PageManager) Constraint-based Security
- -->
- <constructor-arg index="1">
- <value>2</value>
- </constructor-arg>
-</bean>
-
-<bean id='org.apache.jetspeed.administration.PortalAuthenticationConfiguration'
- class='org.apache.jetspeed.administration.PortalAuthenticationConfigurationImpl'>
-
- <!-- create new session upon authentication -->
- <constructor-arg index='0'>
- <value>false</value>
- </constructor-arg>
- <!-- hard session timeout limit in seconds, regardless of (in)activity, setting to 0 turns off this feature
- note:this feature should be used with 'create new session upon authentication' feature
- -->
- <constructor-arg index='1'>
- <value>0</value>
- </constructor-arg>
- <!-- redirect location for hard session expiration -->
- <constructor-arg index='2'>
- <value>/login/logout</value>
- </constructor-arg>
-</bean>
-
-<bean id='org.apache.jetspeed.security.activeauthentication.ActiveAuthenticationIdentityProvider'
- class='org.apache.jetspeed.security.activeauthentication.ActiveAuthenticationIdentityProviderImpl'>
- <constructor-arg index="0">
- <ref bean="activeAuthenticationCache" />
- </constructor-arg>
- <!-- list of session attribute names that should be saved and restored upon authentication events -->
- <constructor-arg>
- <list>
- <value>org.apache.jetspeed.login.username</value>
- <value>org.apache.jetspeed.login.password</value>
- <value>org.apache.jetspeed.login.destination</value>
- <value>org.apache.jetspeed.login.retrycount</value>
- <value>org.apache.jetspeed.login.errorcode</value>
- <value>org.apache.jetspeed.login.check</value>
- <value>org.apache.jetspeed.theme.override</value>
- </list>
- </constructor-arg>
-</bean>
-
-</beans>
Copied: pal-portal/trunk/installer/etc/tomcat/temp/index.jsp (from rev 729, pal-portal/trunk/installer/etc/tomcat/webapps/ROOT/index.jsp)
===================================================================
--- pal-portal/trunk/installer/etc/tomcat/webapps/ROOT/index.jsp 2007-11-27 13:57:32 UTC (rev 729)
+++ pal-portal/trunk/installer/etc/tomcat/temp/index.jsp 2007-11-29 22:16:26 UTC (rev 732)
@@ -0,0 +1,16 @@
+<%--
+Copyright 2005-2007 Portal Application Laboratory
+
+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.
+--%>
+<% response.sendRedirect("/@PORTAL_CONTEXT@"); %>
Deleted: pal-portal/trunk/installer/etc/tomcat/webapps/ROOT/index.jsp
===================================================================
--- pal-portal/trunk/installer/etc/tomcat/webapps/ROOT/index.jsp 2007-11-29 22:15:42 UTC (rev 731)
+++ pal-portal/trunk/installer/etc/tomcat/webapps/ROOT/index.jsp 2007-11-29 22:16:26 UTC (rev 732)
@@ -1,16 +0,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.
---%>
-<% response.sendRedirect("/palportal"); %>
Modified: pal-portal/trunk/installer/maven.xml
===================================================================
--- pal-portal/trunk/installer/maven.xml 2007-11-29 22:15:42 UTC (rev 731)
+++ pal-portal/trunk/installer/maven.xml 2007-11-29 22:16:26 UTC (rev 732)
@@ -1,5 +1,6 @@
+<?xml version="1.0"?>
<!--
- Copyright 2004 The Apache Software Foundation
+ Copyright 2005-2007 Portal Application Laboratory
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,395 +14,189 @@
See the License for the specific language governing permissions and
limitations under the License.
- $Id: maven.xml,v 1.1 2007/03/10 01:15:30 shinsuke Exp $
-->
-<project default="all" xmlns:j="jelly:core" xmlns:maven="jelly:maven" xmlns:u="jelly:util" xmlns:ant="jelly:ant">
-
+<project xmlns:j="jelly:core" xmlns:maven="jelly:maven" xmlns:u="jelly:util" xmlns:ant="jelly:ant" default="all">
<goal name="j2.plugin.properties">
- <!-- Setting up Jetspeed-2 maven plugin required properties specifically for generating the installer portal -->
-
- <j:set var="org.apache.jetspeed.portal.home" value="${basedir}" />
- <j:set var="org.apache.jetspeed.server.home" value="${maven.build.dir}/tomcat" />
- <j:set var="org.apache.jetspeed.catalina.version.major" value="5.5" />
- <j:set var="org.apache.jetspeed.server.shared" value="${maven.build.dir}/tomcat/shared/lib" />
- <j:set var="org.apache.jetspeed.deploy.war.dir" value="${maven.build.dir}/tomcat/webapps" />
- <j:set var="org.apache.jetspeed.services.autodeployment.server" value="localhost" />
- <j:set var="org.apache.jetspeed.services.autodeployment.port" value="8080" />
- <j:set var="org.apache.jetspeed.services.autodeployment.user" value="j2deployer" />
- <j:set var="org.apache.jetspeed.services.autodeployment.password" value="j2deployer" />
+<!-- Setting up Jetspeed-2 maven plugin required properties specifically for generating the installer portal -->
+ <j:set var="org.apache.jetspeed.portal.home" value="${basedir}"/>
+ <j:set var="org.apache.jetspeed.server.home" value="${installer.target.dir}/portal"/>
+ <j:set var="org.apache.jetspeed.catalina.version.major" value="5.5"/>
+ <j:set var="org.apache.jetspeed.server.shared" value="${installer.target.dir}/portal/shared/lib"/>
+ <j:set var="org.apache.jetspeed.deploy.war.dir" value="${installer.target.dir}/portal/webapps"/>
+ <j:set var="org.apache.jetspeed.services.autodeployment.server" value="localhost"/>
+ <j:set var="org.apache.jetspeed.services.autodeployment.port" value="8080"/>
+ <j:set var="org.apache.jetspeed.services.autodeployment.user" value="j2deployer"/>
+ <j:set var="org.apache.jetspeed.services.autodeployment.password" value="j2deployer"/>
</goal>
-
- <goal name="buildInstaller" prereqs="j2.plugin.properties">
- <maven:property name="build_type" defaultValue="minimal" />
- <!--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" />
-
- <delete dir="${maven.build.dir}/tomcat/webapps" />
-
- <copy todir="${maven.build.dir}/tomcat" overwrite="true">
- <fileset dir="${basedir}/etc/tomcat" />
+ <goal name="build" prereqs="j2.plugin.properties">
+<!--=== ${installer.target.dir}/tomcat ===-->
+<!-- Get Tomcat -->
+ <get usetimestamp="true" dest="${dist.tomcat.base.file}" src="${dist.tomcat.base.url}"/>
+ <unzip src="${dist.tomcat.base.file}" dest="${installer.target.dir}/"/>
+ <move todir="${installer.target.dir}/tomcat">
+ <fileset dir="${installer.target.dir}/apache-tomcat-${dist.tomcat.version}"/>
+ </move>
+<!-- Clean webapps for Tomcat -->
+ <delete dir="${installer.target.dir}/tomcat/webapps"/>
+ <mkdir dir="${installer.target.dir}/tomcat/webapps"/>
+<!--=== ${installer.target.dir}/tomcat-config ===-->
+<!-- Copy Tomcat config for Portal -->
+ <mkdir dir="${installer.target.dir}/tomcat-config"/>
+ <copy todir="${installer.target.dir}/tomcat-config" overwrite="true">
+ <fileset dir="${basedir}/etc/tomcat"/>
</copy>
-
- <j:set var="maven.war.build.dir" value="${maven.build.dir}/tomcat/webapps"/>
+<!--=== ${installer.target.dir}/portal ===-->
+<!-- Copy Portal -->
+ <j:set var="maven.war.build.dir" value="${installer.target.dir}/portal/webapps"/>
<attainGoal name="war:webapp"/>
-
- <attainGoal name="j2:portal.copy.webapp" />
- <attainGoal name="j2:portal.conf.ojb" />
- <attainGoal name="j2:portal.conf.jetspeed" />
-
- <move todir="${maven.build.dir}/tomcat/webapps/${org.apache.jetspeed.portal.artifactId}">
- <fileset dir="${maven.build.dir}/${org.apache.jetspeed.portal.artifactId}" />
+ <attainGoal name="j2:portal.copy.webapp"/>
+ <attainGoal name="j2:portal.conf.ojb"/>
+ <attainGoal name="j2:portal.conf.jetspeed"/>
+ <attainGoal name="j2:copy.shared.deps"/>
+ <attainGoal name="j2:pam.layoutdeploy"/>
+<!-- TODO: remove -->
+ <attainGoal name="j2:pam.admindeploy"/>
+<!-- Copy portal files -->
+ <move todir="${installer.target.dir}/portal/webapps/${org.apache.jetspeed.portal.artifactId}">
+ <fileset dir="${installer.target.dir}/${org.apache.jetspeed.portal.artifactId}"/>
</move>
-
- <mkdir dir="${maven.build.dir}/database" />
-
- <copy file="${portal.dir}/etc/sql/drop.sql" todir="${maven.build.dir}/database" />
- <copy todir="${maven.build.dir}/database/derby">
- <fileset dir="${portal.dir}/etc/sql/derby/schema" />
+<!-- replace pages -->
+ <delete dir="${installer.target.dir}/portal/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/pages"/>
+ <mkdir dir="${installer.target.dir}/portal/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/pages"/>
+ <copy todir="${installer.target.dir}/portal/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/pages">
+ <fileset dir="${portal.psml.dir}/${portal.psml.name}"/>
</copy>
- <j:set var="org.apache.jetspeed.production.database.default.name" value="mysql" />
- <attainGoal name="j2:portal.conf.sql" />
- <j:choose>
- <j:when test="${build_type=='minimal'}">
- <copy todir="${maven.build.dir}/database">
- <fileset dir="${maven.build.dir}/portal-sql/min" includes="j2-seed.xml" />
- </copy>
- </j:when>
- <j:otherwise>
- <copy todir="${maven.build.dir}/database">
- <fileset dir="${maven.build.dir}/portal-sql" includes="j2-seed.xml" />
- </copy>
- </j:otherwise>
- </j:choose>
- <copy todir="${maven.build.dir}/database/mysql">
- <fileset dir="${maven.build.dir}/portal-sql/mysql/schema" excludes="*.generation,*.map" />
+<!-- copy etc/portal -->
+ <copy todir="${installer.target.dir}/portal" overwrite="true">
+ <fileset dir="${basedir}/etc/portal"/>
</copy>
- <j:set var="org.apache.jetspeed.production.database.default.name" value="mssql" />
- <attainGoal name="j2:portal.conf.sql" />
- <copy todir="${maven.build.dir}/database/mssql">
- <fileset dir="${maven.build.dir}/portal-sql/mssql/schema" excludes="*.generation,*.map" />
+<!--=== ${installer.target.dir}/database ===-->
+<!-- Copy Database Config -->
+ <mkdir dir="${installer.target.dir}/database"/>
+ <copy file="${portal.dir}/etc/sql/drop.sql" todir="${installer.target.dir}/database"/>
+ <copy todir="${installer.target.dir}/database/import/db-ojb" overwrite="true">
+ <fileset dir="${portal.dir}/etc/db-ojb"/>
</copy>
- <j:set var="org.apache.jetspeed.production.database.default.name" value="oracle" />
- <attainGoal name="j2:portal.conf.sql" />
- <copy todir="${maven.build.dir}/database/oracle">
- <fileset dir="${maven.build.dir}/portal-sql/oracle/schema" excludes="*.generation,*.map" />
+<!-- Derby -->
+ <copy todir="${installer.target.dir}/database/derby">
+ <fileset dir="${portal.dir}/etc/sql/derby/schema"/>
</copy>
- <j:set var="org.apache.jetspeed.production.database.default.name" value="db2" />
- <attainGoal name="j2:portal.conf.sql" />
- <copy todir="${maven.build.dir}/database/db2">
- <fileset dir="${maven.build.dir}/portal-sql/db2/schema" excludes="*.generation,*.map" />
+<!-- MySQL -->
+ <j:set var="org.apache.jetspeed.production.database.default.name" value="mysql"/>
+ <attainGoal name="j2:portal.conf.sql"/>
+ <copy todir="${installer.target.dir}/database/mysql">
+ <fileset dir="${installer.target.dir}/portal-sql/mysql/schema" excludes="*.generation,*.map"/>
</copy>
- <j:set var="org.apache.jetspeed.production.database.default.name" value="sapdb" />
- <attainGoal name="j2:portal.conf.sql" />
- <copy todir="${maven.build.dir}/database/sapdb">
- <fileset dir="${maven.build.dir}/portal-sql/sapdb/schema" excludes="*.generation,*.map" />
+<!-- MSSQL -->
+ <j:set var="org.apache.jetspeed.production.database.default.name" value="mssql"/>
+ <attainGoal name="j2:portal.conf.sql"/>
+ <copy todir="${installer.target.dir}/database/mssql">
+ <fileset dir="${installer.target.dir}/portal-sql/mssql/schema" excludes="*.generation,*.map"/>
</copy>
- <j:set var="org.apache.jetspeed.production.database.default.name" value="postgres" />
- <attainGoal name="j2:portal.conf.sql" />
- <copy todir="${maven.build.dir}/database/postgres">
- <fileset dir="${maven.build.dir}/portal-sql/postgres/schema" excludes="*.generation,*.map" />
+<!-- Oracle -->
+ <j:set var="org.apache.jetspeed.production.database.default.name" value="oracle"/>
+ <attainGoal name="j2:portal.conf.sql"/>
+ <copy todir="${installer.target.dir}/database/oracle">
+ <fileset dir="${installer.target.dir}/portal-sql/oracle/schema" excludes="*.generation,*.map"/>
</copy>
- <copy todir="${maven.build.dir}/database/import/db-ojb" overwrite="true">
- <fileset dir="${portal.dir}/etc/db-ojb" />
+<!-- DB2 -->
+ <j:set var="org.apache.jetspeed.production.database.default.name" value="db2"/>
+ <attainGoal name="j2:portal.conf.sql"/>
+ <copy todir="${installer.target.dir}/database/db2">
+ <fileset dir="${installer.target.dir}/portal-sql/db2/schema" excludes="*.generation,*.map"/>
</copy>
-
-
- <filter token="CONTEXT" value="${org.apache.jetspeed.portal.artifactId}" />
- <copy file="${portal.dir}/etc/conf/tomcat/jetspeed-tomcat-5.5.xml" tofile="${maven.build.dir}/database/${org.apache.jetspeed.portal.artifactId}.xml"
- filtering="true" />
-
- <attainGoal name="j2:copy.shared.deps" />
- <attainGoal name="j2:pam.layoutdeploy" />
- <attainGoal name="j2:pam.admindeploy" />
-
- <!-- Copy Portlets -->
- <copy todir="${maven.build.dir}/tomcat/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/deploy" overwrite="true">
- <fileset dir="${maven.build.dir}/portlets" />
+<!-- SAPDB -->
+ <j:set var="org.apache.jetspeed.production.database.default.name" value="sapdb"/>
+ <attainGoal name="j2:portal.conf.sql"/>
+ <copy todir="${installer.target.dir}/database/sapdb">
+ <fileset dir="${installer.target.dir}/portal-sql/sapdb/schema" excludes="*.generation,*.map"/>
</copy>
-
-<!--
- <j:choose>
- <j:when test="${build_type=='minimal'}">
- <delete dir="${maven.build.dir}/tomcat/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/pages" />
- <move todir="${maven.build.dir}/tomcat/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/pages">
- <fileset dir="${maven.build.dir}/tomcat/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/min-pages" />
- </move>
- </j:when>
- <j:otherwise>
- <delete dir="${maven.build.dir}/tomcat/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/min-pages" />
- <attainGoal name="j2:pam.demodeploy" />
- <attainGoal name="j2:pam.jsfdeploy" />
- <attainGoal name="j2:pam.rssdeploy" />
- <attainGoal name="j2:pam.jpetstoredeploy" />
- </j:otherwise>
- </j:choose>
--->
- <delete dir="${maven.build.dir}/tomcat/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/pages" />
- <mkdir dir="${maven.build.dir}/tomcat/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/pages" />
- <copy todir="${maven.build.dir}/tomcat/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/pages">
- <fileset dir="${portal.psml.dir}/${portal.psml.name}" />
+<!-- Postgres -->
+ <j:set var="org.apache.jetspeed.production.database.default.name" value="postgres"/>
+ <attainGoal name="j2:portal.conf.sql"/>
+ <copy todir="${installer.target.dir}/database/postgres">
+ <fileset dir="${installer.target.dir}/portal-sql/postgres/schema" excludes="*.generation,*.map"/>
</copy>
-
- <copy todir="${maven.build.dir}/database/lib">
+<!-- Copy Seed -->
+ <copy todir="${installer.target.dir}/database">
+ <fileset dir="${installer.target.dir}/portal-sql/min" includes="j2-seed.xml"/>
+ </copy>
+<!-- Copy DB connection -->
+ <filter token="CONTEXT" value="${org.apache.jetspeed.portal.artifactId}"/>
+ <copy file="${portal.dir}/etc/conf/tomcat/jetspeed-tomcat-5.5.xml" tofile="${installer.target.dir}/database/${org.apache.jetspeed.portal.artifactId}.xml" filtering="true"/>
+<!-- Copy jar files for DB setup -->
+ <copy todir="${installer.target.dir}/database/lib">
<fileset dir="${maven.repo.local}/tyrex/jars/">
- <include name="tyrex-1.0.1.jar" />
+ <include name="tyrex-1.0.1.jar"/>
</fileset>
<fileset dir="${maven.repo.local}/ant/jars/">
- <include name="ant-1.6.5.jar" />
+ <include name="ant-1.6.5.jar"/>
</fileset>
<fileset dir="${maven.repo.local}/org.apache.portals.jetspeed-2/jars/">
- <include name="ant-tasks-${jetspeed.version}.jar" />
+ <include name="ant-tasks-${jetspeed.version}.jar"/>
</fileset>
- <fileset dir="${maven.build.dir}/tomcat/shared/lib/" includes="derby-*.jar"/>
+ <fileset dir="${installer.target.dir}/portal/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>
- <concat destfile="${maven.build.dir}/database/build.properties">portalName=${org.apache.jetspeed.portal.artifactId}</concat>
- <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}/${dist.name.prefix}-${dist.version}${build_name}-installer.jar" compress="true">
- <manifest>
- <attribute name="Manifest-Version" value="1.0" />
- <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.portals.jetspeed-2/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" />
- </fileset>
- <fileset file="${maven.build.dir}/antinstall-config.xml"/>
- <fileset file="${basedir}/etc/NOTICE.txt"/>
- <fileset dir="${portal.dir}">
- <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">
- <attainGoal name="buildInstaller" />
- </goal>
-
- <goal name="buildDemo">
- <j:set var="build_type" value="demo" />
- <attainGoal name="buildInstaller" />
- </goal>
-
- <goal name="build.without.tomcat">
- <attainGoal name="buildInstallerWithoutTomcat" />
- </goal>
-
- <goal name="buildInstallerWithoutTomcat" prereqs="j2.plugin.properties">
- <maven:property name="build_type" defaultValue="minimal" />
- <!--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" />
-
- <delete dir="${maven.build.dir}/tomcat/webapps" />
--->
- <mkdir dir="${maven.build.dir}/tomcat" />
- <mkdir dir="${maven.build.dir}/tomcat-compat" />
-
- <copy todir="${maven.build.dir}/tomcat" overwrite="true">
- <fileset dir="${basedir}/etc/tomcat" />
+<!--=== ${installer.target.dir}/portlets ===-->
+<!-- Nothing -->
+<!--=== Build Installer ===-->
+ <copy file="${basedir}/etc/ant-installer/antinstall-config.xml" todir="${installer.target.dir}">
+ <filterset begintoken="@" endtoken="@">
+ <filter token="PORTAL_CONTEXT" value="${org.apache.jetspeed.portal.artifactId}"/>
+ <filter token="PORTAL_NAME" value="${container.name}"/>
+ </filterset>
</copy>
-
- <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" />
- <attainGoal name="j2:portal.conf.jetspeed" />
-
- <move todir="${maven.build.dir}/tomcat/webapps/${org.apache.jetspeed.portal.artifactId}">
- <fileset dir="${maven.build.dir}/${org.apache.jetspeed.portal.artifactId}" />
- </move>
-
- <mkdir dir="${maven.build.dir}/database" />
-
- <copy file="${portal.dir}/etc/sql/drop.sql" todir="${maven.build.dir}/database" />
- <copy todir="${maven.build.dir}/database/derby">
- <fileset dir="${portal.dir}/etc/sql/derby/schema" />
+ <copy todir="${installer.target.dir}/ant-installer" overwrite="true">
+ <fileset dir="${basedir}/etc/ant-installer"/>
</copy>
- <j:set var="org.apache.jetspeed.production.database.default.name" value="mysql" />
- <attainGoal name="j2:portal.conf.sql" />
- <j:choose>
- <j:when test="${build_type=='minimal'}">
- <copy todir="${maven.build.dir}/database">
- <fileset dir="${maven.build.dir}/portal-sql/min" includes="j2-seed.xml" />
- </copy>
- </j:when>
- <j:otherwise>
- <copy todir="${maven.build.dir}/database">
- <fileset dir="${maven.build.dir}/portal-sql" includes="j2-seed.xml" />
- </copy>
- </j:otherwise>
- </j:choose>
- <copy todir="${maven.build.dir}/database/mysql">
- <fileset dir="${maven.build.dir}/portal-sql/mysql/schema" excludes="*.generation,*.map" />
- </copy>
- <j:set var="org.apache.jetspeed.production.database.default.name" value="mssql" />
- <attainGoal name="j2:portal.conf.sql" />
- <copy todir="${maven.build.dir}/database/mssql">
- <fileset dir="${maven.build.dir}/portal-sql/mssql/schema" excludes="*.generation,*.map" />
- </copy>
- <j:set var="org.apache.jetspeed.production.database.default.name" value="oracle" />
- <attainGoal name="j2:portal.conf.sql" />
- <copy todir="${maven.build.dir}/database/oracle">
- <fileset dir="${maven.build.dir}/portal-sql/oracle/schema" excludes="*.generation,*.map" />
- </copy>
- <j:set var="org.apache.jetspeed.production.database.default.name" value="db2" />
- <attainGoal name="j2:portal.conf.sql" />
- <copy todir="${maven.build.dir}/database/db2">
- <fileset dir="${maven.build.dir}/portal-sql/db2/schema" excludes="*.generation,*.map" />
- </copy>
- <j:set var="org.apache.jetspeed.production.database.default.name" value="sapdb" />
- <attainGoal name="j2:portal.conf.sql" />
- <copy todir="${maven.build.dir}/database/sapdb">
- <fileset dir="${maven.build.dir}/portal-sql/sapdb/schema" excludes="*.generation,*.map" />
- </copy>
- <j:set var="org.apache.jetspeed.production.database.default.name" value="postgres" />
- <attainGoal name="j2:portal.conf.sql" />
- <copy todir="${maven.build.dir}/database/postgres">
- <fileset dir="${maven.build.dir}/portal-sql/postgres/schema" excludes="*.generation,*.map" />
- </copy>
- <copy todir="${maven.build.dir}/database/import/db-ojb" overwrite="true">
- <fileset dir="${portal.dir}/etc/db-ojb" />
- </copy>
-
-
- <filter token="CONTEXT" value="${org.apache.jetspeed.portal.artifactId}" />
- <copy file="${portal.dir}/etc/conf/tomcat/jetspeed-tomcat-5.5.xml" tofile="${maven.build.dir}/database/${org.apache.jetspeed.portal.artifactId}.xml"
- filtering="true" />
-
- <attainGoal name="j2:copy.shared.deps" />
- <attainGoal name="j2:pam.layoutdeploy" />
- <attainGoal name="j2:pam.admindeploy" />
-
- <!-- Copy Portlets -->
- <copy todir="${maven.build.dir}/tomcat/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/deploy" overwrite="true">
- <fileset dir="${maven.build.dir}/portlets" />
- </copy>
-
-<!--
- <j:choose>
- <j:when test="${build_type=='minimal'}">
- <delete dir="${maven.build.dir}/tomcat/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/pages" />
- <move todir="${maven.build.dir}/tomcat/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/pages">
- <fileset dir="${maven.build.dir}/tomcat/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/min-pages" />
- </move>
- </j:when>
- <j:otherwise>
- <delete dir="${maven.build.dir}/tomcat/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/min-pages" />
- <attainGoal name="j2:pam.demodeploy" />
- <attainGoal name="j2:pam.jsfdeploy" />
- <attainGoal name="j2:pam.rssdeploy" />
- <attainGoal name="j2:pam.jpetstoredeploy" />
- </j:otherwise>
- </j:choose>
--->
- <delete dir="${maven.build.dir}/tomcat/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/pages" />
- <mkdir dir="${maven.build.dir}/tomcat/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/pages" />
- <copy todir="${maven.build.dir}/tomcat/webapps/${org.apache.jetspeed.portal.artifactId}/WEB-INF/pages">
- <fileset dir="${portal.psml.dir}/${portal.psml.name}" />
- </copy>
-
- <copy todir="${maven.build.dir}/database/lib">
- <fileset dir="${maven.repo.local}/tyrex/jars/">
- <include name="tyrex-1.0.1.jar" />
+ <copy todir="${installer.target.dir}/ant-installer/resources" overwrite="true">
+ <fileset dir="${basedir}/etc/ant-installer/resources">
+ <include name="*.properties"/>
</fileset>
- <fileset dir="${maven.repo.local}/ant/jars/">
- <include name="ant-1.6.5.jar" />
- </fileset>
- <fileset dir="${maven.repo.local}/org.apache.portals.jetspeed-2/jars/">
- <include name="ant-tasks-${jetspeed.version}.jar" />
- </fileset>
- <fileset dir="${maven.build.dir}/tomcat/shared/lib/" includes="derby-*.jar"/>
+ <filterset begintoken="@" endtoken="@">
+ <filter token="PORTAL_CONTEXT" value="${org.apache.jetspeed.portal.artifactId}"/>
+ <filter token="PORTAL_NAME" value="${container.name}"/>
+ </filterset>
</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*"/>
+ <concat destfile="${installer.target.dir}/database/build.properties">portalName=${org.apache.jetspeed.portal.artifactId}</concat>
+ <zip file="${installer.target.dir}/tomcat.zip">
+ <zipfileset dir="${installer.target.dir}/tomcat" excludes="shared/lib/derby*"/>
</zip>
- <zip file="${maven.build.dir}/tomcat-compat.zip">
- <zipfileset dir="${maven.build.dir}/tomcat-compat"/>
+ <zip file="${installer.target.dir}/tomcat-config.zip">
+ <zipfileset dir="${installer.target.dir}/tomcat-config" excludes="shared/lib/derby*"/>
</zip>
- <concat destfile="${maven.build.dir}/database/build.properties">portalName=${org.apache.jetspeed.portal.artifactId}</concat>
- <zip file="${maven.build.dir}/database.zip">
- <zipfileset dir="${maven.build.dir}/database" prefix="database" />
- <zipfileset dir="${basedir}/etc/database" prefix="database" />
+ <zip file="${installer.target.dir}/portal.zip">
+ <zipfileset dir="${installer.target.dir}/portal" excludes="shared/lib/derby*"/>
</zip>
-
- <jar file="${maven.build.dir}/${dist.name.prefix}-${dist.version}${build_name}-portalonly-installer.jar" compress="true">
+ <zip file="${installer.target.dir}/portlets.zip">
+ <zipfileset dir="${installer.target.dir}/portlets"/>
+ </zip>
+ <zip file="${installer.target.dir}/database.zip">
+ <zipfileset dir="${installer.target.dir}/database" prefix="database"/>
+ <zipfileset dir="${basedir}/etc/database" prefix="database"/>
+ </zip>
+ <jar file="${installer.target.dir}/${dist.name.prefix}-${dist.version}-installer.jar" compress="true">
<manifest>
- <attribute name="Manifest-Version" value="1.0" />
- <attribute name="Main-Class" value="org.tp23.antinstaller.selfextract.NonExtractor" />
+ <attribute name="Manifest-Version" value="1.0"/>
+ <attribute name="Main-Class" value="org.tp23.antinstaller.selfextract.NonExtractor"/>
</manifest>
- <zipgroupfileset dir="${basedir}/etc/ant-installer/lib" includes="*.jar" />
+ <zipgroupfileset dir="${basedir}/etc/ant-installer/lib" includes="*.jar"/>
<zipgroupfileset dir="${maven.repo.local}/org.apache.portals.jetspeed-2/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" />
+ <fileset dir="${installer.target.dir}/ant-installer">
+ <include name="resources/*" prefix="resources"/>
+ <include name="license/*"/>
+ <include name="build.xml"/>
</fileset>
- <fileset file="${maven.build.dir}/antinstall-config.xml"/>
+ <fileset file="${installer.target.dir}/antinstall-config.xml"/>
<fileset file="${basedir}/etc/NOTICE.txt"/>
<fileset dir="${portal.dir}">
- <include name="LICENSE.TXT" />
+ <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"/>
+ <fileset file="${installer.target.dir}/portal.zip"/>
+ <fileset file="${installer.target.dir}/portlets.zip"/>
+ <fileset file="${installer.target.dir}/tomcat.zip"/>
+ <fileset file="${installer.target.dir}/tomcat-config.zip"/>
+ <fileset file="${installer.target.dir}/database.zip"/>
</jar>
</goal>
</project>