Author: tolusha Date: 2011-09-02 05:58:10 -0400 (Fri, 02 Sep 2011) New Revision: 4831 Modified: jcr/trunk/exo.jcr.component.core/pom.xml jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/PostgreConnectionFactory.java Log: move dependency for db2 to related profile Modified: jcr/trunk/exo.jcr.component.core/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/pom.xml 2011-09-02 08:22:51 UTC (rev 4830) +++ jcr/trunk/exo.jcr.component.core/pom.xml 2011-09-02 09:58:10 UTC (rev 4831) @@ -271,19 +271,6 @@ <version>14</version> <scope>test</scope> </dependency> - <!-- For IBM DB2 support (local-jcr repository) --> - <dependency> - <groupId>com.ibm.db2</groupId> - <artifactId>db2jcc</artifactId> - <version>9.7</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.ibm.db2</groupId> - <artifactId>db2jcc_license_cu</artifactId> - <version>9.7</version> - <scope>test</scope> - </dependency> <!-- For MS SQL 7/2000/2005 and Sybase ASE/Anywhere support (jTDS driver) --> <!-- dependency> <groupId>net.sourceforge.jtds</groupId> @@ -292,12 +279,12 @@ <scope>test</scope> </dependency --> <!-- For MS SQL 2005 support (Microsoft JDBC driver) (local-jcr repository) --> - <dependency> + <!--dependency> <groupId>com.microsoft</groupId> <artifactId>sqljdbc</artifactId> <version>3.0.1301.101</version> <scope>test</scope> - </dependency> + </dependency--> <!-- For Apache Derby support (aka JavaDB) --> <!-- dependency> <groupId>org.apache.derby</groupId> @@ -853,6 +840,20 @@ <properties> <jcr.test.configuration.file>/conf/standalone/test-configuration-db2-jbc.xml</jcr.test.configuration.file> </properties> + <dependencies> + <dependency> + <groupId>com.ibm.db2</groupId> + <artifactId>db2jcc</artifactId> + <version>9.7</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.ibm.db2</groupId> + <artifactId>db2jcc_license_cu</artifactId> + <version>9.7</version> + <scope>test</scope> + </dependency> + </dependencies> </profile> <profile> <id>db2-sjdbc</id> Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/PostgreConnectionFactory.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/PostgreConnectionFactory.java 2011-09-02 08:22:51 UTC (rev 4830) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/PostgreConnectionFactory.java 2011-09-02 09:58:10 UTC (rev 4831) @@ -129,6 +129,6 @@ @Override public boolean isReindexingSupport() { - return false; + return true; } }