CSPACE-4526: With Richard, parameterized additional data source configuration files...

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 e301d84c31fe9d788de1a4cdc37c709bc03b452c..767fc5dd88e894b5312b45ef1f493508c39ac64e 100644 (file)
--- 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 24aee0f58babbc596b76c77cb65d69d0d8901f8a..bc049997a43a81401ef4d7e69efaf5ad3533757e 100644 (file)
--- 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 a9d7b870ea600a4d90f973fe4c5b557108041acc..a54ddc87a91027441638f46ce2575835ee4328a1 100644 (file)
--- 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 1fd370d02d4913fd040b0cca9193fc70acf9b7aa..a80329628aaf602cb5f8deb2e1185528e1e7d5ee 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -595,15 +595,19 @@
     <build>\r
         <finalName>cspace-services</finalName>\r
         <defaultGoal>package</defaultGoal>\r
-                                       <filters>\r
-                                               <filter>../../build.properties</filter>\r
-                                       </filters>\r
-                                       <resources>\r
-                                               <resource>\r
-                                                       <directory>src/main/resources</directory>\r
-                                                       <filtering>true</filtering>\r
-                                               </resource>\r
-                                       </resources>\r
+        <filters>\r
+            <filter>../../build.properties</filter>\r
+        </filters>\r
+        <resources>\r
+            <resource>\r
+                <directory>src/main/resources</directory>\r
+                <filtering>true</filtering>\r
+            </resource>\r
+            <resource>\r
+                <directory>src/main/webapp/META-INF</directory>\r
+                <filtering>true</filtering>\r
+            </resource>\r
+        </resources>\r
         <plugins>\r
             <plugin>\r
                 <groupId>org.codehaus.mojo</groupId>\r
@@ -623,20 +627,20 @@
                     </files>\r
                 </configuration>\r
             </plugin>\r
-                                               <plugin>\r
-                                                       <groupId>org.apache.maven.plugins</groupId>\r
-                                                       <artifactId>maven-resources-plugin</artifactId>\r
-                                                       <version>2.5</version>\r
-                                                       <executions>\r
-                                                               <execution>\r
-                                                                       <phase>process-resources</phase>\r
-                                                                       <goals>\r
-                                                                               <goal>resources</goal>\r
-                                                                       </goals>\r
-                                                               </execution>\r
-                                                       </executions>\r
-                                               </plugin>\r
-             <plugin>\r
+            <plugin>\r
+                <groupId>org.apache.maven.plugins</groupId>\r
+                <artifactId>maven-resources-plugin</artifactId>\r
+                <version>2.5</version>\r
+                <executions>\r
+                    <execution>\r
+                        <phase>process-resources</phase>\r
+                        <goals>\r
+                            <goal>resources</goal>\r
+                        </goals>\r
+                    </execution>\r
+                </executions>\r
+            </plugin>\r
+            <plugin>\r
                 <groupId>org.codehaus.cargo</groupId>\r
                 <artifactId>cargo-maven2-plugin</artifactId>\r
                 <version>0.3</version>\r
@@ -672,7 +676,14 @@
             <plugin>\r
                 <groupId>org.apache.maven.plugins</groupId>\r
                 <artifactId>maven-war-plugin</artifactId>\r
+                <version>2.1.1</version>\r
                 <configuration>\r
+                    <webResources>\r
+                        <resource>\r
+                          <directory>src/main/webapp</directory>\r
+                          <filtering>true</filtering>\r
+                        </resource>\r
+                    </webResources>\r
                     <archive>\r
                         <manifest>\r
                             <packageName>${pom.groupid}</packageName>\r

diff --git a/services/JaxRsServiceProvider/src/main/resources/log4j.properties b/services/JaxRsServiceProvider/src/main/resources/log4j.properties
index 7a8f7289d1bc3777b6247e36e25e699d1c4bb57e..2be5675d6d29620fb479ede95158ec4d1e89d589 100644 (file)
--- 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
 #\r
 # CollectionSpace log levels\r
 #\r
-log4j.logger.org.collectionspace=ERROR\r
+log4j.logger.org.collectionspace=DEBUG\r
 log4j.logger.perf.collectionspace=ERROR\r
 \r
 log4j.logger.org.nuxeo=ERROR\r

diff --git a/services/JaxRsServiceProvider/src/main/webapp/META-INF/context.xml b/services/JaxRsServiceProvider/src/main/webapp/META-INF/context.xml
index 3232643409239e148165acd78e4e0c5d3aa466f9..b327a7aa4b85ba07d438c10737825e37eed480b5 100644 (file)
--- 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>