jvanzyl 01/05/10 10:08:14
Modified: conf TurbineResources.properties
Added: conf build.bat build.sh build.xml
Removed: conf build-conf.bat build-conf.sh build-conf.xml
velocity.properties web.xml
Log:
- making the build files more standard, getting rid of velocity.props
and web.xml because there are more up-to-date, better examples
in the TDK. when i made a sample app that uses vel/jsp/wm then
i will move the WM.props file out of here too.
Revision Changes Path
1.106 +1 -1 jakarta-turbine/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine/conf/TurbineResources.properties,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- TurbineResources.properties 2001/04/25 05:31:03 1.105
+++ TurbineResources.properties 2001/05/10 17:08:00 1.106
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.properties,v 1.105 2001/04/25 05:31:03 ilkka Exp $
+# $Id: TurbineResources.properties,v 1.106 2001/05/10 17:08:00 jvanzyl Exp $
#
# This is the configuration file for Turbine.
#
1.1 jakarta-turbine/conf/build.bat
Index: build.bat
===================================================================
@echo off
REM -------------------------------------------------------------------
REM Define the paths to each of the packages
REM -------------------------------------------------------------------
set _ANT=%ANT%
set ANT=..\build\ant-1.2.jar
set _XERCES=%XERCES%
set XERCES=..\lib\xerces-1.3.0.jar
REM --------------------------------------------
REM No need to edit anything past here
REM --------------------------------------------
if "%JAVA_HOME%" == "" goto javahomeerror
set _CLASSPATH=%CLASSPATH%
if exist %JAVA_HOME%\lib\tools.jar set
CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar
set CLASSPATH=%CLASSPATH%;%ANT%;%XERCES%
%JAVA_HOME%\bin\java.exe org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
goto end
REM -----------ERROR-------------
:javahomeerror
echo "ERROR: JAVA_HOME not found in your environment."
echo "Please, set the JAVA_HOME variable in your environment to match the"
echo "location of the Java Virtual Machine you want to use."
:end
set CLASSPATH=%_CLASSPATH%
set _CLASSPATH=
set ANT=%_ANT%
set _ANT=
set XERCES=%_XERCES%
set _XERCES=
1.1 jakarta-turbine/conf/build.sh
Index: build.sh
===================================================================
#!/bin/sh
#-------------------------------------------------------------------
# Define the paths to each of the packages
#-------------------------------------------------------------------
for i in ../build/ant*.jar
do
ANT_JAR=${ANT_JAR}:$i
done
XERCES_JAR=`ls ../lib/xerces-*.jar`
#--------------------------------------------
# No need to edit anything past here
#--------------------------------------------
if test -z "${JAVA_HOME}" ; then
echo "ERROR: JAVA_HOME not found in your environment."
echo "Please, set the JAVA_HOME variable in your environment to match the"
echo "location of the Java Virtual Machine you want to use."
exit
fi
# convert the existing path to unix
if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
fi
if test -f ${JAVA_HOME}/lib/tools.jar ; then
CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/tools.jar
fi
CLASSPATH=${CLASSPATH}:${ANT_JAR}:${XERCES_JAR}
# convert the unix path to windows
if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
${JAVA_HOME}/bin/java -classpath ${CLASSPATH} org.apache.tools.ant.Main "$@"
1.1 jakarta-turbine/conf/build.xml
Index: build.xml
===================================================================
<?xml version="1.0"?>
<!-- Build configuration file for Turbine -->
<project name="tr-props-maker" default="tr-props-with-db-values" basedir=".">
<!-- Give user a chance to override without editing this file
(and without typing -D each time it compiles it -->
<property file="${user.home}/.ant.properties" />
<property file=".ant.properties" />
<property name="master.home" value="./master"/>
<property name="conf.home" value="."/>
<property name="target.dir" value="."/>
<property file="${conf.home}/master/meta.properties"/>
<property file="${conf.home}/database/${database.type}"/>
<property file="${conf.home}/view/${view.type}"/>
<property name="master" value="${master.home}/TurbineResources.master"/>
<property name="copy" value="${target.dir}/TurbineResources.properties"/>
<!-- =================================================================== -->
<!-- T R P R O P S W I T H D B V A L U E S -->
<!-- =================================================================== -->
<!-- Target used to generated TR.props file for storage in CVS, or for -->
<!-- those who wish to generate their own TR.props file outside the -->
<!-- use of the TDK. -->
<!-- =================================================================== -->
<target name="tr-props-with-db-values" depends="configure,configure-db">
<echo message="Creating TurbineResources ..."/>
<delete file="${copy}"/>
<copy file="${master}" tofile="${copy}" filtering="on"/>
</target>
<!-- =================================================================== -->
<!-- T R P R O P S W I T H O U T D B V A L U E S -->
<!-- =================================================================== -->
<!-- Target used to generate TR.props file for use in the TDK, -->
<!-- specifically in conjunction with the generation of sample -->
<!-- applications. The database values must be set by the user -->
<!-- before the sample app is generated and the values plugged -->
<!-- into the TR.props for the generated sample app. -->
<!-- =================================================================== -->
<target name="tr-props-without-db-values" depends="configure">
<echo message="Creating TurbineResources ..."/>
<delete file="${copy}"/>
<copy file="${master}" tofile="${copy}" filtering="on"/>
</target>
<!-- =================================================================== -->
<!-- C O N F I G U R E D A T A B A S E P R O P E R T I E S -->
<!-- =================================================================== -->
<!-- Target to configure the database properties. Done separately so -->
<!-- so that generating a standard TR.props for storage in CVS will -->
<!-- will be a full example including all database related properties. -->
<!-- But in the TDK we don't want the database properties set initially -->
<!-- because these are set by the user in the project properties file -->
<!-- before the example app is generated. The database properties -->
<!-- are taken from the project properties file and inserted into -->
<!-- TR.props file while the example app is generated. This allows -->
<!-- the database properties to be set in one location as opposed to -->
<!-- requiring the user to change them in the project properties -->
<!-- file and the TR.props file of the generated app. -->
<!-- =================================================================== -->
<target name="configure-db">
<filter token="DATABASE_DRIVER" value="${database.driver}"/>
<filter token="DATABASE_URL" value="${database.url}"/>
<filter token="DATABASE_ADAPTOR" value="${database.adaptor}"/>
<filter token="DATABASE_USER" value="${database.user}"/>
<filter token="DATABASE_PASSWORD" value="${database.password}"/>
<filter token="DATABASE_NAME" value="${database.name}"/>
</target>
<!-- =================================================================== -->
<!-- C O N F I G U R E S T A N D A R D P R O P E R T I E S -->
<!-- =================================================================== -->
<!-- Target used to set the standard values of properties in -->
<!-- TR.props file. -->
<!-- =================================================================== -->
<target name="configure">
<filter token="TURBINE_LOG" value="${turbine.log}"/>
<filter token="MAIL_SERVER" value="${mail.server}"/>
<filter token="MAIL_SMTP_FROM" value="${mail.smtp.from}"/>
<filter token="MODULE_CACHE" value="${module.cache}"/>
<filter token="MODULE_PACKAGES" value="${module.packages}"/>
<filter token="TEMPLATE_HOMEPAGE" value="${template.hompage}"/>
<filter token="TEMPLATE_LOGIN" value="${template.login}"/>
<filter token="SCREEN_HOMEPAGE" value="${screen.homepage}"/>
<filter token="SCREEN_LOGIN" value="${screen.login}"/>
<filter token="SCREEN_ERROR" value="${screen.error}"/>
<filter token="SCREEN_INVALID_STATE" value="${screen.invalidstate}"/>
<filter token="ACTION_LOGIN" value="${action.login}"/>
<filter token="ACTION_LOGOUT" value="${action.logout}"/>
<filter token="ACTION_SESSION_VALIDATOR" value="${action.sessionvalidator}"/>
<filter token="ACTION_ACCESS_CONTROLLER" value="${action.accesscontroller}"/>
<filter token="LAYOUT_DEFAULT" value="${layout.default}"/>
<filter token="PAGE_DEFAULT" value="${page.default}"/>
<filter token="TEMPLATE_SERVICE" value="${template.service}"/>
<filter token="TEMPLATE_SERVICE_NAME" value="${template.service.name}"/>
<filter token="TEMPLATE_ERROR" value="${template.error}"/>
<filter token="TEMPLATE_EXTENSION" value="${template.default.extension}"/>
<filter token="TEMPLATE_PATH" value="${template.path}"/>
<filter token="TEMPLATE_DEFAULT_NAVIGATION"
value="${template.default.navigation}"/>
<filter token="TEMPLATE_DEFAULT_SCREEN" value="${template.default.screen}"/>
<filter token="TEMPLATE_DEFAULT_LAYOUT" value="${template.default.layout}"/>
<filter token="LOCALE_DEFAULT_BUNDLE" value="${locale.default.bundle}"/>
<filter token="LOCALE_DEFAULT_LANGUAGE" value="${locale.default.language}"/>
<filter token="LOCALE_DEFAULT_COUNTRY" value="${locale.default.country}"/>
<filter token="INCLUDE_FILE" value="${include.file}"/>
</target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
