From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 22 Nov 2011 21:57:25 +0000 (+0000)
Subject: CSPACE-4526: Parameterized default-repo-config.xml in nuxeo-server.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=48c598eb93630292c023fca8d052b90def56d783;p=tmp%2Fjakarta-migration.git

CSPACE-4526: Parameterized default-repo-config.xml in nuxeo-server.
---

diff --git a/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/config/default-repo-config.xml b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/config/default-repo-config.xml
index 50fa6b258..b6469ddb3 100644
--- a/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/config/default-repo-config.xml
+++ b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/config/default-repo-config.xml
@@ -5,15 +5,15 @@
     <repository name="default"
       factory="org.nuxeo.ecm.core.storage.sql.ra.PoolingRepositoryFactory">
       <repository name="default">
+		<!--
         <xa-datasource>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource>
         <property name="URL">jdbc:mysql://localhost:3306/nuxeo?relaxAutoCommit=true</property>
-		<!--
+                -->
         <xa-datasource>org.postgresql.xa.PGXADataSource</xa-datasource>
         <property name="URL">jdbc:postgresql://localhost:5432/nuxeo</property>
-    -->
         <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>
 		<schema>
           <field type="largetext">imd:user_comment</field> <!-- Needed for large image metadata (image_metadata) that gets inserted here. -->
           <field type="largetext">note</field>
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/config/default-repo-config.xml b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/config/default-repo-config.xml
index c824fbf6f..fb63f09b8 100644
--- a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/config/default-repo-config.xml
+++ b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/config/default-repo-config.xml
@@ -5,15 +5,16 @@
     <repository name="default"
       factory="org.nuxeo.ecm.core.storage.sql.ra.PoolingRepositoryFactory">
       <repository name="default">
+		<!--
         <xa-datasource>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource>
         <property name="URL">jdbc:mysql://localhost:3306/nuxeo?relaxAutoCommit=true</property>
-		<!--
-        <xa-datasource>org.postgres.jdbc.jdbc2.optional.PostgreSQLXADataSource</xa-datasource>
-        <property name="URL">jdbc:postgresql://localhost:5432/nuxeo</property>
 		-->
-        <property name="User">nuxeo</property>
-        <property name="Password">nuxpw</property>
-		<schema>
+ 	<xa-datasource>org.postgresql.xa.PGXADataSource</xa-datasource>
+        <property name="URL">jdbc:postgresql://localhost:5432/nuxeo</property>
+	<property name="DatabaseName">nuxeo</property>
+        <property name="User">@NUXEO_USER@</property>
+        <property name="Password">@NUXEO_PW@</property>
+	<schema>
           <field type="largetext">imd:user_comment</field> <!-- Needed for large image metadata (image_metadata) that gets inserted here. -->
           <field type="largetext">note</field>
           <field type="largetext">webp:content</field>