]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
CSPACE-4526: Removing now-unused nuxeo.conf file. Parameterizing Nuxeo datasources...
authorAron Roberts <aron@socrates.berkeley.edu>
Tue, 22 Nov 2011 21:39:22 +0000 (21:39 +0000)
committerAron Roberts <aron@socrates.berkeley.edu>
Tue, 22 Nov 2011 21:39:22 +0000 (21:39 +0000)
3rdparty/nuxeo/build.xml
3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/config/datasources-config.xml
3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/config/datasources-config.xml
build.xml
src/main/resources/config/nuxeo.conf [deleted file]

index c61d21a512f3987780a54b778b1ae7442bbfa13c..941cd2e65a4e041e75d1d600cb636423276b6b62 100644 (file)
        description="deploy nuxeo server libs to ${jee.server.cspace}">\r
         <copy todir="${jee.server.cspace}/nuxeo-server">\r
             <fileset dir="${basedir}/nuxeo-server/${nuxeo.release}"/>\r
+            <filterset>\r
+                <filter token="DB" value="${db}" />\r
+                <filter token="NUXEO_USER" value="${db.nuxeo.user}" />\r
+                <filter token="NUXEO_PW" value="${env.DB_PASSWORD_NUXEO}" />\r
+            </filterset>\r
         </copy>\r
         <ant antfile="nuxeo-platform-collectionspace/build.xml" target="deploy" inheritall="false"/>\r
                <!--\r
index a9d7b870ea600a4d90f973fe4c5b557108041acc..fdf8929e9e769bf300fd0c474cbf8b44cd4170d2 100644 (file)
@@ -4,8 +4,8 @@
     <datasource name="jdbc/nxaudit" xaDataSource="com.mysql.jdbc.jdbc2.optional.MysqlXADataSource"
       maxActive="20" maxIdle="5">
         <property name="databaseName">nuxeo</property>
-        <property name="user">nuxeo</property>
-        <property name="password">nuxpw</property>
+        <property name="user">@NUXEO_USER@</property>
+        <property name="password">@NUXEO_PW@</property>
     </datasource>
   </extension>
 </component>
index a54ddc87a91027441638f46ce2575835ee4328a1..66ca8031c1cf7c3616687c2bb8a818cfee69b2ed 100644 (file)
@@ -1,11 +1,14 @@
 <?xml version="1.0"?>
 <component name="config:datasources">
   <extension target="org.nuxeo.runtime.datasource" point="datasources">
-    <datasource name="jdbc/nxaudit" xaDataSource="org.postgresql.xa.PGXADataSource"
+  <!--
+    <datasource name="jdbc/nxaudit" xaDataSource="com.mysql.jdbc.jdbc2.optional.MysqlXADataSource"
+       -->
+       <datasource name="jdbc/nxaudit" xaDataSource="org.postgresql.xa.PGXADataSource"
       maxActive="20" maxIdle="5">
         <property name="databaseName">nuxeo</property>
-        <property name="user">nuxeo</property>
-        <property name="password">nuxpw</property>
+        <property name="user">@NUXEO_USER@</property>
+        <property name="password">@NUXEO_PW@</property>
     </datasource>
   </extension>
 </component>
index b13f72358b31056757358346263b8892a73fb6c4..bafb6936715d7563f595d0292d395681de6179b9 100644 (file)
--- a/build.xml
+++ b/build.xml
         <ant antfile="services/build.xml" target="import" inheritAll="false"/>\r
     </target>\r
 \r
-    <target name="deploy" depends="checkvars,install,setup_nuxeo.conf,setup_cspaceds.cfg,setup_initdb.sql"\r
+    <target name="deploy" depends="checkvars,install,setup_cspaceds.cfg,setup_initdb.sql"\r
             description="deploy services in ${jee.server.cspace}">\r
         <!-- copy db scripts, etc. -->\r
                <copy todir="${jee.server.cspace}/cspace/services/scripts">\r
                </target>\r
 \r
 \r
-               <target name="setup_nuxeo.conf"\r
-                                        description="copy nuxeo.conf, replacing keyword to set DB dialect">\r
-                       <property name="src.nuxeo.conf" value="${src}/main/resources/config/nuxeo.conf"/>\r
-                       <delete file="${jee.bin}/nuxeo.conf" failonerror="false" />\r
-                       <copy file="${src.nuxeo.conf}" todir="${jee.bin}">\r
-                               <filterset>\r
-                                       <filter token="DB" value="${db}" />\r
-                                       <filter token="NUXEO_USER" value="${db.nuxeo.user}" />\r
-                                       <filter token="NUXEO_PW" value="${env.DB_PASSWORD_NUXEO}" />\r
-                               </filterset>\r
-                       </copy>\r
-    </target>\r
-\r
                <target name="setup_cspaceds.cfg"\r
                                         description="copy cspace-ds.xml, replacing keywords">\r
                        <property name="src.cspaceds.cfg" value="${src}/main/resources/config/cspace-ds.xml"/>\r
diff --git a/src/main/resources/config/nuxeo.conf b/src/main/resources/config/nuxeo.conf
deleted file mode 100644 (file)
index d492d30..0000000
+++ /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