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

diff --git a/src/main/resources/config/nuxeo.conf b/src/main/resources/config/nuxeo.conf
index f72d0dafb0aadbb0b9dea38c3fe5642e887cc7a6..877729bd3de31ae9f6f464fc810603f180876488 100644 (file)
--- a/src/main/resources/config/nuxeo.conf
+++ b/src/main/resources/config/nuxeo.conf
@@ -1,95 +1,95 @@
-# Configuration file for Nuxeo\r
-\r
-# See\r
-# https://doc.nuxeo.com/display/NXDOC/Configuring+Nuxeo+EP\r
-# and\r
-# https://doc.nuxeo.com/display/NXDOC/Available+Parameters+for+nuxeo.conf\r
-# for detailed information about the settings below\r
-\r
-# Java ---------------------------------------------------\r
-#JAVA_HOME=/usr/lib/jvm/java-6-sun\r
-#JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home\r
-JAVA_OPTS=-Xms512m -Xmx768m -XX:MaxPermSize=512m -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dfile.encoding=UTF-8\r
-\r
-# Nuxeo default layout -------------------------------------------\r
-# Relative paths will be anchored at NUXEO_HOME\r
-#nuxeo.log.dir=log\r
-#nuxeo.pid.dir=bin\r
-#nuxeo.data.dir=data\r
-\r
-# Will regenerate config from these parameters each time the server is\r
-# restarted\r
-nuxeo.force.generation=true\r
-\r
-# General parameters\r
-#nuxeo.templates=collectionspace_mysql\r
-#nuxeo.templates=collectionspace_postgresql\r
-nuxeo.templates=collectionspace_@DB@\r
-#nuxeo.bind.address=0.0.0.0 \r
-#nuxeo.url=http://localhost:8080/nuxeo\r
-#org.nuxeo.ecm.contextPath=/nuxeo\r
-\r
-#org.nuxeo.ecm.instance.name=\r
-#org.nuxeo.ecm.instance.description=\r
-#org.nuxeo.ecm.product.name=\r
-#org.nuxeo.ecm.product.version=\r
-#org.nuxeo.ecm.webapp.dashboard.mode=\r
-\r
-# Database configuration\r
-#nuxeo.db.name= \r
-nuxeo.db.user=nuxeo\r
-nuxeo.db.password=nuxpw\r
-#nuxeo.db.host=\r
-#nuxeo.db.port=\r
-#nuxeo.db.min-pool-size=\r
-#nuxeo.db.max-pool-size=\r
-#nuxeo.vcs.min-pool-size= \r
-#nuxeo.vcs.max-pool-size=\r
-\r
-# Mail settings (for notifications)\r
-#nuxeo.notification.eMailSubjectPrefix="[Nuxeo]"\r
-#mail.smtp.host=\r
-#mail.smtp.port=\r
-#mail.smtp.auth=        \r
-#mail.smtp.username=\r
-#mail.smtp.password=    \r
-#mail.from=\r
-\r
-#mailservice.user=\r
-#mailservice.password=\r
-#mail.store.protocol= \r
-#mail.transport.protocol=\r
-#mail.user= \r
-#mail.pop3.host=\r
-#mail.debug=\r
-\r
-# OpenSocial settings\r
-#opensocial.gadgets.host=\r
-#opensocial.gadgets.port= \r
-#opensocial.proxy.proxySet=\r
-#opensocial.proxy.proxyHost=\r
-#opensocial.proxy.proxyPort=\r
-#opensocial.proxy.user=\r
-#opensocial.proxy.password=\r
-\r
-## More JVM options ------------------------------------------\r
-\r
-# DEBUGGING ----------------------------------------------\r
-# Sample JPDA settings for remote socket debugging\r
-#JAVA_OPTS=$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n\r
-\r
-# Sample JPDA settings for shared memory debugging\r
-#JAVA_OPTS=$JAVA_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=n,address=jboss\r
-\r
-# Enable jconsole\r
-#JAVA_OPTS=$JAVA_OPTS -Dcom.sun.management.jmxremote=true\r
-\r
-# Log Garbage Collector informations into a file\r
-#JAVA_OPTS=$JAVA_OPTS -Xloggc:$DIRNAME/../log/gc.log  -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps\r
-\r
-# Use BEA JROCKIT\r
-#JAVA_HOME=/usr/local/jrockit-R27.4.0-jdk1.5.0_12\r
-#JAVA_OPTS=-server -Xms$HEAP_SIZE -Xmx$HEAP_SIZE -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000\r
-# Enable Jrockit Mission control\r
-#JAVA_OPTS=$JAVA_OPTS -Xmanagement\r
-\r
+# 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
+