svnno****@sourc*****
svnno****@sourc*****
2007年 7月 8日 (日) 12:05:59 JST
Revision: 211 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=211 Author: shinsuke Date: 2007-07-08 12:05:59 +0900 (Sun, 08 Jul 2007) Log Message: ----------- updated installer script Modified Paths: -------------- pal-portal/trunk/installer/etc/tomcat/temp/administration.xml pal-portal/trunk/installer/maven.xml -------------- next part -------------- Modified: pal-portal/trunk/installer/etc/tomcat/temp/administration.xml =================================================================== --- pal-portal/trunk/installer/etc/tomcat/temp/administration.xml 2007-07-04 06:12:45 UTC (rev 210) +++ pal-portal/trunk/installer/etc/tomcat/temp/administration.xml 2007-07-08 03:05:59 UTC (rev 211) @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> <!-- - 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 @@ -100,4 +101,42 @@ </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> Modified: pal-portal/trunk/installer/maven.xml =================================================================== --- pal-portal/trunk/installer/maven.xml 2007-07-04 06:12:45 UTC (rev 210) +++ pal-portal/trunk/installer/maven.xml 2007-07-08 03:05:59 UTC (rev 211) @@ -110,7 +110,11 @@ <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" /> @@ -182,7 +186,7 @@ <zipfileset dir="${basedir}/etc/database" prefix="database" /> </zip> - <jar file="${maven.build.dir}/${dist.name.prefix}-${org.apache.jetspeed.portal.currentVersion}${build_name}-installer.jar" compress="true"> + <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" />