From fe62901347f2f45a8ce9e13bc899276485d351ad Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 22 Nov 2011 00:19:35 +0000
Subject: [PATCH] CSPACE-4526: With Richard, parameterized additional data
 source configuration files via POM replacement. Some of these changes will be
 moot once integrated with forthcoming Nuxeo fix for JNDI corruption issue.

---
 .../5.4.2-HF05/config/datasources-config.xml  |  2 +-
 .../5.4.2-HF05/config/default-repo-config.xml |  3 +-
 .../config/datasources-config.xml             |  2 +-
 services/JaxRsServiceProvider/pom.xml         | 57 +++++++++++--------
 .../src/main/resources/log4j.properties       |  2 +-
 .../src/main/webapp/META-INF/context.xml      | 22 +++++++
 6 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/config/datasources-config.xml b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/config/datasources-config.xml
index e301d84c3..767fc5dd8 100644
--- a/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/config/datasources-config.xml
+++ b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/config/datasources-config.xml
@@ -4,7 +4,7 @@
   <!--
     <datasource name="jdbc/nxaudit" xaDataSource="com.mysql.jdbc.jdbc2.optional.MysqlXADataSource"
 	-->
-	<datasource name="jdbc/nxaudit" xaDataSource="org.postgres.jdbc.jdbc2.optional.PostgreSQLXADataSource"
+	<datasource name="jdbc/nxaudit" xaDataSource="org.postgresql.xa.PGXADataSource"
       maxActive="20" maxIdle="5">
         <property name="databaseName">nuxeo</property>
         <property name="user">nuxeo</property>
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 24aee0f58..bc049997a 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
@@ -9,8 +9,9 @@
         <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>
+        <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>
 		<schema>
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/config/datasources-config.xml b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/config/datasources-config.xml
index a9d7b870e..a54ddc87a 100644
--- a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/config/datasources-config.xml
+++ b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/config/datasources-config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <component name="config:datasources">
   <extension target="org.nuxeo.runtime.datasource" point="datasources">
-    <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>
diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 1fd370d02..a80329628 100644
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -595,15 +595,19 @@
     <build>
         <finalName>cspace-services</finalName>
         <defaultGoal>package</defaultGoal>
-					<filters>
-						<filter>../../build.properties</filter>
-					</filters>
-					<resources>
-						<resource>
-							<directory>src/main/resources</directory>
-							<filtering>true</filtering>
-						</resource>
-					</resources>
+        <filters>
+            <filter>../../build.properties</filter>
+        </filters>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/webapp/META-INF</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -623,20 +627,20 @@
                     </files>
                 </configuration>
             </plugin>
-						<plugin>
-							<groupId>org.apache.maven.plugins</groupId>
-							<artifactId>maven-resources-plugin</artifactId>
-							<version>2.5</version>
-							<executions>
-								<execution>
-									<phase>process-resources</phase>
-									<goals>
-										<goal>resources</goal>
-									</goals>
-								</execution>
-							</executions>
-						</plugin>
-             <plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.5</version>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.codehaus.cargo</groupId>
                 <artifactId>cargo-maven2-plugin</artifactId>
                 <version>0.3</version>
@@ -672,7 +676,14 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
+                <version>2.1.1</version>
                 <configuration>
+                    <webResources>
+                        <resource>
+                          <directory>src/main/webapp</directory>
+                          <filtering>true</filtering>
+                        </resource>
+                    </webResources>
                     <archive>
                         <manifest>
                             <packageName>${pom.groupid}</packageName>
diff --git a/services/JaxRsServiceProvider/src/main/resources/log4j.properties b/services/JaxRsServiceProvider/src/main/resources/log4j.properties
index 7a8f7289d..2be5675d6 100644
--- a/services/JaxRsServiceProvider/src/main/resources/log4j.properties
+++ b/services/JaxRsServiceProvider/src/main/resources/log4j.properties
@@ -23,7 +23,7 @@ log4j.appender.R.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n
 #
 # CollectionSpace log levels
 #
-log4j.logger.org.collectionspace=ERROR
+log4j.logger.org.collectionspace=DEBUG
 log4j.logger.perf.collectionspace=ERROR
 
 log4j.logger.org.nuxeo=ERROR
diff --git a/services/JaxRsServiceProvider/src/main/webapp/META-INF/context.xml b/services/JaxRsServiceProvider/src/main/webapp/META-INF/context.xml
index 323264340..b327a7aa4 100644
--- a/services/JaxRsServiceProvider/src/main/webapp/META-INF/context.xml
+++ b/services/JaxRsServiceProvider/src/main/webapp/META-INF/context.xml
@@ -92,6 +92,7 @@
     mail.smtp.user="anonymous" password="password"
     mail.from="noreply@nuxeo.com" mail.debug="false" />
 	
+    <!--
 	<Resource name="jdbc/CspaceDS"
             auth="Container"
             type="javax.sql.DataSource"
@@ -110,6 +111,27 @@
             driverClassName="com.mysql.jdbc.Driver"
             url="jdbc:mysql://localhost:3306/nuxeo"
             maxActive="8"
+            maxIdle="4"/>
+            -->
+            
+     <Resource name="jdbc/CspaceDS"
+            auth="Container"
+            type="javax.sql.DataSource"
+            username="${db.user}"
+            password="${db.user.password}"
+            driverClassName="${db.jdbc.driver.class}"
+            url="jdbc:${db}://localhost:${db.port}/cspace"
+            maxActive="8"
+            maxIdle="4"/>
+			
+	<Resource name="jdbc/NuxeoDS"
+            auth="Container"
+            type="javax.sql.DataSource"
+            username="${db.user}"
+            password="${db.user.password}"
+            driverClassName="${db.jdbc.driver.class}"
+            url="jdbc:${db}://localhost:${db.port}/nuxeo"
+            maxActive="8"
             maxIdle="4"/>	
 
 </Context>
-- 
2.47.3