Commit fb667281 authored by Ubbo Veentjer's avatar Ubbo Veentjer
Browse files

integrate cqlparser in exist/sade - build.sh works again

parent 82749222
......@@ -4,3 +4,7 @@ app.name=SADE
app.uri=http://telota.de/sade
app.version=0.3
projects.dir=sade-projects
# set conf.overwrite to true if src/repo.xml, src/expath-pkg.xml and src/core/config.xql
# should be overwritten from their templates
conf.overwrite=false
......@@ -197,7 +197,9 @@ fi
if [ $BUILD_EXIST == true ]; then
echo "[SADE BUILD] building eXist"
# we want xslfo, a diff/patch may be better than sed here
sed -i 's/include.module.xslfo = false/include.module.xslfo = true/g' $EXIST_SRC_LOC/extensions/build.properties
cp $EXIST_SRC_LOC/extensions/build.properties $EXIST_SRC_LOC/extensions/local.build.properties
#sed -i 's/include.module.xslfo = false/include.module.xslfo = true/g' $EXIST_SRC_LOC/extensions/local.build.properties
sed -i 's/include.module.cqlparser = false/include.module.cqlparser = true/g' $EXIST_SRC_LOC/extensions/local.build.properties
cd $EXIST_SRC_LOC
# show svn rev (does not work with svn 1.7)
......@@ -207,7 +209,7 @@ if [ $BUILD_EXIST == true ]; then
./build.sh clean
fi
./build.sh
./build.sh jnlp-sign-all dist-war
./build.sh jnlp-all dist-war
else
echo "[SADE BUILD] everything in place, no need to rebuild eXist"
fi
......@@ -331,11 +333,12 @@ fi
###
#
# exist config modification
# seems not neccessary in trunk anymore
# exist config modification
# xslfo not needed anymore
###
#cd $SCRIPTLOC
cd $SCRIPTLOC
#patch -p0 < sade-resources/existconf.xslfo.patch
patch -p0 < sade-resources/existconf.cqlparser.patch
####
#
......
<?xml version="1.0" encoding="UTF-8"?>
<project default="deploy" name="localdeploy">
<property file="../build.properties" />
<property name="server.dir" value="build/sade/webapps/exist/WEB-INF"/>
<path id="classpath.core">
......@@ -21,7 +22,7 @@
uri="xmldb:exist://localhost:8080/exist/xmlrpc/db"
user="admin" password="">
import module namespace repo='http://exist-db.org/xquery/repo';
let $a := repo:install('http://127.0.0.1:8080/exist/repo/packages/sade-0.2.xar')
let $a := repo:install('http://127.0.0.1:8080/exist/repo/packages/${app.name}-${app.version}.xar')
return "done"
</xdb:xquery>
</target>
......@@ -33,7 +34,7 @@
user="admin" password="">
import module namespace repo='http://exist-db.org/xquery/repo';
(: package as named in expath-pkg.xml :)
let $aa := repo:deploy('http://www.telota.de/sade')
let $aa := repo:deploy('${app.uri}')
return "done"
</xdb:xquery>
......
--- build/sade/webapps/exist/WEB-INF/conf.xml.orig 2013-04-24 18:54:03.959893264 +0200
+++ build/sade/webapps/exist/WEB-INF/conf.xml 2013-04-24 18:54:24.075894107 +0200
@@ -820,6 +820,8 @@
<!-- XQDoc module: required for generating function documentation -->
<module uri="http://exist-db.org/xquery/xqdoc" class="org.exist.xqdoc.xquery.XQDocModule"/>
+ <module uri="http://exist-db.org/xquery/cqlparser" class="org.exist.xquery.modules.cqlparser.CQLParserModule" />
+
<!--
<module uri="http://exist-db.org/xquery/cssparser" class="org.exist.xquery.modules.cssparser.CSSParserModule"/>
<module uri="http://exist-db.org/xquery/backups" class="org.exist.backup.xquery.BackupModule" />
@@ -893,4 +895,4 @@
-->
<xupdate allowed-fragmentation="100" enable-consistency-checks="no"/>
-</exist>
\ Kein Zeilenumbruch am Dateiende.
+</exist>
......@@ -17,8 +17,8 @@
<!-- insert the values from build.properties into the xar meta files: repo.xml and expath-pkg.xml -->
<target name="configure-metafiles">
<copy file="repo.template.xml" tofile="repo.xml" />
<copy file="expath-pkg.template.xml" tofile="expath-pkg.xml" />
<copy file="repo.template.xml" tofile="repo.xml" overwrite="${conf.overwrite}"/>
<copy file="expath-pkg.template.xml" tofile="expath-pkg.xml" overwrite="${conf.overwrite}"/>
<replace dir="." includes="repo.xml expath-pkg.xml"
propertyFile="../build.properties">
<replacefilter
......@@ -41,4 +41,4 @@
property="projects.dir"/>
</replace>
</target>
</project>
\ No newline at end of file
</project>
<?xml version="1.0" encoding="UTF-8"?>
<package xmlns="http://expath.org/ns/pkg" name="http://www.telota.de/sade" abbrev="sade" version="0.2" spec="1.0">
<title>SADE</title>
</package>
\ No newline at end of file
......@@ -8,10 +8,10 @@
<copyright>true</copyright>
<type>application</type>
<target>@app.name@</target>
<prepare>setup.xql</prepare>
<!-- <finish/>
<permissions user="admin" password="" group="dba" mode="rw-rw-r-/-"/>
<!-- prepare>setup.xql</prepare -->
<finish>setup.xql</finish>
<!-- permissions user="admin" password="" group="dba" mode="rw-rw-r-/-"/>
<deployed>@timestamp@</deployed>-->
<deployed>2013-04-15T14:52:36.853+01:00</deployed>
</meta>
\ No newline at end of file
</meta>
<?xml version="1.0" encoding="UTF-8"?>
<meta xmlns="http://exist-db.org/xquery/repo">
<description>SADE</description>
<author/>
<website/>
<status>alpha</status>
<license>GNU-LGPL</license>
<copyright>true</copyright>
<type>application</type>
<target>sade</target>
<deployed>2012-12-21T14:52:36.853+01:00</deployed>
</meta>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment