Merge pull request #723 from wolfgangmm/develop

[ignore] Use the same configuration for development and releases
eXist-db · Jul 7, 2015 · e34eb95 · e34eb95
2 parents a79152f + 5423870
commit e34eb95
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/conf.xml.tmpl b/conf.xml.tmpl
@@ -820,9 +820,8 @@
 
 
             <!-- Modules to be enabled when building the distribution -->
-            <!--
             <module uri="http://exist-db.org/xquery/contentextraction"  class="org.exist.contentextraction.xquery.ContentExtractionModule" />
-            <module uri="http://exist-db.org/xquery/context"            class="org.exist.xquery.modules.context.ContextModule" />
+            <!--module uri="http://exist-db.org/xquery/context"            class="org.exist.xquery.modules.context.ContextModule" /-->
             <module uri="http://exist-db.org/xquery/counter"            class="org.exist.xquery.modules.counter.CounterModule" />
             <module uri="http://exist-db.org/xquery/datetime"           class="org.exist.xquery.modules.datetime.DateTimeModule" />
             <module uri="http://exist-db.org/xquery/httpclient"         class="org.exist.xquery.modules.httpclient.HTTPClientModule" />
@@ -831,9 +830,8 @@
             <module uri="http://exist-db.org/xquery/mail"               class="org.exist.xquery.modules.mail.MailModule" />
             <module uri="http://exist-db.org/xquery/scheduler"          class="org.exist.xquery.modules.scheduler.SchedulerModule" />
             <module uri="http://exist-db.org/xquery/sql"                class="org.exist.xquery.modules.sql.SQLModule" />
-            <module uri="http://exist-db.org/xquery/versioning/svn"     class="org.exist.versioning.svn.xquery.SVNModule" />
+            <!--module uri="http://exist-db.org/xquery/versioning/svn"     class="org.exist.versioning.svn.xquery.SVNModule" /-->
             <module uri="http://exist-db.org/xquery/xmldiff"            class="org.exist.xquery.modules.xmldiff.XmlDiffModule" />
-            -->
 
             <!--
                 XSLFO:
@@ -842,11 +840,9 @@
                 - org.exist.xquery.modules.xslfo.RenderXXepProcessorAdapter for RenderX's XEP
                 - org.exist.xquery.modules.xslfo.AntennaHouseProcessorAdapter for AntennaHouse Formatter
             -->
-            <!--
             <module uri="http://exist-db.org/xquery/xslfo" class="org.exist.xquery.modules.xslfo.XSLFOModule">
                 <parameter name="processorAdapter" value="org.exist.xquery.modules.xslfo.ApacheFopProcessorAdapter"/>
             </module>
-            -->
 
             <!--
                 exiftool:

diff --git a/extensions/build.properties b/extensions/build.properties
@@ -24,7 +24,7 @@ include.feature.exquery.restxq = true
 include.feature.exquery.module.request = true
 
 # Binary Content and Metadata Extraction Module
-include.feature.contentextraction = false
+include.feature.contentextraction = true
 
 # Debugging extension
 include.feature.debugger = false
@@ -52,7 +52,7 @@ include.feature.metadata.sleepycat = false
 include.feature.netedit = false
 
 # Security ActiveDirectory extension for eXist (requires LDAP extension) 
-include.feature.security.activedirectory = false
+include.feature.security.activedirectory = true
 
 # Security LDAP extension for eXist
 include.feature.security.ldap = true
@@ -139,7 +139,7 @@ include.module.memcached.url = http://spymemcached.googlecode.com/files/memcache
 include.module.oracle = false
 
 # Scheduler module
-include.module.scheduler = false
+include.module.scheduler = true
 
 # Example: implements a simple query language which is translated into XQuery
 include.module.simpleql = false
@@ -155,7 +155,7 @@ include.module.xmpp = false
 include.module.xmpp.url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_3_1_0.zip
 
 # XSL FO transformations (Uses Apache FOP)
-include.module.xslfo = false
+include.module.xslfo = true
 include.module.xslfo.url = http://apache.cs.uu.nl/xmlgraphics/fop/binaries/fop-1.1-bin.zip
 
 # Module to execute external processes (dba users only)