From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Fri, 17 Jun 2011 22:49:43 +0000 (+0000)
Subject: NOJIRA - stripping carriage returns from nuxeo.conf, which made shell scripts on... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=628e847642b4b404b13406c2467820b820c0de2f;p=tmp%2Fjakarta-migration.git

NOJIRA - stripping carriage returns from nuxeo.conf, which made shell scripts on *nix gag.
---

diff --git a/src/main/resources/config/nuxeo.conf b/src/main/resources/config/nuxeo.conf
index f72d0dafb..877729bd3 100644
--- a/src/main/resources/config/nuxeo.conf
+++ b/src/main/resources/config/nuxeo.conf
@@ -1,95 +1,95 @@
-# Configuration file for Nuxeo
-
-# See
-# https://doc.nuxeo.com/display/NXDOC/Configuring+Nuxeo+EP
-# and
-# https://doc.nuxeo.com/display/NXDOC/Available+Parameters+for+nuxeo.conf
-# 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 default layout -------------------------------------------
-# Relative paths will be anchored at NUXEO_HOME
-#nuxeo.log.dir=log
-#nuxeo.pid.dir=bin
-#nuxeo.data.dir=data
-
-# 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.instance.name=
-#org.nuxeo.ecm.instance.description=
-#org.nuxeo.ecm.product.name=
-#org.nuxeo.ecm.product.version=
-#org.nuxeo.ecm.webapp.dashboard.mode=
-
-# Database configuration
-#nuxeo.db.name= 
-nuxeo.db.user=nuxeo
-nuxeo.db.password=nuxpw
-#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=
-
-# OpenSocial settings
-#opensocial.gadgets.host=
-#opensocial.gadgets.port= 
-#opensocial.proxy.proxySet=
-#opensocial.proxy.proxyHost=
-#opensocial.proxy.proxyPort=
-#opensocial.proxy.user=
-#opensocial.proxy.password=
-
-## 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:$DIRNAME/../log/gc.log  -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps
-
-# Use BEA JROCKIT
-#JAVA_HOME=/usr/local/jrockit-R27.4.0-jdk1.5.0_12
-#JAVA_OPTS=-server -Xms$HEAP_SIZE -Xmx$HEAP_SIZE -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
-# Enable Jrockit Mission control
-#JAVA_OPTS=$JAVA_OPTS -Xmanagement
-
+# Configuration file for Nuxeo
+
+# See
+# https://doc.nuxeo.com/display/NXDOC/Configuring+Nuxeo+EP
+# and
+# https://doc.nuxeo.com/display/NXDOC/Available+Parameters+for+nuxeo.conf
+# 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 default layout -------------------------------------------
+# Relative paths will be anchored at NUXEO_HOME
+#nuxeo.log.dir=log
+#nuxeo.pid.dir=bin
+#nuxeo.data.dir=data
+
+# 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.instance.name=
+#org.nuxeo.ecm.instance.description=
+#org.nuxeo.ecm.product.name=
+#org.nuxeo.ecm.product.version=
+#org.nuxeo.ecm.webapp.dashboard.mode=
+
+# Database configuration
+#nuxeo.db.name= 
+nuxeo.db.user=nuxeo
+nuxeo.db.password=nuxpw
+#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=
+
+# OpenSocial settings
+#opensocial.gadgets.host=
+#opensocial.gadgets.port= 
+#opensocial.proxy.proxySet=
+#opensocial.proxy.proxyHost=
+#opensocial.proxy.proxyPort=
+#opensocial.proxy.user=
+#opensocial.proxy.password=
+
+## 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:$DIRNAME/../log/gc.log  -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps
+
+# Use BEA JROCKIT
+#JAVA_HOME=/usr/local/jrockit-R27.4.0-jdk1.5.0_12
+#JAVA_OPTS=-server -Xms$HEAP_SIZE -Xmx$HEAP_SIZE -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
+# Enable Jrockit Mission control
+#JAVA_OPTS=$JAVA_OPTS -Xmanagement
+