portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r513124 [1/2] - in /portals/jetspeed-2/trunk/installer: ./ etc/ etc/ant-installer/ etc/ant-installer/lib/ etc/ant-installer/license/ etc/ant-installer/resources/ etc/tomcat/ etc/tomcat/bin/ etc/tomcat/conf/ etc/tomcat/logs/ etc/tomcat/webap...
Date Thu, 01 Mar 2007 03:48:52 GMT
Author: ate
Date: Wed Feb 28 19:48:50 2007
New Revision: 513124

URL: http://svn.apache.org/viewvc?view=rev&rev=513124
Log:
Start of a new installer build project
This maven-1 project already produces full installer jars, but ...

   !!! IT IS NOT FINISHED YET !!!

Before building an installer (standard or demo) run from the root folder:
  maven cleanAll initMavenPlugin
  maven allBuild

To build a standard (minimal) installer run from this projects folder:
  maven build
  
To build a standard (minimal) installer run from this projects folder:
  maven buildDemo
  
Again: Don't run generated installers yet, they will bomb out!

Tomorrow, I'll finish up the installer.

Added:
    portals/jetspeed-2/trunk/installer/   (with props)
    portals/jetspeed-2/trunk/installer/etc/
    portals/jetspeed-2/trunk/installer/etc/ant-installer/
    portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config-demo.xml   (with props)
    portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config.xml   (with props)
    portals/jetspeed-2/trunk/installer/etc/ant-installer/build.xml   (with props)
    portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/
    portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/ant-installer.jar   (with props)
    portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/ant-launcher.jar   (with props)
    portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/ant.jar   (with props)
    portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/jgoodies-edited-1_2_2.jar   (with props)
    portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/xercesImpl.jar   (with props)
    portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/xml-apis.jar   (with props)
    portals/jetspeed-2/trunk/installer/etc/ant-installer/license/
    portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-dom.txt   (with props)
    portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-jgoodies.txt   (with props)
    portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-xerces.txt   (with props)
    portals/jetspeed-2/trunk/installer/etc/ant-installer/resources/
    portals/jetspeed-2/trunk/installer/etc/ant-installer/resources/apache-feather.gif   (with props)
    portals/jetspeed-2/trunk/installer/etc/ant-installer/resources/apache-portals.gif   (with props)
    portals/jetspeed-2/trunk/installer/etc/ant-installer/resources/feather-small.png   (with props)
    portals/jetspeed-2/trunk/installer/etc/ant-installer/resources/feather.png   (with props)
    portals/jetspeed-2/trunk/installer/etc/tomcat/
    portals/jetspeed-2/trunk/installer/etc/tomcat/bin/
    portals/jetspeed-2/trunk/installer/etc/tomcat/bin/catalina.bat   (with props)
    portals/jetspeed-2/trunk/installer/etc/tomcat/bin/catalina.sh   (with props)
    portals/jetspeed-2/trunk/installer/etc/tomcat/conf/
    portals/jetspeed-2/trunk/installer/etc/tomcat/conf/context.xml   (with props)
    portals/jetspeed-2/trunk/installer/etc/tomcat/conf/server.xml   (with props)
    portals/jetspeed-2/trunk/installer/etc/tomcat/conf/tomcat-users.xml   (with props)
    portals/jetspeed-2/trunk/installer/etc/tomcat/logs/
    portals/jetspeed-2/trunk/installer/etc/tomcat/logs/catalina.out
    portals/jetspeed-2/trunk/installer/etc/tomcat/webapps/
    portals/jetspeed-2/trunk/installer/etc/tomcat/webapps/ROOT/
    portals/jetspeed-2/trunk/installer/etc/tomcat/webapps/ROOT/WEB-INF/
    portals/jetspeed-2/trunk/installer/etc/tomcat/webapps/ROOT/WEB-INF/web.xml   (with props)
    portals/jetspeed-2/trunk/installer/etc/tomcat/webapps/ROOT/index.jsp
    portals/jetspeed-2/trunk/installer/maven.xml   (with props)
    portals/jetspeed-2/trunk/installer/project.xml   (with props)

Propchange: portals/jetspeed-2/trunk/installer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 28 19:48:50 2007
@@ -0,0 +1,3 @@
+resources
+target
+velocity.log*

Added: portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config-demo.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config-demo.xml?view=auto&rev=513124
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config-demo.xml (added)
+++ portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config-demo.xml Wed Feb 28 19:48:50 2007
@@ -0,0 +1,115 @@
+<?xml version="1.0"?>
+<!DOCTYPE installer PUBLIC "-//tp23 //DTD Ant Installer Config//EN"
+    "http://antinstaller.sourceforge.net/dtd/antinstall-config-0.8.dtd">
+<!--
+
+This is an example installer from which you can start a project
+Edit this file to select the properties you want decided, at the end
+of the installation screen the properties will be available in a file
+in the current directory for your ant script
+
+
+lookAndFeel="com.jgoodies.plaf.windows.ExtWindowsLookAndFeel"  - not recommended since it is not linux compatible due to Micro$oft License restrictions
+
+lookAndFeel="net.sourceforge.mlf.metouia.MetouiaLookAndFeel"  - good, and cross platform
+
+lookAndFeel="com.jgoodies.plaf.plastic.Plastic3DLookAndFeel"  - good, and cross platform
+
+lookAndFeel="com.jgoodies.plaf.plastic.PlasticXPLookAndFeel"  - good, and cross platform
+
+lookAndFeel="com.jgoodies.plaf.plastic.PlasticLookAndFeel" - good but flat, and cross platform
+-->
+
+<!--
+
+defaultImageResource,windowIcon,resource and imageResource load from the classpath
+the installer script should put the locations of these resources on the classpath
+
+-->
+<installer ui="swing,text" verbose="false"
+    lookAndFeel="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel"
+    name="Jetspeed 2.1 Installer" windowIcon="/resources/feather-small.png"
+    defaultImageResource="/resources/apache-portals.gif" minJavaVersion="1.4" wide="650:250">
+    <!--  each page element represents a page of the installer -->
+    <page type="input" name="intro" displayText="Jetspeed 2.1">
+        <comment displayText="Welcome to Jetspeed 2.1!" title="true"/>
+        <comment
+            displayText="This installer program will guide you through an install of the complete Jetspeed 2.1 Portal, including sample portal applications."/>
+    </page>
+    <!--  type="license" shows a license page to click through -->
+    <page type="license" name="license" displayText="License conditions"
+        resource="/resources/LICENSE.TXT">
+    </page>
+    <!--  type="input" shows a list of editable options for the installer -->
+    <page type="input" name="properties" displayText="Required install options">
+        <directory property="installDir" 
+            defaultValue="/usr/local/ApacheJetspeed-2.1"
+            defaultValueWin="c:/ApacheJetspeed-2.1"
+            displayText="Select an installation directory" create="true" checkExists="true"/>
+    </page>
+    <page type="input" name="requiredComponents" displayText="Required Components">
+        <comment displayText="Required Components - Click Next" bold="true"/>
+        <target displayText="Core components" target="install" defaultValue="true"
+            force="true"/>
+        <target displayText="Create Database" target="generateDb"
+            defaultValue="true" force="true"/>
+        <target displayText="Populate Database" target="populateDB"
+            defaultValue="true" force="true"/>
+        <target displayText="Layout Portlets" target="layoutPortlets"
+            defaultValue="true" force="true"/>
+        <target displayText="Portal Administration Portlets"
+            target="j2admin" defaultValue="true" force="true"/>
+        
+    </page>
+    
+    <page type="input" name="optionalPortlets" displayText="Optional Portlets">
+        
+        <comment displayText="Choose the components you want to install" bold="true"/>
+        <target displayText="Demo Portlets" target="demoPortlets"
+            defaultValue="true" force="false"/>
+        <target displayText="JPetstore Portlets" target="jpetstorePortlets"
+            defaultValue="true" force="false"/>
+        <target displayText="JSF Portlets" target="jsfPortlets" defaultValue="true"
+            force="false"/>
+        <target displayText="RSS Portlets" target="rssPortlets" defaultValue="true"
+            force="false"/>
+    </page>
+    
+    <!--  These are some other input types       -->
+        
+    <page type="input" name="databaseInfo" displayText="Database information">
+        
+        <comment
+            displayText="Please fill in the fields below with the approriate database information."/>
+        <comment  displayText=" The default values should install Apache Derby as the Database."/>
+        <large-select property="dbName" displayText="Database type" defaultValue="derby" >
+           <option text="derby"  value="derby" />
+           <option text="mysql"  value="mysql" />
+           <option text="hsql"  value="hsql" />
+           <option text="postgres"  value="postgres" />
+           <option text="sapdb"  value="sapdb" />
+           <option text="oracle"  value="oracle" />
+           <option text="mssql"  value="mssql" />
+        </large-select> 
+<!--        <text property="dbName" displayText="Database type"
+            defaultValue="derby"/>
+-->
+        <text property="dbUser" displayText="Database User Name" defaultValue=""/>
+        <text property="dbPassword" displayText="Database Password" defaultValue=""/>
+        
+        <text property="jdbcUrl" displayText="JDBC Connection String"
+            defaultValue="jdbc:derby:${installDir}/webapps/jetspeed/WEB-INF/productiondb;create=true"/>
+        <text property="jdbcDriverClass" displayText="JDBC Driver Classname"
+            defaultValue="org.apache.derby.jdbc.EmbeddedDriver"/>
+        
+        <file property="jdbcDriverJar"
+            defaultValue="${installDir}/shared/lib/derby-10.1.1.0.jar"
+            defaultValueWin="${installDir}/shared/lib/derby-10.1.1.0.jar"
+            displayText="JDBC driver" checkExists="false"/>
+        
+    </page> 
+    <!--  page type="progress" shows a progress page with the install button 
+    
+    Its target is set to cleanuptarget since it is the last page this target will be run last-->
+    <page type="progress" name="progress" displayText="Installation progress">
+    </page> </installer>

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config-demo.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config-demo.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config.xml?view=auto&rev=513124
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config.xml (added)
+++ portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config.xml Wed Feb 28 19:48:50 2007
@@ -0,0 +1,85 @@
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+  $Id$
+-->
+<?xml version="1.0"?>
+<!DOCTYPE installer PUBLIC "-//tp23 //DTD Ant Installer Config//EN"
+    "http://antinstaller.sourceforge.net/dtd/antinstall-config-0.8.dtd">
+
+<installer ui="swing,text" verbose="false" lookAndFeel="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel"
+  name="Jetspeed 2.1 Installer" windowIcon="/resources/feather-small.png"
+  defaultImageResource="/resources/apache-portals.gif" minJavaVersion="1.4" wide="650:250" antialiased="true">
+
+  <page type="input" name="intro" displayText="Jetspeed 2.1">
+    <comment displayText="Welcome to Jetspeed 2.1 Enterprise Portal!" title="true" />
+    <comment displayText="This installer program will guide you through an install of the core Jetspeed 2.1 Portal." />
+  </page>
+
+  <page type="license" name="license" displayText="License conditions" resource="/LICENSE.TXT">
+  </page>
+  
+  <page type="input" name="properties" displayText="Required install options">
+    <directory property="installDir" defaultValue="/usr/local/ApacheJetspeed-2.1"
+      defaultValueWin="c:/ApacheJetspeed-2.1" displayText="Select an installation directory" create="true"
+      checkExists="true" />
+  </page>
+  
+  <page type="input" name="requiredComponents" displayText="Required Components">
+    <comment displayText="Required Components - Click Next" bold="true" />
+    <target displayText="Core components" target="install" defaultValue="true" force="true" />
+    <target displayText="Create Database" target="generateDb" defaultValue="true" force="true" />
+    <target displayText="MinInstall" target="MinInstall" defaultValue="true" force="true" />
+    <target displayText="Populate Database" target="populateDB" defaultValue="true" force="true" />
+    <target displayText="Layout Portlets" target="layoutPortlets" defaultValue="true" force="true" />
+    <target displayText="Portal Administration Portlets" target="j2admin" defaultValue="true" force="true" />
+  </page>
+
+  <!--  These are some other input types       -->
+
+  <page type="input" name="databaseInfo" displayText="Database information">
+
+    <comment displayText="Please fill in the fields below with the approriate database information." />
+    <comment displayText=" The default values should install Apache Derby as the Database." />
+    <large-select property="dbName" displayText="Database type" defaultValue="derby">
+      <option text="derby" value="derby" />
+      <option text="mysql" value="mysql" />
+      <option text="hsql" value="hsql" />
+      <option text="postgres" value="postgres" />
+      <option text="sapdb" value="sapdb" />
+      <option text="oracle" value="oracle" />
+      <option text="mssql" value="mssql" />
+    </large-select>
+    <!--        <text property="dbName" displayText="Database type"
+      defaultValue="derby"/>
+    -->
+    <text property="dbUser" displayText="Database User Name" defaultValue="" />
+    <text property="dbPassword" displayText="Database Password" defaultValue="" />
+
+    <text property="jdbcUrl" displayText="JDBC Connection String"
+      defaultValue="jdbc:derby:${installDir}/webapps/jetspeed/WEB-INF/productiondb;create=true" />
+    <text property="jdbcDriverClass" displayText="JDBC Driver Classname"
+      defaultValue="org.apache.derby.jdbc.EmbeddedDriver" />
+
+    <file property="jdbcDriverJar" defaultValue="${installDir}/shared/lib/derby-10.1.1.0.jar"
+      defaultValueWin="${installDir}/shared/lib/derby-10.1.1.0.jar" displayText="JDBC driver" checkExists="false" />
+
+    <hidden property="dataFileDirectory" value="database/min" />
+  </page>
+  <!--  page type="progress" shows a progress page with the install button 
+    
+    Its target is set to cleanuptarget since it is the last page this target will be run last-->
+  <page type="progress" name="progress" displayText="Installation progress"></page>
+</installer>

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/antinstall-config.xml
------------------------------------------------------------------------------
    svn:keywords = Id

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

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

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

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

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/ant-installer.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/ant-launcher.jar
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/ant-launcher.jar?view=auto&rev=513124
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/ant-launcher.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/ant.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/jgoodies-edited-1_2_2.jar
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/jgoodies-edited-1_2_2.jar?view=auto&rev=513124
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/jgoodies-edited-1_2_2.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/xercesImpl.jar
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/xercesImpl.jar?view=auto&rev=513124
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/xercesImpl.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/xml-apis.jar
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/xml-apis.jar?view=auto&rev=513124
==============================================================================
Binary file - no diff available.

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/lib/xml-apis.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-dom.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-dom.txt?view=auto&rev=513124
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-dom.txt (added)
+++ portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-dom.txt Wed Feb 28 19:48:50 2007
@@ -0,0 +1,71 @@
+This license came from:
+http://www.w3.org/Consortium/Legal/copyright-software-19980720
+
+
+W3C® SOFTWARE NOTICE AND LICENSE
+Copyright © 1994-2001 World
+Wide Web Consortium, <a href="http://www.w3.org/">World
+Wide Web Consortium</a>, (<a href=
+"http://www.lcs.mit.edu/">Massachusetts Institute of
+Technology</a>, <a href="http://www.inria.fr/">Institut National de
+Recherche en Informatique et en Automatique</a>, <a href=
+"http://www.keio.ac.jp/">Keio University</a>). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/
+
+This W3C work (including software, documents, or other related
+items) is being provided by the copyright holders under the
+following license. By obtaining, using and/or copying this work,
+you (the licensee) agree that you have read, understood, and will
+comply with the following terms and conditions:
+Permission to use, copy, modify, and distribute this software
+and its documentation, with or without modification,  for any
+purpose and without fee or royalty is hereby granted, provided that
+you include the following on ALL copies of the software and
+documentation or portions thereof, including modifications, that
+you make:
+
+The full text of this NOTICE in a location viewable to users of
+the redistributed or derivative work.
+
+Any pre-existing intellectual property disclaimers, notices, or
+terms and conditions. If none exist, a short notice of the
+following form (hypertext is preferred, text is permitted) should
+be used within the body of any redistributed or derivative code:
+"Copyright © [$date-of-software] World Wide Web Consortium, (Massachusetts Institute of
+Technology, Institut National de
+Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.
+http://www.w3.org/Consortium/Legal/"
+
+Notice of any changes or modifications to the W3C files,
+including the date changes were made. (We recommend you provide 
+URIs to the location from which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND
+COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
+MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
+USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
+PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
+SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
+SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in
+advertising or publicity pertaining to the software without
+specific, written prior permission. Title to copyright in this
+software and any associated documentation will at all times remain
+with copyright holders.
+____________________________________
+This formulation of W3C's notice and license became active on
+August 14 1998 so as to improve compatibility with GPL. This
+version ensures that W3C software licensing terms are no more
+restrictive than GPL and consequently W3C software may be
+distributed in GPL packages. See the older formulation for the
+policy prior to this date. Please see our Copyright FAQ for common 
+questions about using materials from
+our site, including specific terms and conditions for packages like
+libwww, Amaya, and Jigsaw. 
+Other questions about this notice can be
+directed to site-policy@w3.org.
+
+webmaster

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-dom.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-dom.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-jgoodies.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-jgoodies.txt?view=auto&rev=513124
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-jgoodies.txt (added)
+++ portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-jgoodies.txt Wed Feb 28 19:48:50 2007
@@ -0,0 +1,31 @@
+
+           The BSD License for the JGoodies Looks
+           ======================================
+
+Copyright (c) 2001-2004 JGoodies Karsten Lentzsch. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+ o Redistributions of source code must retain the above copyright notice, 
+   this list of conditions and the following disclaimer. 
+    
+ o Redistributions in binary form must reproduce the above copyright notice, 
+   this list of conditions and the following disclaimer in the documentation 
+   and/or other materials provided with the distribution. 
+    
+ o Neither the name of JGoodies Karsten Lentzsch nor the names of 
+   its contributors may be used to endorse or promote products derived 
+   from this software without specific prior written permission. 
+    
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR 
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-jgoodies.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-jgoodies.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-xerces.txt
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-xerces.txt?view=auto&rev=513124
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-xerces.txt (added)
+++ portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-xerces.txt Wed Feb 28 19:48:50 2007
@@ -0,0 +1,56 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights 
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:  
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Xerces" and "Apache Software Foundation" must
+ *    not be used to endorse or promote products derived from this
+ *    software without prior written permission. For written 
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    nor may "Apache" appear in their name, without prior written
+ *    permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation and was
+ * originally based on software copyright (c) 1999, International
+ * Business Machines, Inc., http://www.ibm.com.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-xerces.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/license/LICENSE-xerces.txt
------------------------------------------------------------------------------
    svn:keywords = Id

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

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/resources/apache-feather.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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

Propchange: portals/jetspeed-2/trunk/installer/etc/ant-installer/resources/apache-portals.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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

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

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

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

Added: portals/jetspeed-2/trunk/installer/etc/tomcat/bin/catalina.bat
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/tomcat/bin/catalina.bat?view=auto&rev=513124
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/tomcat/bin/catalina.bat (added)
+++ portals/jetspeed-2/trunk/installer/etc/tomcat/bin/catalina.bat Wed Feb 28 19:48:50 2007
@@ -0,0 +1,208 @@
+@echo off
+if "%OS%" == "Windows_NT" setlocal
+rem ---------------------------------------------------------------------------
+rem Start/Stop Script for the CATALINA Server
+rem
+rem Environment Variable Prequisites
+rem
+rem   CATALINA_HOME   May point at your Catalina "build" directory.
+rem
+rem   CATALINA_BASE   (Optional) Base directory for resolving dynamic portions
+rem                   of a Catalina installation.  If not present, resolves to
+rem                   the same directory that CATALINA_HOME points to.
+rem
+rem   CATALINA_OPTS   (Optional) Java runtime options used when the "start",
+rem                   "stop", or "run" command is executed.
+rem
+rem   CATALINA_TMPDIR (Optional) Directory path location of temporary directory
+rem                   the JVM should use (java.io.tmpdir).  Defaults to
+rem                   %CATALINA_BASE%\temp.
+rem
+rem   JAVA_HOME       Must point at your Java Development Kit installation.
+rem                   Required to run the with the "debug" argument.
+rem
+rem   JRE_HOME        Must point at your Java Development Kit installation.
+rem                   Defaults to JAVA_HOME if empty.
+rem
+rem   JAVA_OPTS       (Optional) Java runtime options used when the "start",
+rem                   "stop", or "run" command is executed.
+rem
+rem   JSSE_HOME       (Optional) May point at your Java Secure Sockets Extension
+rem                   (JSSE) installation, whose JAR files will be added to the
+rem                   system class path used to start Tomcat.
+rem
+rem   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
+rem                   command is executed. The default is "dt_shmem".
+rem
+rem   JPDA_ADDRESS    (Optional) Java runtime options used when the "jpda start"
+rem                   command is executed. The default is "jdbconn".
+rem
+rem $Id: catalina.bat 355227 2005-12-08 21:44:16Z keith $
+rem ---------------------------------------------------------------------------
+
+set JAVA_OPTS=%JAVA_OPTS% -Xmx256m
+
+rem Guess CATALINA_HOME if not defined
+set CURRENT_DIR=%cd%
+if not "%CATALINA_HOME%" == "" goto gotHome
+set CATALINA_HOME=%CURRENT_DIR%
+if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
+cd ..
+set CATALINA_HOME=%cd%
+cd %CURRENT_DIR%
+:gotHome
+if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
+echo The CATALINA_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
+goto end
+:okHome
+
+rem Get standard environment variables
+if exist "%CATALINA_HOME%\bin\setenv.bat" call "%CATALINA_HOME%\bin\setenv.bat"
+
+rem Get standard Java environment variables
+if exist "%CATALINA_HOME%\bin\setclasspath.bat" goto okSetclasspath
+echo Cannot find %CATALINA_HOME%\bin\setclasspath.bat
+echo This file is needed to run this program
+goto end
+:okSetclasspath
+set BASEDIR=%CATALINA_HOME%
+call "%CATALINA_HOME%\bin\setclasspath.bat" %1
+if errorlevel 1 goto end
+
+rem Add on extra jar files to CLASSPATH
+if "%JSSE_HOME%" == "" goto noJsse
+set CLASSPATH=%CLASSPATH%;%JSSE_HOME%\lib\jcert.jar;%JSSE_HOME%\lib\jnet.jar;%JSSE_HOME%\lib\jsse.jar
+:noJsse
+set CLASSPATH=%CLASSPATH%;%CATALINA_HOME%\bin\bootstrap.jar
+
+if not "%CATALINA_BASE%" == "" goto gotBase
+set CATALINA_BASE=%CATALINA_HOME%
+:gotBase
+
+if not "%CATALINA_TMPDIR%" == "" goto gotTmpdir
+set CATALINA_TMPDIR=%CATALINA_BASE%\temp
+:gotTmpdir
+
+if not exist "%CATALINA_HOME%\bin\tomcat-juli.jar" goto noJuli
+set JAVA_OPTS=%JAVA_OPTS% -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager -Djava.util.logging.config.file="%CATALINA_BASE%\conf\logging.properties"
+:noJuli
+
+rem ----- Execute The Requested Command ---------------------------------------
+
+echo Using CATALINA_BASE:   %CATALINA_BASE%
+echo Using CATALINA_HOME:   %CATALINA_HOME%
+echo Using CATALINA_TMPDIR: %CATALINA_TMPDIR%
+if ""%1"" == ""debug"" goto use_jdk
+echo Using JRE_HOME:        %JRE_HOME%
+goto java_dir_displayed
+:use_jdk
+echo Using JAVA_HOME:       %JAVA_HOME%
+:java_dir_displayed
+
+set _EXECJAVA=%_RUNJAVA%
+set MAINCLASS=org.apache.catalina.startup.Bootstrap
+set ACTION=start
+set SECURITY_POLICY_FILE=
+set DEBUG_OPTS=
+set JPDA=
+
+if not ""%1"" == ""jpda"" goto noJpda
+set JPDA=jpda
+if not "%JPDA_TRANSPORT%" == "" goto gotJpdaTransport
+set JPDA_TRANSPORT=dt_shmem
+:gotJpdaTransport
+if not "%JPDA_ADDRESS%" == "" goto gotJpdaAddress
+set JPDA_ADDRESS=jdbconn
+:gotJpdaAddress
+shift
+:noJpda
+
+if ""%1"" == ""debug"" goto doDebug
+if ""%1"" == ""run"" goto doRun
+if ""%1"" == ""start"" goto doStart
+if ""%1"" == ""stop"" goto doStop
+if ""%1"" == ""version"" goto doVersion
+
+echo Usage:  catalina ( commands ... )
+echo commands:
+echo   debug             Start Catalina in a debugger
+echo   debug -security   Debug Catalina with a security manager
+echo   jpda start        Start Catalina under JPDA debugger
+echo   run               Start Catalina in the current window
+echo   run -security     Start in the current window with security manager
+echo   start             Start Catalina in a separate window
+echo   start -security   Start in a separate window with security manager
+echo   stop              Stop Catalina
+echo   version           What version of tomcat are you running?
+goto end
+
+:doDebug
+shift
+set _EXECJAVA=%_RUNJDB%
+set DEBUG_OPTS=-sourcepath "%CATALINA_HOME%\..\..\jakarta-tomcat-catalina\catalina\src\share"
+if not ""%1"" == ""-security"" goto execCmd
+shift
+echo Using Security Manager
+set SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy
+goto execCmd
+
+:doRun
+shift
+if not ""%1"" == ""-security"" goto execCmd
+shift
+echo Using Security Manager
+set SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy
+goto execCmd
+
+:doStart
+shift
+if not "%OS%" == "Windows_NT" goto noTitle
+set _EXECJAVA=start "Tomcat" %_RUNJAVA%
+goto gotTitle
+:noTitle
+set _EXECJAVA=start %_RUNJAVA%
+:gotTitle
+if not ""%1"" == ""-security"" goto execCmd
+shift
+echo Using Security Manager
+set SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy
+goto execCmd
+
+:doStop
+shift
+set ACTION=stop
+goto execCmd
+
+:doVersion
+%_EXECJAVA% -classpath "%CATALINA_HOME%\server\lib\catalina.jar" org.apache.catalina.util.ServerInfo
+goto end
+
+
+:execCmd
+rem Get remaining unshifted command line arguments and save them in the
+set CMD_LINE_ARGS=
+:setArgs
+if ""%1""=="""" goto doneSetArgs
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto setArgs
+:doneSetArgs
+
+rem Execute Java with the applicable properties
+if not "%JPDA%" == "" goto doJpda
+if not "%SECURITY_POLICY_FILE%" == "" goto doSecurity
+%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
+goto end
+:doSecurity
+%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% %DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
+goto end
+:doJpda
+if not "%SECURITY_POLICY_FILE%" == "" goto doSecurityJpda
+%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug -Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n %DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
+goto end
+:doSecurityJpda
+%_EXECJAVA% %JAVA_OPTS% %CATALINA_OPTS% -Xdebug -Xrunjdwp:transport=%JPDA_TRANSPORT%,address=%JPDA_ADDRESS%,server=y,suspend=n %DEBUG_OPTS% -Djava.endorsed.dirs="%JAVA_ENDORSED_DIRS%" -classpath "%CLASSPATH%" -Djava.security.manager -Djava.security.policy=="%SECURITY_POLICY_FILE%" -Dcatalina.base="%CATALINA_BASE%" -Dcatalina.home="%CATALINA_HOME%" -Djava.io.tmpdir="%CATALINA_TMPDIR%" %MAINCLASS% %CMD_LINE_ARGS% %ACTION%
+goto end
+
+:end

Propchange: portals/jetspeed-2/trunk/installer/etc/tomcat/bin/catalina.bat
------------------------------------------------------------------------------
    svn:eol-style = CRLF

Added: portals/jetspeed-2/trunk/installer/etc/tomcat/bin/catalina.sh
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/tomcat/bin/catalina.sh?view=auto&rev=513124
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/tomcat/bin/catalina.sh (added)
+++ portals/jetspeed-2/trunk/installer/etc/tomcat/bin/catalina.sh Wed Feb 28 19:48:50 2007
@@ -0,0 +1,325 @@
+#!/bin/sh
+# -----------------------------------------------------------------------------
+# Start/Stop Script for the CATALINA Server
+#
+# Environment Variable Prequisites
+#
+#   CATALINA_HOME   May point at your Catalina "build" directory.
+#
+#   CATALINA_BASE   (Optional) Base directory for resolving dynamic portions
+#                   of a Catalina installation.  If not present, resolves to
+#                   the same directory that CATALINA_HOME points to.
+#
+#   CATALINA_OPTS   (Optional) Java runtime options used when the "start",
+#                   "stop", or "run" command is executed.
+#
+#   CATALINA_TMPDIR (Optional) Directory path location of temporary directory
+#                   the JVM should use (java.io.tmpdir).  Defaults to
+#                   $CATALINA_BASE/temp.
+#
+#   JAVA_HOME       Must point at your Java Development Kit installation.
+#                   Required to run the with the "debug" or "javac" argument.
+#
+#   JRE_HOME        Must point at your Java Development Kit installation.
+#                   Defaults to JAVA_HOME if empty.
+#
+#   JAVA_OPTS       (Optional) Java runtime options used when the "start",
+#                   "stop", or "run" command is executed.
+#
+#   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
+#                   command is executed. The default is "dt_socket".
+#
+#   JPDA_ADDRESS    (Optional) Java runtime options used when the "jpda start"
+#                   command is executed. The default is 8000.
+#
+#   JSSE_HOME       (Optional) May point at your Java Secure Sockets Extension
+#                   (JSSE) installation, whose JAR files will be added to the
+#                   system class path used to start Tomcat.
+#
+#   CATALINA_PID    (Optional) Path of the file which should contains the pid
+#                   of catalina startup java process, when start (fork) is used
+#
+# $Id: catalina.sh 394120 2006-04-14 15:25:07Z yoavs $
+# -----------------------------------------------------------------------------
+
+JAVA_OPTS="$JAVA_OPTS "-Xmx256m
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false
+os400=false
+darwin=false
+case "`uname`" in
+CYGWIN*) cygwin=true;;
+OS400*) os400=true;;
+Darwin*) darwin=true;;
+esac
+
+# resolve links - $0 may be a softlink
+PRG="$0"
+
+while [ -h "$PRG" ]; do
+  ls=`ls -ld "$PRG"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    PRG="$link"
+  else
+    PRG=`dirname "$PRG"`/"$link"
+  fi
+done
+
+# Get standard environment variables
+PRGDIR=`dirname "$PRG"`
+
+# Only set CATALINA_HOME if not already set
+[ -z "$CATALINA_HOME" ] && CATALINA_HOME=`cd "$PRGDIR/.." ; pwd`
+
+if [ -r "$CATALINA_HOME"/bin/setenv.sh ]; then
+  . "$CATALINA_HOME"/bin/setenv.sh
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin; then
+  [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
+  [ -n "$CATALINA_HOME" ] && CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"`
+  [ -n "$CATALINA_BASE" ] && CATALINA_BASE=`cygpath --unix "$CATALINA_BASE"`
+  [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+  [ -n "$JSSE_HOME" ] && JSSE_HOME=`cygpath --absolute --unix "$JSSE_HOME"`
+fi
+
+# For OS400
+if $os400; then
+  # Set job priority to standard for interactive (interactive - 6) by using
+  # the interactive priority - 6, the helper threads that respond to requests
+  # will be running at the same priority as interactive jobs.
+  COMMAND='chgjob job('$JOBNAME') runpty(6)'
+  system $COMMAND
+
+  # Enable multi threading
+  export QIBM_MULTI_THREADED=Y
+fi
+
+# Get standard Java environment variables
+if $os400; then
+  # -r will Only work on the os400 if the files are:
+  # 1. owned by the user
+  # 2. owned by the PRIMARY group of the user
+  # this will not work if the user belongs in secondary groups
+  BASEDIR="$CATALINA_HOME"
+  . "$CATALINA_HOME"/bin/setclasspath.sh 
+else
+  if [ -r "$CATALINA_HOME"/bin/setclasspath.sh ]; then
+    BASEDIR="$CATALINA_HOME"
+    . "$CATALINA_HOME"/bin/setclasspath.sh
+  else
+    echo "Cannot find $CATALINA_HOME/bin/setclasspath.sh"
+    echo "This file is needed to run this program"
+    exit 1
+  fi
+fi
+
+# Add on extra jar files to CLASSPATH
+if [ -n "$JSSE_HOME" ]; then
+  CLASSPATH="$CLASSPATH":"$JSSE_HOME"/lib/jcert.jar:"$JSSE_HOME"/lib/jnet.jar:"$JSSE_HOME"/lib/jsse.jar
+fi
+CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar
+
+if [ -z "$CATALINA_BASE" ] ; then
+  CATALINA_BASE="$CATALINA_HOME"
+fi
+
+if [ -z "$CATALINA_TMPDIR" ] ; then
+  # Define the java.io.tmpdir to use for Catalina
+  CATALINA_TMPDIR="$CATALINA_BASE"/temp
+fi
+
+# Bugzilla 37848: When no TTY is available, don't output to console
+have_tty=0
+if [ "`tty`" != "not a tty" ]; then
+    have_tty=1
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
+  JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"`
+  CATALINA_HOME=`cygpath --absolute --windows "$CATALINA_HOME"`
+  CATALINA_BASE=`cygpath --absolute --windows "$CATALINA_BASE"`
+  CATALINA_TMPDIR=`cygpath --absolute --windows "$CATALINA_TMPDIR"`
+  CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$JSSE_HOME" ] && JSSE_HOME=`cygpath --absolute --windows "$JSSE_HOME"`
+  JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
+fi
+
+# Set juli LogManager if it is present
+if [ -r "$CATALINA_HOME"/bin/tomcat-juli.jar ]; then
+  JAVA_OPTS="$JAVA_OPTS "-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" "-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
+fi
+
+# ----- Execute The Requested Command -----------------------------------------
+
+# Bugzilla 37848: only output this if we have a TTY
+if [ $have_tty -eq 1 ]; then
+  echo "Using CATALINA_BASE:   $CATALINA_BASE"
+  echo "Using CATALINA_HOME:   $CATALINA_HOME"
+  echo "Using CATALINA_TMPDIR: $CATALINA_TMPDIR"
+  if [ "$1" = "debug" -o "$1" = "javac" ] ; then
+    echo "Using JAVA_HOME:       $JAVA_HOME"
+  else
+    echo "Using JRE_HOME:       $JRE_HOME"
+  fi
+fi
+
+if [ "$1" = "jpda" ] ; then
+  if [ -z "$JPDA_TRANSPORT" ]; then
+    JPDA_TRANSPORT="dt_socket"
+  fi
+  if [ -z "$JPDA_ADDRESS" ]; then
+    JPDA_ADDRESS="8000"
+  fi
+  if [ -z "$JPDA_OPTS" ]; then
+    JPDA_OPTS="-Xdebug -Xrunjdwp:transport=$JPDA_TRANSPORT,address=$JPDA_ADDRESS,server=y,suspend=n"
+  fi
+  CATALINA_OPTS="$CATALINA_OPTS $JPDA_OPTS"
+  shift
+fi
+
+if [ "$1" = "debug" ] ; then
+  if $os400; then
+    echo "Debug command not available on OS400"
+    exit 1
+  else
+    shift
+    if [ "$1" = "-security" ] ; then
+      echo "Using Security Manager"
+      shift
+      exec "$_RUNJDB" $JAVA_OPTS $CATALINA_OPTS \
+        -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
+        -sourcepath "$CATALINA_HOME"/../../jakarta-tomcat-catalina/catalina/src/share \
+        -Djava.security.manager \
+        -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
+        -Dcatalina.base="$CATALINA_BASE" \
+        -Dcatalina.home="$CATALINA_HOME" \
+        -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+        org.apache.catalina.startup.Bootstrap "$@" start
+    else
+      exec "$_RUNJDB" $JAVA_OPTS $CATALINA_OPTS \
+        -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
+        -sourcepath "$CATALINA_HOME"/../../jakarta-tomcat-catalina/catalina/src/share \
+        -Dcatalina.base="$CATALINA_BASE" \
+        -Dcatalina.home="$CATALINA_HOME" \
+        -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+        org.apache.catalina.startup.Bootstrap "$@" start
+    fi
+  fi
+
+elif [ "$1" = "run" ]; then
+
+  shift
+  if [ "$1" = "-security" ] ; then
+    echo "Using Security Manager"
+    shift
+    exec "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
+      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
+      -Djava.security.manager \
+      -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
+      -Dcatalina.base="$CATALINA_BASE" \
+      -Dcatalina.home="$CATALINA_HOME" \
+      -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+      org.apache.catalina.startup.Bootstrap "$@" start
+  else
+    exec "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
+      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
+      -Dcatalina.base="$CATALINA_BASE" \
+      -Dcatalina.home="$CATALINA_HOME" \
+      -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+      org.apache.catalina.startup.Bootstrap "$@" start
+  fi
+
+elif [ "$1" = "start" ] ; then
+
+  shift
+  touch "$CATALINA_BASE"/logs/catalina.out
+  if [ "$1" = "-security" ] ; then
+    echo "Using Security Manager"
+    shift
+    "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
+      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
+      -Djava.security.manager \
+      -Djava.security.policy=="$CATALINA_BASE"/conf/catalina.policy \
+      -Dcatalina.base="$CATALINA_BASE" \
+      -Dcatalina.home="$CATALINA_HOME" \
+      -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+      org.apache.catalina.startup.Bootstrap "$@" start \
+      >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
+
+      if [ ! -z "$CATALINA_PID" ]; then
+        echo $! > $CATALINA_PID
+      fi
+  else
+    "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
+      -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
+      -Dcatalina.base="$CATALINA_BASE" \
+      -Dcatalina.home="$CATALINA_HOME" \
+      -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+      org.apache.catalina.startup.Bootstrap "$@" start \
+      >> "$CATALINA_BASE"/logs/catalina.out 2>&1 &
+
+      if [ ! -z "$CATALINA_PID" ]; then
+        echo $! > $CATALINA_PID
+      fi
+  fi
+
+elif [ "$1" = "stop" ] ; then
+
+  shift
+  FORCE=0
+  if [ "$1" = "-force" ]; then
+    shift
+    FORCE=1
+  fi
+
+  "$_RUNJAVA" $JAVA_OPTS $CATALINA_OPTS \
+    -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \
+    -Dcatalina.base="$CATALINA_BASE" \
+    -Dcatalina.home="$CATALINA_HOME" \
+    -Djava.io.tmpdir="$CATALINA_TMPDIR" \
+    org.apache.catalina.startup.Bootstrap "$@" stop
+
+  if [ $FORCE -eq 1 ]; then
+    if [ ! -z "$CATALINA_PID" ]; then
+       echo "Killing: `cat $CATALINA_PID`"
+       kill -9 `cat $CATALINA_PID`
+    else
+       echo "Kill failed: \$CATALINA_PID not set"
+    fi
+  fi
+
+elif [ "$1" = "version" ] ; then
+
+    "$_RUNJAVA"   \
+      -classpath "$CATALINA_HOME/server/lib/catalina.jar" \
+      org.apache.catalina.util.ServerInfo
+
+else
+
+  echo "Usage: catalina.sh ( commands ... )"
+  echo "commands:"
+  if $os400; then
+    echo "  debug             Start Catalina in a debugger (not available on OS400)"
+    echo "  debug -security   Debug Catalina with a security manager (not available on OS400)"
+  else
+    echo "  debug             Start Catalina in a debugger"
+    echo "  debug -security   Debug Catalina with a security manager"
+  fi
+  echo "  jpda start        Start Catalina under JPDA debugger"
+  echo "  run               Start Catalina in the current window"
+  echo "  run -security     Start in the current window with security manager"
+  echo "  start             Start Catalina in a separate window"
+  echo "  start -security   Start in a separate window with security manager"
+  echo "  stop              Stop Catalina"
+  echo "  stop -force       Stop Catalina (followed by kill -KILL)"
+  echo "  version           What version of tomcat are you running?"
+  exit 1
+
+fi

Propchange: portals/jetspeed-2/trunk/installer/etc/tomcat/bin/catalina.sh
------------------------------------------------------------------------------
    svn:eol-style = LF

Propchange: portals/jetspeed-2/trunk/installer/etc/tomcat/bin/catalina.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: portals/jetspeed-2/trunk/installer/etc/tomcat/conf/context.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/tomcat/conf/context.xml?view=auto&rev=513124
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/tomcat/conf/context.xml (added)
+++ portals/jetspeed-2/trunk/installer/etc/tomcat/conf/context.xml Wed Feb 28 19:48:50 2007
@@ -0,0 +1,12 @@
+<!-- The contents of this file will be loaded for each web application -->
+<Context antiJARLocking="true>
+
+    <!-- Default set of monitored resources -->
+    <WatchedResource>WEB-INF/web.xml</WatchedResource>
+	
+    <!-- Uncomment this to disable session persistence across Tomcat restarts -->
+    
+    <Manager pathname="" />
+    
+
+</Context>

Propchange: portals/jetspeed-2/trunk/installer/etc/tomcat/conf/context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/installer/etc/tomcat/conf/context.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/trunk/installer/etc/tomcat/conf/server.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/tomcat/conf/server.xml?view=auto&rev=513124
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/tomcat/conf/server.xml (added)
+++ portals/jetspeed-2/trunk/installer/etc/tomcat/conf/server.xml Wed Feb 28 19:48:50 2007
@@ -0,0 +1,366 @@
+<!-- Example Server Configuration File -->
+<!-- Note that component elements are nested corresponding to their
+     parent-child relationships with each other -->
+
+<!-- A "Server" is a singleton element that represents the entire JVM,
+     which may contain one or more "Service" instances.  The Server
+     listens for a shutdown command on the indicated port.
+
+     Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" or "Loggers" at this level.
+ -->
+
+<Server port="8005" shutdown="SHUTDOWN">
+
+  <!-- Comment these entries out to disable JMX MBeans support used for the 
+       administration web application -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" />
+  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>
+
+  <!-- Global JNDI resources -->
+  <GlobalNamingResources>
+
+    <!-- Test entry for demonstration purposes -->
+    <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
+
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+       description="User database that can be updated and saved"
+           factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+          pathname="conf/tomcat-users.xml" />
+
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" (and therefore the web applications visible
+       within that Container).  Normally, that Container is an "Engine",
+       but this is not required.
+
+       Note:  A "Service" is not itself a "Container", so you may not
+       define subcomponents such as "Valves" or "Loggers" at this level.
+   -->
+
+  <!-- Define the Tomcat Stand-Alone Service -->
+  <Service name="Catalina">
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned.  Each Connector passes requests on to the
+         associated "Container" (normally an Engine) for processing.
+
+         By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
+         You can also enable an SSL HTTP/1.1 Connector on port 8443 by
+         following the instructions below and uncommenting the second Connector
+         entry.  SSL support requires the following steps (see the SSL Config
+         HOWTO in the Tomcat 5 documentation bundle for more detailed
+         instructions):
+         * If your JDK version 1.3 or prior, download and install JSSE 1.0.2 or
+           later, and put the JAR files into "$JAVA_HOME/jre/lib/ext".
+         * Execute:
+             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
+             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
+           with a password value of "changeit" for both the certificate and
+           the keystore itself.
+
+         By default, DNS lookups are enabled when a web application calls
+         request.getRemoteHost().  This can have an adverse impact on
+         performance, so you can disable it by setting the
+         "enableLookups" attribute to "false".  When DNS lookups are disabled,
+         request.getRemoteHost() will return the String version of the
+         IP address of the remote client.
+    -->
+
+    <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
+    <Connector port="8080" maxHttpHeaderSize="8192"
+               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+               enableLookups="false" redirectPort="8443" acceptCount="100"
+               connectionTimeout="20000" disableUploadTimeout="true" />
+    <!-- Note : To disable connection timeouts, set connectionTimeout value
+     to 0 -->
+	
+	<!-- Note : To use gzip compression you could set the following properties :
+	
+			   compression="on" 
+			   compressionMinSize="2048" 
+			   noCompressionUserAgents="gozilla, traviata" 
+			   compressableMimeType="text/html,text/xml"
+	-->
+
+    <!-- Define a SSL HTTP/1.1 Connector on port 8443 -->
+    <!--
+    <Connector port="8443" maxHttpHeaderSize="8192"
+               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+               enableLookups="false" disableUploadTimeout="true"
+               acceptCount="100" scheme="https" secure="true"
+               clientAuth="false" sslProtocol="TLS" />
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <Connector port="8009" 
+               enableLookups="false" redirectPort="8443" protocol="AJP/1.3" />
+
+    <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
+    <!-- See proxy documentation for more information about using this. -->
+    <!--
+    <Connector port="8082" 
+               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+               enableLookups="false" acceptCount="100" connectionTimeout="20000"
+               proxyPort="80" disableUploadTimeout="true" />
+    -->
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host). -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">         
+    --> 
+         
+    <!-- Define the top level container in our container hierarchy -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!-- The request dumper valve dumps useful debugging information about
+           the request headers and cookies that were received, and the response
+           headers and cookies that were sent, for all requests received by
+           this instance of Tomcat.  If you care only about requests to a
+           particular virtual host, or a particular application, nest this
+           element inside the corresponding <Host> or <Context> entry instead.
+
+           For a similar mechanism that is portable to all Servlet 2.4
+           containers, check out the "RequestDumperFilter" Filter in the
+           example application (the source for this filter may be found in
+           "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
+
+           Request dumping is disabled by default.  Uncomment the following
+           element to enable it. -->
+      <!--
+      <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
+      -->
+
+      <!-- Because this Realm is here, an instance will be shared globally -->
+
+      <!-- This Realm uses the UserDatabase configured in the global JNDI
+           resources under the key "UserDatabase".  Any edits
+           that are performed against this UserDatabase are immediately
+           available for use by the Realm.  -->
+      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+             resourceName="UserDatabase"/>
+
+      <!-- Comment out the old realm but leave here for now in case we
+           need to go back quickly -->
+      <!--
+      <Realm className="org.apache.catalina.realm.MemoryRealm" />
+      -->
+
+      <!-- Replace the above Realm with one of the following to get a Realm
+           stored in a database and accessed via JDBC -->
+
+      <!--
+      <Realm  className="org.apache.catalina.realm.JDBCRealm"
+             driverName="org.gjt.mm.mysql.Driver"
+          connectionURL="jdbc:mysql://localhost/authority"
+         connectionName="test" connectionPassword="test"
+              userTable="users" userNameCol="user_name" userCredCol="user_pass"
+          userRoleTable="user_roles" roleNameCol="role_name" />
+      -->
+
+      <!--
+      <Realm  className="org.apache.catalina.realm.JDBCRealm"
+             driverName="oracle.jdbc.driver.OracleDriver"
+          connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL"
+         connectionName="scott" connectionPassword="tiger"
+              userTable="users" userNameCol="user_name" userCredCol="user_pass"
+          userRoleTable="user_roles" roleNameCol="role_name" />
+      -->
+
+      <!--
+      <Realm  className="org.apache.catalina.realm.JDBCRealm"
+             driverName="sun.jdbc.odbc.JdbcOdbcDriver"
+          connectionURL="jdbc:odbc:CATALINA"
+              userTable="users" userNameCol="user_name" userCredCol="user_pass"
+          userRoleTable="user_roles" roleNameCol="role_name" />
+      -->
+
+      <!-- Define the default virtual host
+           Note: XML Schema validation will not work with Xerces 2.2.
+       -->
+      <Host name="localhost" appBase="webapps"
+       unpackWARs="true" autoDeploy="true"
+       xmlValidation="false" xmlNamespaceAware="false">
+
+        <!-- Defines a cluster for this node,
+             By defining this element, means that every manager will be changed.
+             So when running a cluster, only make sure that you have webapps in there
+             that need to be clustered and remove the other ones.
+             A cluster has the following parameters:
+
+             className = the fully qualified name of the cluster class
+
+             clusterName = a descriptive name for your cluster, can be anything
+
+             mcastAddr = the multicast address, has to be the same for all the nodes
+
+             mcastPort = the multicast port, has to be the same for all the nodes
+             
+             mcastBindAddress = bind the multicast socket to a specific address
+             
+             mcastTTL = the multicast TTL if you want to limit your broadcast
+             
+             mcastSoTimeout = the multicast readtimeout 
+
+             mcastFrequency = the number of milliseconds in between sending a "I'm alive" heartbeat
+
+             mcastDropTime = the number a milliseconds before a node is considered "dead" if no heartbeat is received
+
+             tcpThreadCount = the number of threads to handle incoming replication requests, optimal would be the same amount of threads as nodes 
+
+             tcpListenAddress = the listen address (bind address) for TCP cluster request on this host, 
+                                in case of multiple ethernet cards.
+                                auto means that address becomes
+                                InetAddress.getLocalHost().getHostAddress()
+
+             tcpListenPort = the tcp listen port
+
+             tcpSelectorTimeout = the timeout (ms) for the Selector.select() method in case the OS
+                                  has a wakup bug in java.nio. Set to 0 for no timeout
+
+             printToScreen = true means that managers will also print to std.out
+
+             expireSessionsOnShutdown = true means that 
+
+             useDirtyFlag = true means that we only replicate a session after setAttribute,removeAttribute has been called.
+                            false means to replicate the session after each request.
+                            false means that replication would work for the following piece of code: (only for SimpleTcpReplicationManager)
+                            <%
+                            HashMap map = (HashMap)session.getAttribute("map");
+                            map.put("key","value");
+                            %>
+             replicationMode = can be either 'pooled', 'synchronous' or 'asynchronous'.
+                               * Pooled means that the replication happens using several sockets in a synchronous way. Ie, the data gets replicated, then the request return. This is the same as the 'synchronous' setting except it uses a pool of sockets, hence it is multithreaded. This is the fastest and safest configuration. To use this, also increase the nr of tcp threads that you have dealing with replication.
+                               * Synchronous means that the thread that executes the request, is also the
+                               thread the replicates the data to the other nodes, and will not return until all
+                               nodes have received the information.
+                               * Asynchronous means that there is a specific 'sender' thread for each cluster node,
+                               so the request thread will queue the replication request into a "smart" queue,
+                               and then return to the client.
+                               The "smart" queue is a queue where when a session is added to the queue, and the same session
+                               already exists in the queue from a previous request, that session will be replaced
+                               in the queue instead of replicating two requests. This almost never happens, unless there is a 
+                               large network delay.
+        -->             
+        <!--
+            When configuring for clustering, you also add in a valve to catch all the requests
+            coming in, at the end of the request, the session may or may not be replicated.
+            A session is replicated if and only if all the conditions are met:
+            1. useDirtyFlag is true or setAttribute or removeAttribute has been called AND
+            2. a session exists (has been created)
+            3. the request is not trapped by the "filter" attribute
+
+            The filter attribute is to filter out requests that could not modify the session,
+            hence we don't replicate the session after the end of this request.
+            The filter is negative, ie, anything you put in the filter, you mean to filter out,
+            ie, no replication will be done on requests that match one of the filters.
+            The filter attribute is delimited by ;, so you can't escape out ; even if you wanted to.
+
+            filter=".*\.gif;.*\.js;" means that we will not replicate the session after requests with the URI
+            ending with .gif and .js are intercepted.
+            
+            The deployer element can be used to deploy apps cluster wide.
+            Currently the deployment only deploys/undeploys to working members in the cluster
+            so no WARs are copied upons startup of a broken node.
+            The deployer watches a directory (watchDir) for WAR files when watchEnabled="true"
+            When a new war file is added the war gets deployed to the local instance,
+            and then deployed to the other instances in the cluster.
+            When a war file is deleted from the watchDir the war is undeployed locally 
+            and cluster wide
+        -->
+        
+        <!--
+        <Cluster className="org.apache.catalina.cluster.tcp.SimpleTcpCluster"
+                 managerClassName="org.apache.catalina.cluster.session.DeltaManager"
+                 expireSessionsOnShutdown="false"
+                 useDirtyFlag="true"
+                 notifyListenersOnReplication="true">
+
+            <Membership 
+                className="org.apache.catalina.cluster.mcast.McastService"
+                mcastAddr="228.0.0.4"
+                mcastPort="45564"
+                mcastFrequency="500"
+                mcastDropTime="3000"/>
+
+            <Receiver 
+                className="org.apache.catalina.cluster.tcp.ReplicationListener"
+                tcpListenAddress="auto"
+                tcpListenPort="4001"
+                tcpSelectorTimeout="100"
+                tcpThreadCount="6"/>
+
+            <Sender
+                className="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
+                replicationMode="pooled"
+                ackTimeout="15000"
+                waitForAck="true"/>
+
+            <Valve className="org.apache.catalina.cluster.tcp.ReplicationValve"
+                   filter=".*\.gif;.*\.js;.*\.jpg;.*\.png;.*\.htm;.*\.html;.*\.css;.*\.txt;"/>
+                   
+            <Deployer className="org.apache.catalina.cluster.deploy.FarmWarDeployer"
+                      tempDir="/tmp/war-temp/"
+                      deployDir="/tmp/war-deploy/"
+                      watchDir="/tmp/war-listen/"
+                      watchEnabled="false"/>
+                      
+            <ClusterListener className="org.apache.catalina.cluster.session.ClusterSessionListener"/>
+        </Cluster>
+        -->        
+
+
+
+        <!-- Normally, users must authenticate themselves to each web app
+             individually.  Uncomment the following entry if you would like
+             a user to be authenticated the first time they encounter a
+             resource protected by a security constraint, and then have that
+             user identity maintained across *all* web applications contained
+             in this virtual host. -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all requests for this virtual host.  By
+             default, log files are created in the "logs" directory relative to
+             $CATALINA_HOME.  If you wish, you can specify a different
+             directory with the "directory" attribute.  Specify either a relative
+             (to $CATALINA_HOME) or absolute path to the desired directory.
+        -->
+        <!--
+        <Valve className="org.apache.catalina.valves.AccessLogValve"
+                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
+                 pattern="common" resolveHosts="false"/>
+        -->
+
+        <!-- Access log processes all requests for this virtual host.  By
+             default, log files are created in the "logs" directory relative to
+             $CATALINA_HOME.  If you wish, you can specify a different
+             directory with the "directory" attribute.  Specify either a relative
+             (to $CATALINA_HOME) or absolute path to the desired directory.
+             This access log implementation is optimized for maximum performance,
+             but is hardcoded to support only the "common" and "combined" patterns.
+        -->
+        <!--
+        <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
+                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
+                 pattern="common" resolveHosts="false"/>
+        -->
+
+      </Host>
+
+    </Engine>
+
+  </Service>
+
+</Server>

Propchange: portals/jetspeed-2/trunk/installer/etc/tomcat/conf/server.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/installer/etc/tomcat/conf/server.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/trunk/installer/etc/tomcat/conf/tomcat-users.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/tomcat/conf/tomcat-users.xml?view=auto&rev=513124
==============================================================================
--- portals/jetspeed-2/trunk/installer/etc/tomcat/conf/tomcat-users.xml (added)
+++ portals/jetspeed-2/trunk/installer/etc/tomcat/conf/tomcat-users.xml Wed Feb 28 19:48:50 2007
@@ -0,0 +1,9 @@
+<!--
+  NOTE:  By default, no user is included in the "manager" role required
+  to operate the "/manager" web application.  If you wish to use this app,
+  you must define such a user - the username and password are arbitrary.
+-->
+<tomcat-users>
+  <user name="tomcat" password="tomcat" roles="tomcat" />
+  <user username="j2deployer" password="j2deployer" roles="admin,manager,tomcat"/>
+</tomcat-users>

Propchange: portals/jetspeed-2/trunk/installer/etc/tomcat/conf/tomcat-users.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/trunk/installer/etc/tomcat/conf/tomcat-users.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/trunk/installer/etc/tomcat/logs/catalina.out
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/installer/etc/tomcat/logs/catalina.out?view=auto&rev=513124
==============================================================================
    (empty)



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


Mime
View raw message