Merging changes from 1.2.4 to 1.2.5
This commit is contained in:
parent
65e4db3d8a
commit
676b70519d
32 changed files with 1498 additions and 865 deletions
|
@ -1,10 +1,13 @@
|
|||
# List of apps to start.
|
||||
|
||||
# mount antville as root application
|
||||
antville
|
||||
antville.mountpoint = /
|
||||
antville.static = static
|
||||
antville.staticMountpoint = /static
|
||||
|
||||
# mount antville as /managehop to avoid
|
||||
# conflict with antville's manage.hac action
|
||||
manage
|
||||
manage.mountpoint = /manage/hop
|
||||
|
||||
# mount antville as root application
|
||||
antville
|
||||
antville.mountpoint = /
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
<target name="init">
|
||||
<property name="Name" value="helma"/>
|
||||
<property name="year" value="1998-${year}"/>
|
||||
<property name="version" value="1.3cvs"/>
|
||||
<property name="version" value="1.2.5"/>
|
||||
<property name="project" value="helma"/>
|
||||
<property name="build.compiler" value="classic"/>
|
||||
|
||||
|
@ -28,8 +28,7 @@
|
|||
|
||||
<property name="jar.name" value="${project}"/>
|
||||
<property name="package.name" value="${project}-${version}"/>
|
||||
<property name="antclick.name" value="antclick-1.0cvs"/>
|
||||
<property name="antville.name" value="antville-1.0cvs"/>
|
||||
<property name="antclick.name" value="antclick-1.0.1-pre1"/>
|
||||
|
||||
<property name="debug" value="on"/>
|
||||
<property name="optimize" value="on"/>
|
||||
|
@ -68,8 +67,6 @@
|
|||
<echo message=" docs --> tries to retrieve the HTML documentation "/>
|
||||
<echo message=" (may need proxy settings in startscript)"/>
|
||||
<echo message=" package --> generates the distribution (zip and tar.gz)"/>
|
||||
<echo message=" antville --> generates the antville-distribution"/>
|
||||
<echo message=" (zip and tar.gz)"/>
|
||||
<echo message=" antclick --> generates the distribution (zip and tar.gz)"/>
|
||||
<echo message=" with antville preconfigured"/>
|
||||
<echo message=" app [name] --> gets an application from the cvs and zips it"/>
|
||||
|
@ -210,8 +207,8 @@
|
|||
<!-- copy all libraries except helma-YYYYMMDD.jar -->
|
||||
<copy todir="${build.work}/lib">
|
||||
<fileset dir="${home.dir}/lib">
|
||||
<exclude name="**/helma*.jar" />
|
||||
<include name="**/*.jar" />
|
||||
<exclude name="helma*.jar" />
|
||||
<include name="*.jar" />
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
|
@ -251,17 +248,6 @@
|
|||
|
||||
<antcall target="package-manage" />
|
||||
|
||||
<!-- write out apps.properties file -->
|
||||
<echo file="${build.work}/apps.properties" append="false">
|
||||
# list of applications to be started by helma
|
||||
base
|
||||
base.mountpoint = /
|
||||
bloggerapi
|
||||
himp
|
||||
gong
|
||||
lillebror
|
||||
manage
|
||||
</echo>
|
||||
</target>
|
||||
|
||||
|
||||
|
@ -360,14 +346,16 @@ manage
|
|||
|
||||
<!-- unzip images -->
|
||||
<mkdir dir="${build.work}/static/images"/>
|
||||
<unzip src="${build.work}/apps/antville/images.zip" dest="${build.work}/static/images" />
|
||||
<unzip src="${build.work}/apps/antville/images.zip" dest="${build.work}/static/images">
|
||||
<patternset>
|
||||
<include name="**"/>
|
||||
</patternset>
|
||||
</unzip>
|
||||
|
||||
<!-- zip db_support directory and remove it afterwards -->
|
||||
<zip zipfile="${build.work}/apps/antville/db_support.zip">
|
||||
<zipfileset dir="${build.work}/apps/antville/db_support" prefix="db_support" includes="**" />
|
||||
</zip>
|
||||
<delete dir="${build.work}/apps/antville/db_support" />
|
||||
<delete file="${build.work}/apps/antville/images.zip" />
|
||||
<!-- delete antville's mysql-scripts, image-zip etc -->
|
||||
<delete>
|
||||
<fileset dir="${build.work}/apps/antville" includes="images.zip,*.sql" />
|
||||
</delete>
|
||||
|
||||
<!-- get and zip manage-app -->
|
||||
<antcall target="package-manage" />
|
||||
|
@ -411,36 +399,4 @@ manage
|
|||
<delete dir="${build.work}" />
|
||||
</target>
|
||||
|
||||
<!-- =================================================================== -->
|
||||
<!-- Gets antville from the cvs, cleans and zips/targzs it -->
|
||||
<!-- =================================================================== -->
|
||||
<target name="antville" depends="init">
|
||||
<mkdir dir="${build.dist}" />
|
||||
<mkdir dir="${build.work}" />
|
||||
|
||||
<!-- to retrieve special versions of an application insert
|
||||
additional attributes: tag="TAGNAME" or date="1972-09-24 20:05" -->
|
||||
<cvs cvsRoot="${cvs.root.apps}" command="export" tag="HEAD" package="antville" dest="${build.work}" />
|
||||
|
||||
<!-- zip db_support directory and remove it afterwards -->
|
||||
<zip zipfile="${build.work}/antville/db_support.zip">
|
||||
<zipfileset dir="${build.work}/antville/db_support" prefix="db_support" includes="**" />
|
||||
</zip>
|
||||
<delete dir="${build.work}/antville/db_support" />
|
||||
|
||||
<fixcrlf srcdir="${build.work}/antville/" eol="crlf" excludes="**/*.zip" />
|
||||
<zip zipfile="${build.dist}/${antville.name}.zip" basedir="${build.work}" includes="**" />
|
||||
|
||||
<fixcrlf srcdir="${build.work}/antville/" eol="lf" eof="remove" excludes="**/*.zip" />
|
||||
<tar tarfile="${build.dist}/${antville.name}.tar" basedir="${build.work}">
|
||||
<tarfileset dir="${build.work}">
|
||||
<include name="${build.work}/**"/>
|
||||
</tarfileset>
|
||||
</tar>
|
||||
<gzip zipfile="${build.dist}/${antville.name}.tar.gz" src="${build.dist}/${antville.name}.tar" />
|
||||
|
||||
<delete file="${build.dist}/${antville.name}.tar"/>
|
||||
<delete dir="${build.work}" />
|
||||
</target>
|
||||
|
||||
</project>
|
||||
|
|
|
@ -1,10 +1,13 @@
|
|||
# List of apps to start.
|
||||
# List of applications to start.
|
||||
|
||||
base
|
||||
base.mountpoint = /
|
||||
base.static = static
|
||||
base.staticMountpoint = /static
|
||||
|
||||
manage
|
||||
|
||||
gong
|
||||
himp
|
||||
bloggerapi
|
||||
lillebror
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||
<!-- printed by helma object publisher -->
|
||||
<!-- created Fri May 31 16:36:44 CEST 2002 -->
|
||||
<xmlroot xmlns:hop="http://www.helma.org/docs/guide/features/database">
|
||||
<hopobject id="0" name="root" prototype="root" created="1022855750998" lastModified="1022855804064">
|
||||
<hop:child idref="3" prototyperef="weblogstory"/>
|
||||
</hopobject>
|
||||
</xmlroot>
|
|
@ -1,8 +0,0 @@
|
|||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||
<!-- printed by helma object publisher -->
|
||||
<!-- created Fri May 31 16:36:30 CEST 2002 -->
|
||||
<xmlroot xmlns:hop="http://www.helma.org/docs/guide/features/database">
|
||||
<hopobject id="1" name="users" prototype="hopobject" created="1022855751010" lastModified="1022855790024">
|
||||
<helma idref="2" prototyperef="user"/>
|
||||
</hopobject>
|
||||
</xmlroot>
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||
<!-- printed by helma object publisher -->
|
||||
<!-- created Fri May 31 16:36:30 CEST 2002 -->
|
||||
<xmlroot xmlns:hop="http://www.helma.org/docs/guide/features/database">
|
||||
<hopobject id="2" name="helma" prototype="user" created="1022855790020" lastModified="1022855790025">
|
||||
<hop:parent idref="1" prototyperef="hopobject"/>
|
||||
<email>admin@somedomain.at</email>
|
||||
<password>helma</password>
|
||||
<name>helma</name>
|
||||
</hopobject>
|
||||
</xmlroot>
|
|
@ -1,24 +0,0 @@
|
|||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||
<!-- printed by helma object publisher -->
|
||||
<!-- created Fri May 31 16:36:44 CEST 2002 -->
|
||||
<xmlroot xmlns:hop="http://www.helma.org/docs/guide/features/database">
|
||||
<hopobject id="3" name="weblogstory" prototype="weblogstory" created="1022855804062" lastModified="1022855804064">
|
||||
<hop:parent idref="0" prototyperef="root"/>
|
||||
<postdate type="date">31.05.2002 16:36:44 CEST</postdate>
|
||||
<day>2002.05.31</day>
|
||||
<author idref="2" prototyperef="user"/>
|
||||
<text>Congratulations! You successfully created your Helma HopBlog!
|
||||
|
||||
As a first step you can login to your HopBlog using "helma" as user name and password (certainly without the quotes) and create or edit stories.
|
||||
|
||||
Or you set-up HopBlog administration for yourself. You can do this by opening the file app.properties in the apps/hopblog directory of your Helma installation and editing the settings for siteAdmin, adminEmail and smtp.
|
||||
|
||||
After that you should register the new administrator as HopBlog user. Simply enter the data you chose for siteAdmin and adminEmail in the appropriate fields of the registration form, fill in the other form fields and submit your data. If you have set a valid e-mail address and smtp server, you should get a message confirming the registration.
|
||||
|
||||
Now you can login to your HopBlog using name and password of the newly created user.
|
||||
|
||||
Let the fun begin...
|
||||
:)</text>
|
||||
<moddate type="date">31.05.2002 16:36:44 CEST</moddate>
|
||||
</hopobject>
|
||||
</xmlroot>
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||
<!-- printed by helma object publisher -->
|
||||
<!-- created Fri May 31 16:36:44 CEST 2002 -->
|
||||
<xmlroot>
|
||||
<counter>3</counter>
|
||||
</xmlroot>
|
BIN
build/main/lib/ext/mysql.jar
Normal file
BIN
build/main/lib/ext/mysql.jar
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue