antville/antville
antville/antville
1
1
Fork 0
Code Issues 51 Pull requests 8 Projects Releases 9 Wiki Activity Actions

* Rebooted build environment for Antville and AntClick packages

Browse source 
* Updated helma.jar and launcher.jar
 * Added h2.jar as AntClick database (experimental)
 * Added build targets for extracting gettext call strings and building JavaScript message files
 * Added repository for AntClick containing adaptations necessary for H2 database
 * Renamed shell scripts for AntClick from antclick.* to start.*
 * Added default login for manage console in server.properties
 * Removed obsolete files
This commit is contained in:
Tobi Schäfer 2009-11-01 10:49:31 +00:00
parent fd653c4198
commit 8d32022257
15 changed files with 231 additions and 205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitattributes vendored
View file

@ -1,7 +1,9 @@
* text=auto !eol * text=auto !eol
build/build.properties svneol=native#text/plain
build/extra/antclick/Archive/Archive.properties svneol=native#text/plain
build/extra/h2.jar -text svneol=unset#application/x-compressed
build/extra/helma.jar -text build/extra/helma.jar -text
build/extra/launcher.jar -text build/extra/launcher.jar -text
build/extra/mckoidb.jar -text
code/Api/Api.blogger.js -text code/Api/Api.blogger.js -text
code/Choice/$Choice.skin -text code/Choice/$Choice.skin -text
code/Poll/$Poll.skin -text code/Poll/$Poll.skin -text

35
build/build.properties Normal file
View file

@ -0,0 +1,35 @@
##
## The Antville Project
## http://code.google.com/p/antville
##
## Copyright 2001-2007 by The Antville People
##
## 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.
##
## $Revision$
## $LastChangedBy$
## $LastChangedDate$
## $URL$
##
hopkit.dir = /Users/tobi/Projects/helma/modules/jala-trunk/util/HopKit
docs.source = ./code
docs.destination = ./docs
docs.projectName = Antville 1.2
i18n.scan = dev
#i18n.template = ./i18n/antville.pot
#i18n.poDirectory = /Users/tobi/Projects/helma/apps/antville/i18n
#i18n.destination = /Users/tobi/Projects/helma/apps/antville/i18n
#i18n.fileEncoding = UTF-8

58
build/build.sh
View file

@ -1,27 +1,57 @@
#!/bin/sh #!/bin/sh
## uncomment the following line to set JAVA_HOME ##
#export JAVA_HOME=/usr/lib/j2sdk1.4.0 ## The Antville Project
## http://code.google.com/p/antville
##
## Copyright 2001-2007 by The Antville People
##
## 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.
##
## $Revision:3333 $
## $LastChangedBy:piefke3000 $
## $LastChangedDate:2007-09-15 01:25:23 +0200 (Sat, 15 Sep 2007) $
## $URL$
##
##-------------------------------------------- ##--------------------------------------------
## No need to edit anything past here ## No need to edit anything past here
##-------------------------------------------- ##--------------------------------------------
## get update of necessary ant classes from CVS: if test -z "${ANT_HOME}" ; then
CVS_ACCESS=:pserver:anonymous@194.232.104.95:/opt/cvs/apps echo "ERROR: ANT_HOME not found in your environment."
cvs -d ${CVS_ACCESS} co -d lib antville/build/lib echo "Please, set the ANT_HOME variable in your environment to match the"
cvs -d ${CVS_ACCESS} co -d extra antville/build/extra echo "location of the Apache Ant installation you want to use."
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 exit
fi fi
BUILDFILE=build.xml BUILD_HOME=$(dirname $0)
if [ "${BUILD_HOME:0:1}" != "/" ] ; then
# convert to absolute path
BUILD_HOME=${PWD}/${BUILD_HOME}
fi
export BUILD_HOME
CP="${CLASSPATH}:lib/ant.jar:lib/ant-launcher.jar:lib/jsch.jar:lib/ant-jsch.jar" if [ -z "$HELMA_HOME" ] ; then
HELMA_HOME=$BUILD_HOME/../../../
fi
${JAVA_HOME}/bin/java -cp ${CP} org.apache.tools.ant.launch.Launcher -buildfile ${BUILDFILE} ${1} while [ $# -ne 0 ]
do
ANT_CMD_LINE_ARGS="${ANT_CMD_LINE_ARGS} $1"
shift
done
${ANT_HOME}/bin/ant -Dhelma.dir="${HELMA_HOME}" -Dbuild.dir="${BUILD_HOME}" -Dbase.dir="${PWD}" -lib "${BUILD_HOME}/lib:${HELMA_HOME}/lib" -propertyfile "${BUILD_HOME}/build.properties" -file "${BUILD_HOME}/build.xml" ${ANT_CMD_LINE_ARGS}
exit

288
build/build.xml
View file

@ -1,120 +1,144 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<project name="antville" default="usage" basedir="."> <project name="antville" default="usage" basedir=".">
<!-- =================================================================== -->
<!-- help on usage -->
<!-- =================================================================== -->
<target name="help" depends="usage"/> <target name="help" depends="usage"/>
<target name="usage"> <target name="usage">
<echo/> <echo message="Antville Build Instructions"/>
<echo/> <echo message="==========================="/>
<echo message="Antville build instructions"/> <echo message="Available targets are:"/>
<echo message="-------------------------------------------------------------"/> <echo message=" * Generate the Antville and AntClick packages"/>
<echo/> <echo message=" packages Generate the Antville packages"/>
<echo message=" available targets are:"/> <echo message=" antclick Generate the AntClick packages"/>
<echo/> <echo message=" publish Copy packages to the download server"/>
<echo message=" all - generates the antville and antclick packages"/> <echo message=" pot Extract gettext call strings into POT file" />
<echo message=" antville - generates the antville packages"/> <echo message=" messages Generate JavaScript message files" />
<echo message=" antclick - generates the antclick packages"/> <!-- echo message=" docs Generate the API helmaDocs"/ -->
<echo message=" transfer - copy packages to download server"/> <echo message=" usage Show build instructions (default)"/>
<!-- echo message=" docs - generates the API helmaDocs"/ --> <echo message="See comments inside the build.xml file for more details."/>
<echo/>
<echo message=" usage - provides help on using the build tool (default)"/>
<echo/>
<echo message=" See comments inside the build.xml file for more details."/>
<echo message="-------------------------------------------------------------"/>
<echo/>
<echo/>
</target> </target>
<!-- =================================================================== -->
<!-- initialize some variables -->
<!-- =================================================================== -->
<target name="init"> <target name="init">
<property name="name" value="Antville"/> <property name="name" value="antville"/>
<property name="year" value="2001-${year}"/> <property name="year" value="1998-${year}"/>
<property name="version" value="1.1"/> <property name="version" value="1.2"/>
<property name="project" value="antville"/> <property name="package.name" value="${name}-${version}"/>
<property name="build.compiler" value="classic"/> <property name="antville.src" value="http://antville.googlecode.com/svn/trunk"/>
<property name="helma.src" value="http://dev.helma.org/svn/helma/helma/trunk"/>
<property name="cvs.antville.root" <property name="apps.src" value="http://dev.helma.org/svn/apps"/>
value=":pserver:anonymous@194.232.104.95:/opt/cvs/apps"/> <property name="home.dir" location="${build.dir}/.."/>
<property name="cvs.antville.tag" value="HEAD"/> <property name="extra.dir" location="${build.dir}/extra"/>
<property name="cvs.manage.root" <property name="work.dir" location="${build.dir}/work"/>
value=":pserver:anonymous@194.232.104.95:/opt/cvs/apps"/> <property name="apps.dir" location="${work.dir}/apps"/>
<property name="cvs.manage.tag" value="HEAD"/> <property name="antville.dir" location="${apps.dir}/antville"/>
<property name="cvs.hop.root" <property name="dist.dir" location="${build.dir}/dist"/>
value=":pserver:anonymous@194.232.104.95:/opt/cvs/hop"/> <property name="hopkit.dir" location="${helma.dir}/modules/jala/util/HopKit"/>
<property name="cvs.hop.tag" value="HEAD"/> <property name="i18n.scan" location="code"/>
<property name="i18n.destination" location="${home.dir}/i18n"/>
<property name="home.dir" value=".."/> <property name="i18n.poDirectory" location="${i18n.destination}"/>
<property name="build.dir" value="${home.dir}/build"/> <property name="i18n.template" location="${i18n.destination}/antville.pot"/>
<property name="build.code" value="${home.dir}/code"/> <property name="i18n.namespace" value=""/>
<property name="build.static" value="${home.dir}/static"/>
<property name="build.docs" value="${home.dir}/docs"/>
<property name="build.work" value="${build.dir}/work"/>
<property name="build.dist" value="${build.dir}/dist"/>
<property name="build.extra" value="${build.dir}/extra"/>
<property name="build.lib" value="${build.dir}/lib"/>
<property name="package.name" value="${project}-${version}"/>
<property name="antclick.name" value="antclick-${version}"/>
<property name="scp.server" value="194.232.104.95"/>
<property name="scp.path" value="/usr/local/httpd/htdocs/download/antville"/>
<property name="debug" value="on"/>
<property name="optimize" value="on"/>
<property name="deprecation" value="off"/>
<tstamp/> <tstamp/>
<filter token="year" value="${year}"/> <filter token="year" value="${year}"/>
<filter token="version" value="${version}"/> <filter token="version" value="${version}"/>
<filter token="date" value="${TODAY}"/> <filter token="date" value="${TODAY}"/>
<cvspass cvsroot="${cvs.antville.root}" password=""/>
<cvspass cvsroot="${cvs.hop.root}" password=""/>
</target> </target>
<target name="export" depends="init">
<!-- =================================================================== --> <mkdir dir="${apps.dir}"/>
<!-- generate both, the antville and antclick packages --> <exec dir="${apps.dir}" executable="svn">
<!-- =================================================================== --> <arg line="export ${antville.src} antville"/>
<target name="all" depends="export"> </exec>
<property name="nocleanup" value="true"/>
<property name="noexport" value="true"/>
<antcall target="antville"/>
<antcall target="antclick"/>
<antcall target="cleanup"/>
<!-- FIXME: currently don't know about a way to call target cleanup here -->
<delete dir="${build.work}"/>
</target> </target>
<target name="packages" depends="export">
<!-- =================================================================== --> <delete dir="${antville.dir}/build"/>
<!-- generate the antville distribution packages --> <antcall target="make-tar">
<!-- =================================================================== -->
<target name="antville" depends="export">
<antcall target="package-zip">
<param name="filename" value="${package.name}"/> <param name="filename" value="${package.name}"/>
<param name="path" value="${build.work}/apps/${project}"/> <param name="path" value="${antville.dir}"/>
</antcall> </antcall>
<antcall target="package-tgz"> <antcall target="make-zip">
<param name="filename" value="${package.name}"/> <param name="filename" value="${package.name}"/>
<param name="path" value="${build.work}/apps/${project}"/> <param name="path" value="${antville.dir}"/>
</antcall> </antcall>
<antcall target="cleanup"/> </target>
<target name="pot" depends="init">
<java dir="${helma.dir}" classpath="${helma.dir}/launcher.jar"
classname="helma.main.launcher.Commandline" fork="true">
<arg value="antville.xgettext"/>
<arg value="${hopkit.dir}/scripts/MessageParser.js"/>
<arg line="${i18n.scan}"/>
<arg value="${i18n.template}"/>
</java>
</target> </target>
<target name="messages" depends="init">
<java classname="org.mozilla.javascript.tools.shell.Main">
<arg value="${hopkit.dir}/scripts/PoParser.js"/>
<arg value="${i18n.poDirectory}"/>
<arg value="${i18n.destination}"/>
<arg value="${i18n.namespace}"/>
</java>
</target>
<!-- =================================================================== --> <target name="make-tar" depends="init">
<!-- generate the antclick distribution packages --> <mkdir dir="${dist.dir}" />
<!-- =================================================================== --> <fixcrlf srcdir="${path}" eol="lf" eof="remove" includes="**/*.txt,
<target name="antclick" depends="export"> **/*.properties, **/*.hac, **/*.js, **/*.skin, **/.xml, **/.sh" />
<tar tarfile="${dist.dir}/${filename}.tar" basedir="${path}" excludes="**">
<tarfileset prefix="${filename}" dir="${path}" mode="755">
<include name="**/*.sh"/>
</tarfileset>
<tarfileset prefix="${filename}" dir="${path}">
<include name="**"/>
<exclude name="**/*.sh"/>
</tarfileset>
</tar>
<gzip zipfile="${dist.dir}/${filename}.tgz" src="${dist.dir}/${filename}.tar"/>
<delete file="${dist.dir}/${filename}.tar"/>
</target>
<target name="make-zip" depends="init">
<mkdir dir="${dist.dir}" />
<fixcrlf srcdir="${path}" eol="crlf" includes="**/*.txt, **/*.properties,
**/*.hac, **/*.js, **/*.skin, **/*.xml, **/.bat" />
<zip zipfile="${dist.dir}/${filename}.zip">
<zipfileset dir="${path}" prefix="${filename}" includes="**" />
</zip>
</target>
<target name="antclick" depends="export">
<exec dir="${work.dir}" executable="svn">
<arg line="export ${helma.src}/lib"/>
</exec>
<exec dir="${work.dir}" executable="svn">
<arg line="export ${apps.src}/modules/trunk modules"/>
</exec>
<exec dir="${work.dir}" executable="svn">
<arg line="export ${helma.src}/licenses"/>
</exec>
<exec dir="${work.dir}" executable="svn">
<arg line="export ${helma.src}/license.txt"/>
</exec>
<exec dir="${apps.dir}" executable="svn">
<arg line="export ${apps.src}/manage/trunk manage"/>
</exec>
<exec dir="${extra.dir}" executable="cp">
<arg line="-p start.sh ${work.dir}"/>
</exec>
<copy todir="${work.dir}">
<fileset dir="${extra.dir}" includes="start.bat apps.properties
server.properties launcher.jar"/>
</copy>
<copy todir="${antville.dir}">
<fileset dir="${extra.dir}" includes="antclick/**"/>
</copy>
<copy file="${extra.dir}/helma.jar" todir="${work.dir}/lib"/>
<copy file="${extra.dir}/h2.jar" todir="${work.dir}/lib/ext"/>
<move file="${work.dir}/license.txt" todir="${work.dir}/licenses/helma.txt"/>
</target>
<target name="antclick-disabled" depends="export">
<copy todir="${build.work}/"> <copy todir="${build.work}/">
<fileset dir="${build.extra}" <fileset dir="${build.extra}"
includes="antclick.sh antclick.bat apps.properties includes="antclick.sh antclick.bat apps.properties
@ -163,78 +187,12 @@
<antcall target="cleanup"/> <antcall target="cleanup"/>
</target> </target>
<target name="publish" depends="init">
<!-- =================================================================== --> <echo message="Sorry, this target is currently not available"/>
<!-- export the antville module from CVS -->
<!-- =================================================================== -->
<target name="export" depends="init" unless="noexport">
<mkdir dir="${build.work}/apps"/>
<cvs cvsRoot="${cvs.antville.root}"
command="export"
tag="${cvs.antville.tag}"
package="${project}"
dest="${build.work}/apps"/>
<delete dir="${build.work}/apps/antville/build/extra"/>
<delete dir="${build.work}/apps/antville/build/lib"/>
</target> </target>
<target name="clean" depends="init">
<!-- =================================================================== --> <delete dir="${work.dir}"/>
<!-- copy packages to download server --> </target>
<!-- =================================================================== -->
<target name="transfer" depends="init">
<input message="User: " addproperty="scp.user"/>
<input message="Password: " addproperty="scp.pass"/>
<scp trust="yes" todir="${scp.user}:${scp.pass}@${scp.server}:${scp.path}">
<fileset dir="${build.dist}" includes="${project}-${version}.*"/>
</scp>
<scp trust="yes" todir="${scp.user}:${scp.pass}@${scp.server}:${scp.path}/antclick">
<fileset dir="${build.dist}" includes="antclick-${version}.*"/>
</scp>
</target>
<!-- =================================================================== -->
<!-- Packages the work directory with TAR-GZIP -->
<!-- needs parameter ${filename} for final dist-file -->
<!-- =================================================================== -->
<target name="package-tgz" depends="init">
<mkdir dir="${build.dist}" />
<fixcrlf srcdir="${path}" eol="lf" eof="remove"
includes="**/*.txt, **/*.properties, **/*.hac, **/*.js, **/*.skin, **/.xml, **/.sh" />
<tar tarfile="${build.dist}/${filename}.tar" basedir="${path}" excludes="**">
<tarfileset prefix="${filename}" dir="${path}" mode="755">
<include name="**/*.sh"/>
</tarfileset>
<tarfileset prefix="${filename}" dir="${path}">
<include name="**"/>
<exclude name="**/*.sh"/>
</tarfileset>
</tar>
<gzip zipfile="${build.dist}/${filename}.tgz" src="${build.dist}/${filename}.tar"/>
<delete file="${build.dist}/${filename}.tar"/>
</target>
<!-- =================================================================== -->
<!-- Packages the work directory with ZIP -->
<!-- needs parameter ${filename} for final dist-file -->
<!-- =================================================================== -->
<target name="package-zip" depends="init">
<mkdir dir="${build.dist}" />
<fixcrlf srcdir="${path}" eol="crlf"
includes="**/*.txt, **/*.properties, **/*.hac, **/*.js, **/*.skin, **/*.xml, **/.bat" />
<zip zipfile="${build.dist}/${filename}.zip">
<zipfileset dir="${path}" prefix="${filename}" includes="**" />
</zip>
</target>
<!-- =================================================================== -->
<!-- clean up the mess -->
<!-- =================================================================== -->
<target name="cleanup" depends="init" unless="nocleanup">
<delete dir="${build.work}"/>
</target>
</project> </project>

2
build/extra/antclick/Archive/Archive.properties Normal file
View file

@ -0,0 +1,2 @@
_children.group = formatdatetime(created, 'yyyyMMdd')
_children.group.order = formatdatetime(created, 'yyyyMMdd') desc

4
build/extra/antclick/db.properties Normal file
View file

@ -0,0 +1,4 @@
antville.url = jdbc:h2:./apps/antville/db/antville
antville.driver = org.h2.Driver
antville.user = sa
antville.password =

19
build/extra/apps.properties
View file

@ -1,13 +1,10 @@
## mount antville at root
antville
antville.mountpoint = /
antville.appdir = apps/antville/code
## mount the static dir
antville.static = apps/antville/static
antville.staticMountpoint = /static
## mount manage app explicitely to avoid
## conflict with antville's manage_action
manage manage
manage.mountpoint = /manage/hop manage.mountpoint = /manage/hop
antville
antville.appDir = ./apps/antville/code
antville.repository.0 = ./apps/antville/code
antville.repository.1 = ./apps/antville/antclick
antville.mountpoint = /
antville.static = ./apps/antville/static
antville.staticMountpoint = /static

5
build/extra/db.properties
View file

@ -1,5 +0,0 @@
# Properties of antville datasource
antville.url = jdbc:mckoi:local://./apps/antville/db/db.conf
antville.driver = com.mckoi.JDBCDriver
antville.user = admin
antville.password = entwil

BIN
build/extra/h2.jar Executable file
View file

Binary file not shown.

BIN
build/extra/helma.jar
View file

Binary file not shown.

BIN
build/extra/launcher.jar
View file

Binary file not shown.

BIN
build/extra/mckoidb.jar
View file

Binary file not shown.

11
build/extra/server.properties
View file

@ -1,4 +1,7 @@
country = AT country = AT
language = en language = en
smtp = localhost smtp = localhost
allowAdmin = 127.0.0.1, 10.0.0.1
## Login to manage console: admin/admin
adminAccess = 32ff9ee7e841b26a966870c144fdcaec
allowAdmin = 127.0.0.1, ::1

0
build/extra/antclick.bat → build/extra/start.bat
View file

0
build/extra/antclick.sh → build/extra/start.sh
View file