svn commit: rev 9993 - xml/forrest/trunk/etc/cocoon_upgrade

[ch...@apache.org]

Author: cheche
Date: Tue Apr 13 07:44:43 2004
New Revision: 9993

Added:
   xml/forrest/trunk/etc/cocoon_upgrade/local.build.properties
Modified:
   xml/forrest/trunk/etc/cocoon_upgrade/upgrade_cocoon_jars.sh
Log:
Updated so it can update from today's version


Added: xml/forrest/trunk/etc/cocoon_upgrade/local.build.properties
==============================================================================
--- (empty file)
+++ xml/forrest/trunk/etc/cocoon_upgrade/local.build.properties	Tue Apr 13 07:44:43 2004
@@ -0,0 +1,177 @@
+#  Copyright 1999-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.
+#
+#----------------------------------------------
+#  Cocoon Build Properties
+#----------------------------------------------
+
+# NOTE: don't modify this file directly but copy the properties you need
+# to modify over to a file named 'local.build.properties' and modify that. 
+# The build system will override these properties with the ones in the 
+# 'local.build.properties' file.
+
+# ---- Webapp ------------------------------------------------------------------
+
+exclude.webapp.documentation=true
+exclude.webapp.javadocs=true
+exclude.webapp.samples=true
+
+# ---- Build Exclusions --------------------------------------------------------
+
+#exclude.deprecated=true
+exclude.documentation=true
+exclude.javadocs=true
+
+# ---- Configuration -----------------------------------------------------------
+
+#include.driver.oracle=true
+#include.driver.postgre=true
+#include.driver.odbc=true
+#config.allow-reloads=true
+#config.enable-uploads=true
+
+# ---- Validation --------------------------------------------------------------
+
+#exclude.validate.config=true
+#exclude.validate.xdocs=true
+#exclude.validate.jars=true
+
+# ---- Forrest -----------------------------------------------------------------
+
+# set $FORREST_HOME and $PATH as instructed by Forrest
+
+# ---- Anteater ----------------------------------------------------------------
+
+anteater.home = /default-from-build.properties/anteater-0.9.16
+anteater.target.host = localhost
+anteater.target.port = 8888
+anteater.target.base.path = /
+anteater.option.haltonerror = true
+
+# disable some long-running tests by default
+# anteater.test.bug26186InternalRequestMemoryLeak.enabled = true
+
+# ---- Build -------------------------------------------------------------------
+
+build.root=build
+build=${build.root}/${name}-${version}
+build.dest=${build}/classes
+build.mocks=${build}/mocks
+build.test=${build}/test
+build.docs=${build}/docs
+build.docs.printer=${build}/printer-docs
+build.site=${build}/site
+build.xdocs=${build}/xdocs
+build.javadocs=${build}/javadocs
+build.context=${build}/documentation
+build.context.printer=${build}/printer-documentation
+build.blocks=${build}/blocks
+build.deprecated=${build}/deprecated
+build.samples=${build}/samples
+build.temp=${build}/temp
+build.mounttable=../../mount-table.xml
+
+build.docs.loglevel=ERROR
+build.docs.printer.loglevel=ERROR
+
+# ------ Webapp Build Properties -----------------------------------------------
+
+build.webapp=${build.root}/webapp
+build.webapp.webinf=${build.webapp}/WEB-INF
+build.webapp.classes=${build.webapp.webinf}/classes
+build.webapp.lib=${build.webapp.webinf}/lib
+build.webapp.samples=${build.webapp}/samples
+build.webapp.docs=${build.webapp}/docs
+build.webapp.javadocs=${build.webapp}/api/java
+build.webapp.loglevel=INFO
+build.war=${build}/${name}.war
+
+# ------ Standalone-demo Build Properties --------------------------------------
+build.standalone.demo=${build.root}/standalone-demo
+
+# ---- Compilation -------------------------------------------------------------
+
+compiler=modern
+compiler.debug=on
+compiler.optimize=on
+compiler.deprecation=off
+compiler.nowarn=on
+
+
+# ------ System Properties -----------------------------------------------------
+
+# WARNING: you shouldn't need to modify anything below here since there is a
+# very high change of breaking the build system. Do it only if you know what
+# you're doing.
+
+packages=org.apache
+
+# Project descriptor
+gump.descriptor=gump.xml
+
+# Directory Layout
+src=src
+java=${src}/java
+mocks=${src}/mocks
+test=${src}/test
+resources=${src}/resources
+resources.styles=${resources}/styles
+resources.logos=${resources}/logos
+resources.javadoc=${resources}/javadoc
+documentation=${src}/documentation
+docs=${documentation}/xdocs
+images=${documentation}/images
+blocks=${src}${file.separator}blocks
+samples=${src}/samples
+webapp=${src}/webapp
+webapp.samples=${webapp}/samples
+customconf=${src}/confpatch
+
+# Deprecated Stuff
+deprecated=${src}/deprecated
+deprecated.src=${deprecated}/java
+deprecated.conf=${deprecated}/conf
+
+# Tools
+tools=tools
+tools.lib=${tools}/lib
+tools.src=${tools}/src
+tools.tasks.src=${tools.src}/anttasks
+tools.tasks.dest=${tools}/anttasks
+tools.loader.src=${tools.src}/loader
+tools.loader.dest=${tools}/loader
+tools.jetty=${tools}/jetty
+
+# IDE
+ide.eclipse.outputdir=${build.root}/eclipse/classes
+ide.eclipse.export.libs=false
+
+# Libraries
+lib=lib
+lib.core=${lib}/core
+lib.endorsed=${lib}/endorsed
+lib.optional=${lib}/optional
+lib.local=${lib}/local
+
+# Distribution Directories
+dist.root=dist
+dist=${dist.root}/${name}-${version}
+dist.name=${name}-${version}
+dist.target=${dist.root}
+
+# Site Directory
+site=../cocoon-site/site/2.1
+
+# Legal
+legal=legal

Modified: xml/forrest/trunk/etc/cocoon_upgrade/upgrade_cocoon_jars.sh
==============================================================================
--- xml/forrest/trunk/etc/cocoon_upgrade/upgrade_cocoon_jars.sh	(original)
+++ xml/forrest/trunk/etc/cocoon_upgrade/upgrade_cocoon_jars.sh	Tue Apr 13 07:44:43 2004
@@ -20,15 +20,16 @@
 # directory is not on the same level as xml-forrest/, set the COCOON_HOME variable
 # below.
 #
+cd $PWD/../../../../
 BASE=$PWD/`dirname $0`
 ## MUST BE OVERRIDDEN:
-COCOON_VERSION=2.1.4
-COCOON_HOME=$BASE/../../../cocoon-2.1
-FORREST=$BASE/../..
-NEKODTD_VERSION=0.1.9
-NEKODTD_HOME=$BASE/../../../nekodtd-$NEKODTD_VERSION
-NEKOPULL_VERSION=0.2.3
-NEKOPULL_HOME=$BASE/../../../nekopull-$NEKOPULL_VERSION
+COCOON_VERSION=2.1.5-dev
+COCOON_HOME=$BASE/cocoon-2.1
+FORREST=$BASE/forrest/trunk
+NEKODTD_VERSION=0.1.10
+NEKODTD_HOME=$BASE/nekodtd-$NEKODTD_VERSION
+NEKOPULL_VERSION=0.2.4
+NEKOPULL_HOME=$BASE/nekopull-$NEKOPULL_VERSION
 
 ## CAN be overridden:
 #JARSUFFIX=`date +%Y%m%d`
@@ -146,11 +147,12 @@
   echo "done"
 }
 
-function copy_local_blocks_properties()
+function copy_local_properties()
 {
-  echo -n "Copy local.blocks.properties to $COCOON_HOME 		"
+  echo -n "Copy local.properties to $COCOON_HOME 		"
   push
   cp -bu local.blocks.properties $COCOON_HOME
+  cp -bu local.build.properties $COCOON_HOME
   pop
   echo "done"
 }
@@ -174,7 +176,7 @@
 
 sanity_check
 #Commented by default
-#copy_local_blocks_properties
+#copy_local_properties
 #build_cocoon
 
 upgrade_neko
@@ -190,6 +192,8 @@
 #cocoon-20030311.jar
 rm $FLIB/cocoon-$COCOONJAR_SUFFIX.jar ; cp $CBUILD/cocoon.jar $FLIB/cocoon-$JARSUFFIX.jar
 rm $FLIB/cocoon-deprecated-*.jar ; cp $CBUILD/cocoon-deprecated.jar $FLIB/cocoon-deprecated-$JARSUFFIX.jar
+#cocoon xsp is a dependecy of linkrewriter 
+bzcopy xsp
 #cocoon-asciiart-block-20030311.jar
 bzcopy asciiart
 #cocoon-batik-block-20030311.jar
@@ -208,6 +212,8 @@
 bzcopy lucene
 #cocoon-profiler-block-20030311.jar
 bzcopy profiler
+#jakarta-bcel needed by the wiki stuff
+copy jakarta-bcel
 #commons-collections-2.1.jar
 copy commons-collections
 #commons-jxpath-1.1b1.jar