svnno****@sourc*****
svnno****@sourc*****
2007年 7月 30日 (月) 07:32:17 JST
Revision: 418
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=418
Author: shinsuke
Date: 2007-07-30 07:32:16 +0900 (Mon, 30 Jul 2007)
Log Message:
-----------
sync up with j2 installer.
Modified Paths:
--------------
pal-portal/trunk/installer/etc/ant-installer/antinstall-config.xml
pal-portal/trunk/installer/etc/ant-installer/build.xml
pal-portal/trunk/installer/etc/database/build.xml
pal-portal/trunk/installer/etc/database/database.properties.template
pal-portal/trunk/installer/maven.xml
Added Paths:
-----------
pal-portal/trunk/installer/etc/NOTICE.txt
pal-portal/trunk/installer/etc/database/import/
pal-portal/trunk/installer/etc/database/import/assembly/
pal-portal/trunk/installer/etc/database/import/assembly/import-page-manager.xml
pal-portal/trunk/installer/etc/database/import/assembly/repository-datasource-spring.xml
pal-portal/trunk/installer/etc/database/import/import.properties
pal-portal/trunk/installer/etc/database/import/log4j.properties
-------------- next part --------------
Added: pal-portal/trunk/installer/etc/NOTICE.txt
===================================================================
--- pal-portal/trunk/installer/etc/NOTICE.txt 2007-07-29 22:30:41 UTC (rev 417)
+++ pal-portal/trunk/installer/etc/NOTICE.txt 2007-07-29 22:32:16 UTC (rev 418)
@@ -0,0 +1,12 @@
+Apache Portals Jetspeed-2
+ Copyright 1999-2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+ This product includes software from AntInstaller (http://antinstaller.sf.net)
+ Copyright 2001-2004 The Apache Software Foundation
+
+ This product includes software from Karsten Lentzsch
+ Copyright (c) 2001-2004 JGoodies Karsten Lentzsch. All rights reserved.
+
\ No newline at end of file
Property changes on: pal-portal/trunk/installer/etc/NOTICE.txt
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: pal-portal/trunk/installer/etc/ant-installer/antinstall-config.xml
===================================================================
--- pal-portal/trunk/installer/etc/ant-installer/antinstall-config.xml 2007-07-29 22:30:41 UTC (rev 417)
+++ pal-portal/trunk/installer/etc/ant-installer/antinstall-config.xml 2007-07-29 22:32:16 UTC (rev 418)
@@ -16,11 +16,15 @@
$Id: antinstall-config.xml,v 1.2 2007/03/11 14:16:31 shinsuke Exp $
-->
-<!DOCTYPE installer PUBLIC "-//tp23 //DTD Ant Installer Config//EN"
+<!-- 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="false" lookAndFeel="jgoodies" name="PAL Portal Installer"
- windowIcon="/resources/feather-small.png" defaultImageResource="/resources/palportal.gif" minJavaVersion="1.4"
+
+<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">
@@ -46,8 +50,20 @@
<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" />
</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"/>
+
+ <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" />
@@ -200,17 +216,6 @@
<comment displayText="Continuing now will otherwise require manual setup of the database."/>
</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"/>
-
- <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="beforeInstall" displayText="Before your install ..." ifProperty="(${dbName}=manual) OR (${setupDBAntTarget}=setupNoDB)">
<hidden property="db.username" value="" />
<hidden property="db.password" value="" />
Modified: pal-portal/trunk/installer/etc/ant-installer/build.xml
===================================================================
--- pal-portal/trunk/installer/etc/ant-installer/build.xml 2007-07-29 22:30:41 UTC (rev 417)
+++ pal-portal/trunk/installer/etc/ant-installer/build.xml 2007-07-29 22:32:16 UTC (rev 418)
@@ -33,7 +33,7 @@
<fileset dir="${installDir}" includes="**/*"/>
</delete>
- <echo>Installing Jetspeed-2.1 Enterprise Portal</echo>
+ <echo>Installing PAL Portal</echo>
<unzip src="${antinstaller.jar}" dest="${installDir}">
<patternset>
<include name="portal.zip" />
@@ -64,6 +64,7 @@
<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>
Modified: pal-portal/trunk/installer/etc/database/build.xml
===================================================================
--- pal-portal/trunk/installer/etc/database/build.xml 2007-07-29 22:30:41 UTC (rev 417)
+++ pal-portal/trunk/installer/etc/database/build.xml 2007-07-29 22:32:16 UTC (rev 418)
@@ -18,6 +18,7 @@
<project name="JetspeedDatabaseSetup" default="setupDB" basedir=".">
<property file="${basedir}/database.properties" />
+ <property file="build.properties"/>
<condition property="_db.username" value="">
<equals arg1="${db.type}" arg2="derby" />
@@ -62,14 +63,20 @@
</target>
- <target name="setupNoDB" />
+ <target name="setupNoDB">
+ <antcall target="setupDBPSML"/>
+ </target>
<target name="checkInput" unless="failSetup">
<antcall target="runSetupDB"/>
</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>
+
<target name="runSetupDB"
- depends="checkDerby,generateStandardDB,generateDerbyDB,seedDB,copyJetspeedContext" />
+ depends="setupDBPSML,checkDerby,generateStandardDB,generateDerbyDB,seedDB,copyJetspeedContext,do-psml" />
<target name="checkDerby">
<condition property="_derby">
@@ -101,7 +108,7 @@
</target>
<target name="generateStandardDB" unless="_derby">
- <echo>cleaning up possible exiting Db</echo>
+ <echo>cleaning up possible existing 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="setup.log">
@@ -171,7 +178,7 @@
<echo>Seeding the database</echo>
<copy todir="${basedir}/assembly" overwrite="true" failonerror="true">
- <fileset dir="${basedir}/../webapps/palportal/WEB-INF/assembly">
+ <fileset dir="${basedir}/../webapps/${portalName}/WEB-INF/assembly">
<include name="security*.xml" />
<include name="capabilities.xml" />
<include name="prefs.xml" />
@@ -184,7 +191,7 @@
<copy todir="${basedir}/assembly" overwrite="true" failonerror="true">
- <fileset dir="${basedir}/../webapps/palportal/WEB-INF/assembly/alternate/">
+ <fileset dir="${basedir}/../webapps/${portalName}/WEB-INF/assembly/alternate/">
<include name="request-context.xml" />
</fileset>
</copy>
@@ -192,7 +199,7 @@
<mkdir dir="${basedir}/assembly/boot" />
<copy todir="${basedir}/assembly/boot" overwrite="true" failonerror="true">
- <fileset dir="${basedir}/../webapps/palportal/WEB-INF/assembly/boot">
+ <fileset dir="${basedir}/../webapps/${portalName}/WEB-INF/assembly/boot">
<include name="*.xml" />
</fileset>
</copy>
@@ -202,7 +209,7 @@
<fileset dir="${basedir}/../shared/lib">
<include name="**/*.jar" />
</fileset>
- <fileset dir="${basedir}/../webapps/palportal/WEB-INF/lib">
+ <fileset dir="${basedir}/../webapps/${portalName}/WEB-INF/lib">
<include name="**/*.jar" />
</fileset>
<fileset dir="${basedir}/lib">
@@ -212,12 +219,12 @@
<include name="**/*.jar" />
</fileset>
<pathelement location="${basedir}/../shared/classes" />
- <pathelement location="${basedir}/../webapps/palportal/WEB-INF/classes" />
+ <pathelement location="${basedir}/../webapps/${portalName}/WEB-INF/classes" />
</classpath>
<arg
line="-I "${basedir}/j2-seed.xml"
- -a "${basedir}/../webapps/palportal"
+ -a "${basedir}/../webapps/${portalName}"
-b "file:${basedir}/assembly/boot/"
-c "file:${basedir}/assembly/"
-dc "${_jdbc.driver.class}"
@@ -235,7 +242,7 @@
<fileset dir="${basedir}/../shared/lib">
<include name="**/*.jar" />
</fileset>
- <fileset dir="${basedir}/../webapps/palportal/WEB-INF/lib">
+ <fileset dir="${basedir}/../webapps/${portalName}/WEB-INF/lib">
<include name="**/*.jar" />
</fileset>
<fileset dir="${basedir}/lib">
@@ -245,7 +252,7 @@
<include name="**/*.jar" />
</fileset>
<pathelement location="${basedir}/../shared/classes" />
- <pathelement location="${basedir}/../webapps/palportal/WEB-INF/classes" />
+ <pathelement location="${basedir}/../webapps/${portalName}/WEB-INF/classes" />
</classpath>
<arg
line="driver="${_jdbc.driver.class}"
@@ -259,7 +266,7 @@
</target>
<target name="copyJetspeedContext">
- <copy file="palportal.xml" tofile="${basedir}/../conf/Catalina/localhost/palportal.xml" overwrite="true">
+ <copy file="${portalName}.xml" tofile="${basedir}/../conf/Catalina/localhost/${portalName}.xml" overwrite="true">
<filterset begintoken="@" endtoken="@">
<filter token="USERNAME" value="${_db.username}" />
<filter token="PASSWORD" value="${_db.password}" />
@@ -269,4 +276,98 @@
</copy>
</target>
+<!-- Import of PSML -->
+ <property name="import.jdbc.driver.class" value="${_jdbc.driver.class}"/>
+ <property name="import.jdbc.username" value="${_db.username}"/>
+ <property name="import.jdbc.password" value="${_db.password}"/>
+ <property name="import.jdbc.url" value="${_jdbc.url}"/>
+
+ <property name="jetspeedWebinfDir" value="${basedir}/../webapps/${portalName}/WEB-INF"/>
+ <property name="pagesLocation" value="${jetspeedWebinfDir}/pages"/>
+ <property name="importDir" value="${basedir}/import"/>
+ <property name="importTargetDir" value="${importDir}/target"/>
+ <property name="org.apache.jetspeed.page.import.configuration" value="${basedir}/import/import.properties"/>
+ <property name="org.apache.jetspeed.page.import.pages" value="${jetspeedWebinfDir}/pages"/>
+
+ <path id="import-classpath">
+ <fileset dir="${basedir}/../shared/lib">
+ <include name="**/*.jar" />
+ </fileset>
+ <fileset dir="${jetspeedWebinfDir}/lib">
+ <include name="**/*.jar" />
+ </fileset>
+ <fileset dir="${basedir}/lib">
+ <include name="**/*.jar" />
+ </fileset>
+ <fileset dir="${basedir}/../common/lib">
+ <include name="**/*.jar" />
+ </fileset>
+ <pathelement location="${basedir}/../shared/classes" />
+ <pathelement location="${jetspeedWebinfDir}/classes" />
+ <pathelement location="${importTargetDir}/classes" />
+ </path>
+
+
+ <!-- Populate Database -->
+
+ <target name="test-import-psml">
+ <condition property="_doImportPsml">
+ <equals arg1="${dbImportPsml}" arg2="true"/>
+ </condition>
+ </target>
+
+ <target name="do-psml" depends="test-import-psml,db-psml,fs-psml"/>
+
+ <target name="fs-psml" unless="_doImportPsml">
+ <copy file="${jetspeedWebinfDir}/assembly/alternate/fs-page-manager.xml" tofile="${jetspeedWebinfDir}/assembly/page-manager.xml" overwrite="true"/>
+ <delete quiet="true" file="${jetspeedWebinfDir}/assembly/interceptors.xml"/>
+ </target>
+
+ <target name="db-psml" if="_doImportPsml">
+
+ <!-- prepare a classes directory with resources and libraries to execute import -->
+ <delete dir="${importTargetDir}/classes"/>
+ <mkdir dir="${importTargetDir}/classes"/>
+ <echo>Import dir: ${importDir}</echo>
+ <copy todir="${importTargetDir}/classes" flatten="on">
+ <fileset dir="${importDir}" >
+ <include name="db-ojb/*"/>
+ <include name="log4j.properties"/>
+ <include name="assembly/import-page-manager.xml"/>
+ <include name="assembly/repository-datasource-spring.xml"/>
+ </fileset>
+ <fileset dir="${jetspeedWebinfDir}" >
+ <include name="assembly/transaction.xml"/>
+ <include name="assembly/alternate/interceptors.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- create sysproperty set to configure import utility -->
+ <propertyset id="import.syspropertyset.id">
+ <propertyref name="org.apache.jetspeed.page.import.configuration"/>
+ <propertyref name="org.apache.jetspeed.page.import.pages"/>
+ <propertyref name="import.jdbc.driver.class"/>
+ <propertyref name="import.jdbc.username"/>
+ <propertyref name="import.jdbc.password"/>
+ <propertyref name="import.jdbc.url"/>
+ </propertyset>
+
+ <!-- execute import utility within the page manager component -->
+ <antcall target="execute-import" inheritall="on" inheritrefs="on"/>
+
+ <copy file="${jetspeedWebinfDir}/assembly/alternate/db-page-manager.xml" tofile="${jetspeedWebinfDir}/assembly/page-manager.xml" overwrite="true"/>
+ <copy file="${jetspeedWebinfDir}/assembly/alternate/interceptors.xml" todir="${jetspeedWebinfDir}/assembly" overwrite="true"/>
+ </target>
+
+ <target name="execute-import">
+
+ <!-- execute import utility with drivers path in classpath -->
+ <java classpathref="import-classpath" classname="org.apache.jetspeed.page.PageImporter" fork="yes" dir="${basedir}">
+ <syspropertyset>
+ <propertyset refid="import.syspropertyset.id"/>
+ </syspropertyset>
+ </java>
+
+ </target>
+
</project>
Modified: pal-portal/trunk/installer/etc/database/database.properties.template
===================================================================
--- pal-portal/trunk/installer/etc/database/database.properties.template 2007-07-29 22:30:41 UTC (rev 417)
+++ pal-portal/trunk/installer/etc/database/database.properties.template 2007-07-29 22:32:16 UTC (rev 418)
@@ -1,9 +1,13 @@
-; Jetspeed Enterprise Portal 2.1 Database setup configuration
+; Jetspeed Enterprise Portal 2.1.1 Database setup configuration
; db.type supported values: db2, derby, mssql, mysql, oracle, postgres, sapdb
db.ty****@db*****@
+
: for db.type other than derby, the properties below need to be specified
db.us****@db*****@
db.pa****@db*****@
jdbc.****@jdbc*****@
jdbc.****@jdbc*****@
+
+; boolean flag (true/false) indicating if psml is to be imported in the database or will be read from file system
+dbImportPsml = @dbImportPsml@
Added: pal-portal/trunk/installer/etc/database/import/assembly/import-page-manager.xml
===================================================================
--- pal-portal/trunk/installer/etc/database/import/assembly/import-page-manager.xml 2007-07-29 22:30:41 UTC (rev 417)
+++ pal-portal/trunk/installer/etc/database/import/assembly/import-page-manager.xml 2007-07-29 22:32:16 UTC (rev 418)
@@ -0,0 +1,189 @@
+<?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="org.apache.jetspeed.page.PageManagerImpl"
+ name="pageManagerImpl"
+ init-method="init"
+ class="org.apache.jetspeed.page.impl.DatabasePageManager">
+ <!-- OJB configuration file resource path -->
+ <constructor-arg index="0"><value>JETSPEED-INF/ojb/page-manager-repository.xml</value></constructor-arg>
+ <!-- folder/page/link cache size, default=128, min=128 -->
+ <constructor-arg index="1"><value>128</value></constructor-arg>
+ <!-- folder/page/link cache expires seconds, default=150, infinite=0, min=30 -->
+ <constructor-arg index="2"><value>0</value></constructor-arg>
+ <!-- permissions security enabled flag, default=false -->
+ <constructor-arg index="3"><value>false</value></constructor-arg>
+ <!-- constraints security enabled flag, default=true -->
+ <constructor-arg index="4"><value>false</value></constructor-arg>
+ </bean>
+
+ <!-- Proxying -->
+ <bean id="org.apache.jetspeed.page.PageManager" name="dbPageManager" parent="PageManagerTransactionProxy">
+ <property name="proxyInterfaces">
+ <value>org.apache.jetspeed.page.PageManager</value>
+ </property>
+ <property name="target">
+ <ref bean="pageManagerImpl" />
+ </property>
+ <property name="transactionAttributes">
+ <props>
+ <prop key="getPage*">PROPAGATION_SUPPORTS</prop>
+ <prop key="getLink*">PROPAGATION_SUPPORTS</prop>
+ <prop key="getFolder*">PROPAGATION_SUPPORTS</prop>
+ <prop key="getContentPage">PROPAGATION_SUPPORTS</prop>
+ <prop key="getAll">PROPAGATION_SUPPORTS</prop>
+ <prop key="getUserFolder">PROPAGATION_SUPPORTS</prop>
+ <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removePage">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removeFolder">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removeLink">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="removePageSecurity">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="createUserHomePagesFromRoles">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+ <prop key="folderExists">PROPAGATION_SUPPORTS</prop>
+ <prop key="pageExists">PROPAGATION_SUPPORTS</prop>
+ <prop key="linkExists">PROPAGATION_SUPPORTS</prop>
+ <prop key="userFolderExists">PROPAGATION_SUPPORTS</prop>
+ <prop key="userPageExists">PROPAGATION_SUPPORTS</prop>
+ </props>
+ </property>
+ </bean>
+
+ <!-- Inject Page Manager Proxy into Page Manager -->
+ <bean id="injectPageManagerProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+ <property name="targetObject"><ref bean="pageManagerImpl"/></property>
+ <property name="targetMethod"><value>setPageManagerProxy</value></property>
+ <property name="arguments">
+ <list>
+ <ref bean="dbPageManager"/>
+ </list>
+ </property>
+ </bean>
+
+ <!-- PageManager -->
+ <bean id="PsmlDocumentHandler"
+ class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >
+ <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+ <constructor-arg index="1"><value>.psml</value></constructor-arg>
+ <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.PageImpl</value></constructor-arg>
+ <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+ <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+ </bean>
+
+ <bean id="LinkDocumentHandler"
+ class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >
+ <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+ <constructor-arg index="1"><value>.link</value></constructor-arg>
+ <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.LinkImpl</value></constructor-arg>
+ <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+ <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+ </bean>
+
+ <bean id="FolderMetaDataDocumentHandler"
+ class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >
+ <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+ <constructor-arg index="1"><value>folder.metadata</value></constructor-arg>
+ <constructor-arg index="2" ><value>org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl</value></constructor-arg>
+ <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+ <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+ </bean>
+
+ <bean id="PageSecurityDocumentHandler"
+ class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >
+ <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
+ <constructor-arg index="1"><value>page.security</value></constructor-arg>
+ <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.psml.PageSecurityImpl</value></constructor-arg>
+ <constructor-arg index="3" ><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+ <constructor-arg index="4" ><ref bean="PageFileCache"/></constructor-arg>
+ </bean>
+
+ <bean id="DocumentHandlerFactory"
+ class="org.apache.jetspeed.page.document.psml.DocumentHandlerFactoryImpl" >
+ <constructor-arg>
+ <map>
+ <entry key=".psml">
+ <ref bean="PsmlDocumentHandler" />
+ </entry>
+ <entry key=".link">
+ <ref bean="LinkDocumentHandler" />
+ </entry>
+ <entry key="folder.metadata">
+ <ref bean="FolderMetaDataDocumentHandler" />
+ </entry>
+ <entry key="page.security">
+ <ref bean="PageSecurityDocumentHandler" />
+ </entry>
+ </map>
+ </constructor-arg>
+ </bean>
+
+ <bean id="FolderHandler"
+ class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler" >
+ <constructor-arg index="0"><value>${org.apache.jetspeed.page.import.pages}</value></constructor-arg>
+ <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
+ <constructor-arg index="2"><ref bean="PageFileCache"/></constructor-arg>
+ </bean>
+
+ <bean id="org.apache.jetspeed.page.CastorPageManager"
+ name="castorPageManager"
+ class="org.apache.jetspeed.page.psml.CastorXmlPageManager">
+ <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
+ <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
+ <constructor-arg index="2"><ref bean="FolderHandler"/></constructor-arg>
+ <constructor-arg index="3"><ref bean="PageFileCache"/></constructor-arg>
+ <!-- permissions security enabled flag, default=false -->
+ <constructor-arg index="4"><value>false</value></constructor-arg>
+ <!-- constraints security enabled flag, default=true -->
+ <constructor-arg index="5"><value>false</value></constructor-arg>
+ </bean>
+
+ <!-- Page File Cache -->
+ <bean id="PageFileCache" class="org.apache.jetspeed.cache.file.FileCache" init-method="startFileScanner" destroy-method="stopFileScanner">
+ <!-- Scan rate for changes in cached files on the file system -->
+ <constructor-arg index="0">
+ <value>10</value>
+ </constructor-arg>
+ <!-- Cache size -->
+ <constructor-arg index="1">
+ <value>100</value>
+ </constructor-arg>
+ </bean>
+
+ <bean id="IdGenerator" class="org.apache.jetspeed.idgenerator.JetspeedIdGenerator" init-method="start" destroy-method="stop">
+ <!-- ID Start value -->
+ <constructor-arg index="0">
+ <value>65536</value>
+ </constructor-arg>
+ <!-- ID Prefix -->
+ <constructor-arg index="1">
+ <value>P-</value>
+ </constructor-arg>
+ <!-- ID Suffix -->
+ <constructor-arg index="2">
+ <value></value>
+ </constructor-arg>
+ </bean>
+
+
+ <!-- properties configurer used to pick up system properties -->
+ <bean id="propertiesConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+</beans>
Property changes on: pal-portal/trunk/installer/etc/database/import/assembly/import-page-manager.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: pal-portal/trunk/installer/etc/database/import/assembly/repository-datasource-spring.xml
===================================================================
--- pal-portal/trunk/installer/etc/database/import/assembly/repository-datasource-spring.xml 2007-07-29 22:30:41 UTC (rev 417)
+++ pal-portal/trunk/installer/etc/database/import/assembly/repository-datasource-spring.xml 2007-07-29 22:32:16 UTC (rev 418)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+
+ <!-- datasource bean -->
+ <!-- <bean id="JetspeedDS" class="org.apache.jetspeed.components.rdbms.ojb.ConnectionRepositoryEntry"> -->
+ <bean id="JetspeedDS" class="org.apache.commons.dbcp.BasicDataSource">
+ <property name="driverClassName">
+ <value>${import.jdbc.driver.class}</value>
+ </property>
+ <property name="url">
+ <value>${import.jdbc.url}</value>
+ </property>
+ <property name="username">
+ <value>${import.jdbc.username}</value>
+ </property>
+ <property name="password">
+ <value>${import.jdbc.password}</value>
+ </property>
+ </bean>
+
+ <bean id="ojbConfigurer" class="org.springframework.orm.ojb.support.LocalOjbConfigurer"/>
+
+ <!--
+ Dynamically configures Database Platform for OJB by looking at the connection string
+ and figuring out the OJB platform using an OJB metadata utility
+ Its important to get this right otherwise you will be sending the wrong (most likely HSQL)
+ flavor of SQL statements to the backend database.
+ -->
+ <bean id="PlatformConfigurator"
+ class="org.apache.jetspeed.components.rdbms.ojb.DatabasePlatformConfigurator"
+ init-method="init"
+ >
+ <constructor-arg index='0'>
+ <ref bean="JetspeedDS"/>
+ </constructor-arg>
+ <!-- JNDI Name -->
+ <constructor-arg index='1'>
+ <value>JetspeedDS</value>
+ </constructor-arg>
+ </bean>
+
+ <!-- properties configurer used to pick up system properties -->
+ <bean id="propertiesConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+</beans>
Property changes on: pal-portal/trunk/installer/etc/database/import/assembly/repository-datasource-spring.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Added: pal-portal/trunk/installer/etc/database/import/import.properties
===================================================================
--- pal-portal/trunk/installer/etc/database/import/import.properties 2007-07-29 22:30:41 UTC (rev 417)
+++ pal-portal/trunk/installer/etc/database/import/import.properties 2007-07-29 22:32:16 UTC (rev 418)
@@ -0,0 +1,16 @@
+# comma-separated list of boot assemblies for Spring
+boot.assemblies = repository-datasource-spring.xml
+# comma-separated list of assemblies for Spring
+assemblies = import-page-manager.xml, transaction.xml, interceptors.xml
+# root folder to start exporting from
+root.folder = /
+# overwrite folders flag, set to true to replace existing folders
+overwrite.folders = true
+# overwrite pages flag, set to true to replace existing pages
+overwrite.pages = true
+# if this flag is true, will also try to import page.security
+full.import = true
+# source page manager Spring component name
+source.page.manager = castorPageManager
+# destination page manager Spring component name
+dest.page.manager = dbPageManager
Property changes on: pal-portal/trunk/installer/etc/database/import/import.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Added: pal-portal/trunk/installer/etc/database/import/log4j.properties
===================================================================
--- pal-portal/trunk/installer/etc/database/import/log4j.properties 2007-07-29 22:30:41 UTC (rev 417)
+++ pal-portal/trunk/installer/etc/database/import/log4j.properties 2007-07-29 22:32:16 UTC (rev 418)
@@ -0,0 +1,34 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# ------------------------------------------------------------------------
+#
+# Logging Configuration
+#
+# $Id: log4j.properties 545528 2007-06-08 14:59:32Z ate $
+#
+# ------------------------------------------------------------------------
+
+log4j.rootLogger = WARN, console
+
+#
+# Console
+#
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+
+# Pattern to output the caller's file name and line number.
+log4j.appender.console.layout.ConversionPattern=%5p: %m%n
+
Property changes on: pal-portal/trunk/installer/etc/database/import/log4j.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: pal-portal/trunk/installer/maven.xml
===================================================================
--- pal-portal/trunk/installer/maven.xml 2007-07-29 22:30:41 UTC (rev 417)
+++ pal-portal/trunk/installer/maven.xml 2007-07-29 22:32:16 UTC (rev 418)
@@ -181,6 +181,7 @@
<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" />
@@ -199,6 +200,7 @@
<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>