Permalink
Browse files

Merge remote-tracking branch 'origin/develop' into feature/setuid

Conflicts:
	test/src/org/exist/security/XMLDBSecurityTest.java
  • Loading branch information...
2 parents 0d2d3d3 + dca9b61 commit d512ac3da642dec97626e3477fed9e1840aed832 @adamretter adamretter committed Jan 24, 2014
Showing 430 changed files with 36,663 additions and 35,884 deletions.
View
@@ -39,17 +39,15 @@
<classpathentry kind="lib" path="lib/endorsed/xercesImpl-2.11.0.jar"/>
<classpathentry kind="lib" path="lib/endorsed/xml-resolver-1.2.jar"/>
<classpathentry kind="lib" path="lib/endorsed/xalan-2.7.1.jar"/>
- <classpathentry kind="lib" path="extensions/fluent/lib/hamcrest-core-1.1.jar"/>
- <classpathentry kind="lib" path="extensions/fluent/lib/hamcrest-library-1.1.jar"/>
+ <classpathentry kind="lib" path="lib/test/hamcrest-core-1.3.jar"/>
+ <classpathentry kind="lib" path="extensions/fluent/lib/hamcrest-library-1.3.jar"/>
<classpathentry kind="lib" path="extensions/fluent/lib/jmock-2.4.0.jar"/>
<classpathentry kind="lib" path="extensions/fluent/lib/jmock-junit4-2.4.0.jar"/>
<classpathentry kind="lib" path="lib/core/commons-pool-1.6.jar"/>
<classpathentry kind="lib" path="lib/core/ws-commons-util-1.0.2.jar"/>
<classpathentry kind="lib" path="lib/core/xmlrpc-client-3.1.3.jar"/>
<classpathentry kind="lib" path="lib/core/xmlrpc-common-3.1.3.jar"/>
<classpathentry kind="lib" path="lib/core/xmlrpc-server-3.1.3.jar"/>
- <classpathentry kind="lib" path="extensions/modules/lib/cssparser-0.9.5.jar"/>
- <classpathentry kind="lib" path="extensions/modules/lib/sac-1.3.jar"/>
<classpathentry kind="lib" path="extensions/expath/lib/http-client-java-1.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="extensions/exquery/lib/exquery-common-1.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="extensions/exquery/lib/exquery-annotations-common-api-1.0-SNAPSHOT.jar"/>
@@ -70,14 +68,14 @@
<classpathentry kind="lib" path="lib/optional/axis-ant-1.4.jar"/>
<classpathentry kind="lib" path="lib/optional/axis-schema-1.3.jar"/>
<classpathentry kind="lib" path="lib/optional/axis-1.4.jar"/>
- <classpathentry kind="lib" path="lib/optional/commons-fileupload-1.2.2.jar"/>
+ <classpathentry kind="lib" path="lib/optional/commons-fileupload-1.3.jar"/>
<classpathentry kind="lib" path="lib/optional/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="lib/core/commons-io-2.4.jar"/>
<classpathentry kind="lib" path="lib/optional/jaxrpc-1.1.jar"/>
<classpathentry kind="lib" path="lib/optional/saaj-1.2.jar"/>
<classpathentry kind="lib" path="lib/optional/wsdl4j-1.5.1.jar"/>
<classpathentry kind="lib" path="tools/ant/lib/ant.jar"/>
- <classpathentry kind="lib" path="lib/test/junit-4.8.2.jar"/>
+ <classpathentry kind="lib" path="lib/test/junit-4.11.jar"/>
<classpathentry kind="lib" path="tools/ircbot/lib/pircbot.jar"/>
<classpathentry kind="lib" path="tools/wrapper/lib/wrapper.jar"/>
<classpathentry kind="lib" path="lib/core/jta-1.1.jar"/>
@@ -93,8 +91,8 @@
<classpathentry kind="lib" path="tools/ant/lib/xmlunit-1.3.jar"/>
<classpathentry kind="lib" path="lib/user/activation-1.1.1.jar"/>
<classpathentry kind="lib" path="lib/user/nekohtml-1.9.15.jar"/>
- <classpathentry kind="lib" path="lib/test/easymock-2.5.2.jar"/>
- <classpathentry kind="lib" path="lib/test/easymockclassextension-2.5.2.jar"/>
+ <classpathentry kind="lib" path="lib/test/easymock-3.2.jar"/>
+ <classpathentry kind="lib" path="lib/test/easymockclassextension-3.2.jar"/>
<classpathentry kind="lib" path="extensions/webdav/lib/jdom-1.1.jar"/>
<classpathentry kind="lib" path="extensions/webdav/lib/mime-util-2.1.3.jar"/>
<classpathentry kind="lib" path="lib/optional/commons-compress-1.4.1.jar"/>
@@ -107,9 +105,6 @@
<classpathentry kind="lib" path="lib/core/commons-codec-1.7.jar"/>
<classpathentry kind="lib" path="lib/core/gnu-crypto-2.0.1-min.jar"/>
<classpathentry kind="lib" path="lib/optional/commons-net-2.2.jar"/>
- <classpathentry kind="lib" path="extensions/indexes/lucene/lib/lucene-analyzers-3.6.1.jar"/>
- <classpathentry kind="lib" path="extensions/indexes/lucene/lib/lucene-core-3.6.1.jar"/>
- <classpathentry kind="lib" path="extensions/indexes/lucene/lib/lucene-queries-3.6.1.jar"/>
<classpathentry kind="lib" path="tools/jetty/lib/existdb-favicon.jar"/>
<classpathentry kind="lib" path="tools/jetty/lib/jetty-continuation-8.1.9.v20130131.jar"/>
<classpathentry kind="lib" path="tools/jetty/lib/jetty-http-8.1.9.v20130131.jar"/>
@@ -140,5 +135,10 @@
<classpathentry kind="lib" path="lib/optional/httpclient-cache-4.2.3.jar"/>
<classpathentry kind="lib" path="lib/optional/httpcore-4.2.2.jar"/>
<classpathentry kind="lib" path="lib/optional/httpmime-4.2.3.jar"/>
+ <classpathentry kind="lib" path="extensions/indexes/lucene/lib/lucene-analyzers-common-4.4.0.jar"/>
+ <classpathentry kind="lib" path="extensions/indexes/lucene/lib/lucene-core-4.4.0.jar"/>
+ <classpathentry kind="lib" path="extensions/indexes/lucene/lib/lucene-facet-4.4.0.jar"/>
+ <classpathentry kind="lib" path="extensions/indexes/lucene/lib/lucene-queries-4.4.0.jar"/>
+ <classpathentry kind="lib" path="extensions/indexes/lucene/lib/lucene-queryparser-4.4.0.jar"/>
<classpathentry kind="output" path="test/classes"/>
</classpath>
View
@@ -9,8 +9,12 @@ dist/
exist.jar
exist-optional.jar
extensions/**/build/
+extensions/contentextraction/lib/
extensions/lib/
+extensions/modules/lib/
lib/extensions/
+lib/user/svnkit*.jar
+lib/user/icu4j*.jar
local.*
mime-types.xml
start.jar
@@ -38,3 +42,5 @@ tools/wrapper/logs/
backup/
test/junit/
test/temp/
+nbproject/build/
+nbproject/private/
View
@@ -3,4 +3,4 @@ jdk:
- openjdk6
- openjdk7
- oraclejdk7
-script: ./build.sh clean-all all test
+script: ./build.sh clean clean-all all
View
@@ -22,11 +22,11 @@ rem @WINDOWS_INSTALLER_1@
echo WARNING: JAVA_HOME not found in your environment.
echo.
-echo Please, set the JAVA_HOME variable in your enviroment to match the
+echo Please, set the JAVA_HOME variable in your environment to match the
echo location of the Java Virtual Machine you want to use in case of run fail.
echo.
-rem :gotJavaHome
+:gotJavaHome
rem @WINDOWS_INSTALLER_2@
if not "%EXIST_HOME%" == "" goto gotExistHome
@@ -123,7 +123,7 @@
<echo message="-------------------------"/>
<echo message="eXist ${project.version} build"/>
<echo message="-------------------------"/>
- <echo message="GIT revision ${git.commit}"/>
+ <echo message="Git revision ${git.commit}"/>
<echo message=""/>
<echo message="${ant.version}"/>
<echo message="-------------------------"/>
@@ -351,7 +351,7 @@
<attribute name="Project-Version" value="${project.version}"/>
<attribute name="Project-Build" value="${DSTAMP}"/>
<attribute name="Project-CodeName" value="${project.codename}"/>
- <attribute name="GIT-Revision" value="${git.commit}"/>
+ <attribute name="Git-Revision" value="${git.commit}"/>
</manifest>
<exclude name="org/exist/*.xsl"/>
<exclude name="org/exist/ant/**"/>
@@ -377,7 +377,7 @@
<attribute name="Project-Version" value="${project.version}"/>
<attribute name="Project-Build" value="${DSTAMP}"/>
<attribute name="Project-CodeName" value="${project.codename}"/>
- <attribute name="GIT-Revision" value="${git.commit}"/>
+ <attribute name="Git-Revision" value="${git.commit}"/>
</manifest>
<include name="org/exist/start/**"/>
</jar>
@@ -388,7 +388,7 @@
<attribute name="Project-Version" value="${project.version}"/>
<attribute name="Project-Build" value="${DSTAMP}"/>
<attribute name="Project-CodeName" value="${project.codename}"/>
- <attribute name="GIT-Revision" value="${git.commit}"/>
+ <attribute name="Git-Revision" value="${git.commit}"/>
</manifest>
<include name="org/exist/*.xsl"/>
<include name="org/exist/ant/**"/>
@@ -636,6 +636,7 @@
<delete dir="${src.webapp}/WEB-INF/data/fs"/>
<delete dir="${src.webapp}/WEB-INF/data/fs.journal"/>
<delete dir="${src.webapp}/WEB-INF/data/lucene"/>
+ <delete dir="${src.webapp}/WEB-INF/data/range"/>
<delete dir="${src.webapp}/WEB-INF/data/sanity"/>
<delete>
<fileset dir="${src.webapp}/WEB-INF/data" includes="*.dbx,*.log,*.lck,spatial_index.*,counters,restxq.registry"
@@ -64,7 +64,7 @@
<include name="*.jar"/>
</lib>
<!-- Include spatial jars, when available -->
- <lib dir="extensions/indexes/spatial/lib">
+ <lib dir="extensions/indexes/spatial/lib" erroronmissingdir="false">
<include name="*.jar"/>
</lib>
<!-- Include xqdoc jar, needed for xquery function documentation -->
@@ -133,10 +133,7 @@
<exclude name="WEB-INF/expathrepo/**"/>
<exclude name="**/*.log*"/>
</fileset>
- <!-- Betterform -->
- <zipfileset dir="extensions/betterform/main/xrx/" prefix="betterform/samples/xrx">
- <include name="**/*"/>
- </zipfileset>
+
<zipfileset dir="samples" prefix="samples">
<include name="**"/>
<exclude name="**/*~"/>
@@ -157,7 +154,7 @@
<attribute name="Project-Name" value="${project.name}"/>
<attribute name="Project-Version" value="${project.version}"/>
<attribute name="Project-Build" value="${DSTAMP}"/>
- <attribute name="GIT-Revision" value="${git.commit}"/>
+ <attribute name="Git-Revision" value="${git.commit}"/>
</manifest>
</war>
@@ -9,21 +9,43 @@
<!-- import common targets -->
<import file="../../build.xml"/>
-
+ <import file="../../build/scripts/macosx.xml"/>
+
<taskdef resource="net/sf/antcontrib/antcontrib.properties">
<classpath>
<pathelement location="tools/ant/lib/ant-contrib-1.0b3.jar"/>
</classpath>
</taskdef>
<property name="apps.dir" value="installer/apps"/>
+ <property name="installer.scripts" value="installer/scripts"/>
+ <property name="installer.mac.icon" value="${installer.scripts}/icon.icns"/>
+
<property file="installer/apps.properties"/>
<target name="commandline-installer">
<!--ant antfile="build.xml" dir="tools/izpack"/-->
</target>
- <target depends="all,samples,xars,copy_scripts" name="prepare-installer">
+ <target name="macosx" depends="install-appbundler">
+ <taskdef
+ name="bundleapp"
+ classname="com.oracle.appbundler.AppBundlerTask"
+ classpath="${appbundler.jar}" />
+ <bundleapp
+ outputdirectory="${installer.scripts}"
+ name="eXist-db"
+ displayname="eXist-db"
+ identifier="org.exist.start.Main"
+ mainclassname="org.exist.start.Main"
+ shortversion="${project.version.numeric}"
+ icon="${installer.mac.icon}">
+ <classpath file="start.jar"/>
+ <option value="-Dexist.home=$APP_ROOT/.."/>
+ </bundleapp>
+ </target>
+
+ <target depends="all,samples,xars,copy_scripts,macosx" name="prepare-installer">
<path id="izpackdeps">
<fileset dir="${izpack.dir}/lib/">
<include name="*.jar"/>
@@ -38,14 +60,6 @@
<delete dir="${jetty.dir}/work/Jetty__8080__exist"/>
<touch file="webapp/WEB-INF/logs/exist.log"/>
<touch file="webapp/WEB-INF/logs/xmldb.log"/>
- <copy file="installer/scripts/eXist-db.mac/Contents/Info.plist.tmpl"
- tofile="installer/scripts/eXist-db.mac/Contents/Info.plist" filtering="true"
- overwrite="true">
- <filterset>
- <filter token="vmoptions" value=""/>
- <filter token="classpath" value="$APP_PACKAGE/.."/>
- </filterset>
- </copy>
</target>
<target name="clean-installer-xars-dir" description="Remove installer apps.dir directory">
@@ -131,6 +145,8 @@
<izpack input="installer/install.xml"
output="${inst-jar}"
basedir="." izPackDir="${izpack.dir}"
+ compression="bzip2"
+ compressionlevel="9"
installerType="standard"/>
<!--mkdir dir="installer/temp"/>
@@ -130,6 +130,7 @@
<!--test fork="yes" name="xquery.xmlcalabash.XMLCalabashTests" todir="${junit.reports.dat}"/-->
<!--test fork="yes" name="xquery.xproc.XProcTests" todir="${junit.reports.dat}"/-->
<test fork="yes" name="xquery.xquery3.XQuery3Tests" todir="${junit.reports.dat}"/>
+ <test fork="yes" name="xquery.optimizer.OptimizerTests" todir="${junit.reports.dat}"/>
<!-- //-->
<test fork="yes" name="org.exist.util.SortTests" todir="${junit.reports.dat}"/>
@@ -4,7 +4,7 @@
<!-- Call target "dmg" to create dmg file -->
<!-- ======================================================================= -->
<!-- $Id$ -->
-<project basedir="../.." default="dmg" name="Mac OS App">
+<project basedir="../.." default="all" name="Mac OS App">
<description>Build installer</description>
@@ -15,31 +15,51 @@
<property name="app.dir" value="${dist}/eXist-db.app"/>
<property name="app.resources" value="${app.dir}/Contents/Resources"/>
<property name="app.exist" value="${app.resources}/eXist-db"/>
+ <property name="app.icon" value="installer/scripts/icon.icns"/>
+ <property name="codesign.identity" value="Lars Windauer"/>
+ <property name="appbundler.jar" value="${tools.ant}/lib/appbundler-1.0.jar"/>
+ <property name="appbundler.url" value="http://java.net/downloads/appbundler/appbundler-1.0.jar"/>
- <target name="package" depends="jar,create-skeleton,copy-all"/>
+ <available property="appbundler.available" file="${appbundler.jar}"/>
+
+ <target name="app" description="Build Mac OS X dmg (unsigned)" depends="bundle,copy-all,dmg"/>
+
+ <target name="app-signed" description="Build Mac OS X dmg (signed)" depends="bundle,copy-all,codesign,dmg"/>
+
+ <target name="install-appbundler" unless="appbundler.available">
+ <taskdef name="fetch" classname="nl.ow.dilemma.ant.fetch.FetchTask">
+ <classpath>
+ <pathelement location="${tools.ant}/lib/asocat-exist.jar"/>
+ </classpath>
+ </taskdef>
+
+ <fetch dest="${tools.ant}/lib" url="${appbundler.url}"
+ failonerror="false" maxtime="120"/>
+ </target>
+
+ <target name="bundle" depends="prepare-app">
+ <taskdef
+ name="bundleapp"
+ classname="com.oracle.appbundler.AppBundlerTask"
+ classpath="${appbundler.jar}" />
+ <bundleapp
+ outputdirectory="${dist}"
+ name="eXist-db"
+ displayname="eXist-db"
+ identifier="org.exist.start.Main"
+ mainclassname="org.exist.start.Main"
+ shortversion="${project.version.numeric}"
+ icon="${app.icon}">
+ <classpath file="start.jar"/>
+ <option value="-Dexist.home=$APP_ROOT/Contents/Resources/eXist-db"/>
+ </bundleapp>
+ </target>
- <target name="prepare" depends="xars">
+ <target name="prepare-app" depends="install-appbundler,xars">
<delete failonerror="false" dir="${app.dir}"/>
<mkdir dir="${dist}"/>
</target>
- <target name="create-skeleton" depends="prepare">
- <copy todir="${app.dir}">
- <fileset dir="installer/scripts/eXist-db.mac">
- <exclude name=".svn"/>
- <exclude name="Info.plist.tmpl"/>
- </fileset>
- </copy>
- <copy file="installer/scripts/eXist-db.mac/Contents/Info.plist.tmpl"
- tofile="${app.dir}/Contents/Info.plist" filtering="true" overwrite="true">
- <filterset>
- <filter token="vmoptions" value="-Dexist.home=$APP_PACKAGE/Contents/Resources/eXist-db"/>
- <filter token="classpath" value="$APP_PACKAGE/Contents/Resources/eXist-db"/>
- </filterset>
- </copy>
- <mkdir dir="${app.exist}"/>
- </target>
-
<target name="copy-apps">
<copy todir="${app.exist}/autodeploy">
<fileset dir="${basedir}/installer/apps">
@@ -73,7 +93,6 @@
<include name="exist-modules.jar"/>
<include name="exist-fluent.jar"/>
<include name="start.jar"/>
- <include name="start.exe"/>
<include name="examples.jar"/>
<include name="mime-types.xml.tmpl"/>
<include name="mime-types.xml"/>
@@ -124,7 +143,8 @@
<exclude name="jetty/tmp/*"/>
<exclude name="jetty/work/*"/>
<exclude name="ircbot/**"/>
- <include name="aspectj/**"/>
+ <exclude name="aspectj/lib/aspectjtools*.jar"/>
+ <exclude name="aspectj/lib/aspectjweaver*.jar"/>
<exclude name="izpack/**"/>
<exclude name="ant/lib/svnkit*.jar"/>
<include name="jmx/**"/>
@@ -163,8 +183,17 @@
</chmod>
</target>
+ <target name="codesign" description="Codesign .app">
+ <exec executable="/usr/bin/codesign" os="Mac OS X" failonerror="true">
+ <arg value="-f"/>
+ <arg value="-s"/>
+ <arg value="${codesign.identity}"/>
+ <arg value="${app.dir}"/>
+ </exec>
+ </target>
+
<!-- Create a DMG - This only works on MacOSX (requires hdiutil) -->
- <target name="dmg" depends="package" description="Create a DMG package for MacOSX (only works on MacOSX)">
+ <target name="dmg" description="Create a DMG package for MacOSX (only works on MacOSX)">
<!-- Set this property value to your application name -->
<property name="app.name" value="${project.name}"/>
Oops, something went wrong. Retry.

0 comments on commit d512ac3

Please sign in to comment.