From 359f8f14225ed8687056cb03005a101ec2e73bce Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Tue, 22 Nov 2011 21:39:22 +0000 Subject: [PATCH] CSPACE-4526: Removing now-unused nuxeo.conf file. Parameterizing Nuxeo datasources-config.xml file in nuxeo-server directory. --- 3rdparty/nuxeo/build.xml | 5 + .../5.4.2-HF05/config/datasources-config.xml | 4 +- .../config/datasources-config.xml | 9 +- build.xml | 15 +- src/main/resources/config/nuxeo.conf | 131 ------------------ 5 files changed, 14 insertions(+), 150 deletions(-) delete mode 100644 src/main/resources/config/nuxeo.conf diff --git a/3rdparty/nuxeo/build.xml b/3rdparty/nuxeo/build.xml index c61d21a51..941cd2e65 100644 --- a/3rdparty/nuxeo/build.xml +++ b/3rdparty/nuxeo/build.xml @@ -117,6 +117,11 @@ description="deploy nuxeo server libs to ${jee.server.cspace}"> + + + + + + nuxeo - nuxeo - nuxpw + @NUXEO_USER@ + @NUXEO_PW@ diff --git a/build.xml b/build.xml index b13f72358..bafb69367 100644 --- a/build.xml +++ b/build.xml @@ -232,7 +232,7 @@ - @@ -262,19 +262,6 @@ - - - - - - - - - - - - diff --git a/src/main/resources/config/nuxeo.conf b/src/main/resources/config/nuxeo.conf deleted file mode 100644 index d492d3026..000000000 --- a/src/main/resources/config/nuxeo.conf +++ /dev/null @@ -1,131 +0,0 @@ -# Configuration file for Nuxeo - -# See https://doc.nuxeo.com/x/PwA7 -# and https://doc.nuxeo.com/x/QQA7 -# for detailed information about the settings below - -# Java --------------------------------------------------- -#JAVA_HOME=/usr/lib/jvm/java-6-sun -#JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home -JAVA_OPTS=-Xms512m -Xmx768m -XX:MaxPermSize=512m -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dfile.encoding=UTF-8 - -# Nuxeo launcher ----------------------------------------- -#launcher.start.max.wait = 300 -#launcher.override.java.tmpdir = true - -# Nuxeo layout ------------------------------------------- -# Relative paths will be anchored at NUXEO_HOME; here are not default but recommended values -#nuxeo.log.dir=/var/log/nuxeo -#nuxeo.pid.dir=/var/run -#nuxeo.data.dir=/var/lib/nuxeo - -# Will regenerate config from these parameters each time the server is restarted -nuxeo.force.generation=true - -# General parameters -#nuxeo.templates=collectionspace_mysql -#nuxeo.templates=collectionspace_postgresql -nuxeo.templates=collectionspace_@DB@ -#nuxeo.bind.address=0.0.0.0 -#nuxeo.url=http://localhost:8080/nuxeo -#org.nuxeo.ecm.contextPath=/nuxeo - -#org.nuxeo.ecm.product.name= -#org.nuxeo.ecm.product.version= - -# Defines the dashboard mode. There are 3 modes: -# - auto: (default) let Nuxeo choose dashboard based on user browser capabilities -# - old: force usage of the 'old' JSF based dashboard for all users -# - opensocial: force usage of the new OpenSocial based dashboard for all users -#org.nuxeo.ecm.webapp.dashboard.mode= - -# Database configuration -#nuxeo.db.name= -nuxeo.db.user=@NUXEO_USER@ -nuxeo.db.password=@NUXEO_PW@ -#nuxeo.db.host= -#nuxeo.db.port= -#nuxeo.db.min-pool-size= -#nuxeo.db.max-pool-size= -#nuxeo.vcs.min-pool-size= -#nuxeo.vcs.max-pool-size= - -# Mail settings (for notifications) -#nuxeo.notification.eMailSubjectPrefix="[Nuxeo]" -#mail.smtp.host= -#mail.smtp.port= -#mail.smtp.auth= -#mail.smtp.username= -#mail.smtp.password= -#mail.from= - -#mailservice.user= -#mailservice.password= -#mail.store.protocol= -#mail.transport.protocol= -#mail.user= -#mail.pop3.host= -#mail.debug= - -# OOo server config -#jod.connection.protocol=SOCKET -#jod.max.tasks.per.process= -#jod.task.execution.timeout= -#jod.task.queue.timeout= -#jod.office.home= -#jod.jpipe.lib.path= -#jod.template.profile.dir= - -# OpenSocial settings -#opensocial.gadgets.embeddedServer= -#opensocial.gadgets.host= -#opensocial.gadgets.port= -#opensocial.gadgets.path= -#opensocial.proxy.proxySet= -#opensocial.proxy.proxyHost= -#opensocial.proxy.proxyPort= -#opensocial.proxy.user= -#opensocial.proxy.password= -#opensocial.trusted.hosts= - -# Encoding of the zip entries filename -#zip.entry.encoding=ascii - -# JSF facelets -# When a page is requested, what interval in seconds should the compiler check -# for changes. -# If you don't want the compiler to check for changes once the page is -# compiled, then use a value of -1. -# Setting a low refresh period helps during development to be able to edit -# pages in a running application. -#facelets.REFRESH_PERIOD=2 - -# LiveEdit auto-versioning will minor version if set to minor -#org.nuxeo.ecm.platform.liveedit.autoversioning=minor - -# Clustering settings -#repository.clustering.enabled=false -#repository.clustering.delay=1000 -# If clustering is activated, set repository.binary.store=/path/to/some/shared/folder/for/binaries - -## More JVM options ------------------------------------------ - -# DEBUGGING ---------------------------------------------- -# Sample JPDA settings for remote socket debugging -#JAVA_OPTS=$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n - -# Sample JPDA settings for shared memory debugging -#JAVA_OPTS=$JAVA_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=n,address=jboss - -# Enable jconsole -#JAVA_OPTS=$JAVA_OPTS -Dcom.sun.management.jmxremote=true - -# Log Garbage Collector informations into a file -#JAVA_OPTS=$JAVA_OPTS -Xloggc:${nuxeo.log.dir}/gc.log -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps - -# Enable JMX -#JAVA_OPTS=$JAVA_OPTS -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=1089 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false - -# Disable soft references -#JAVA_OPTS=$JAVA_OPTS -XX:SoftRefLRUPolicyMSPerMB=0 -nuxeo.wizard.done=false -- 2.47.3