Author: nfilotto Date: 2011-11-11 16:13:18 -0500 (Fri, 11 Nov 2011) New Revision: 5182 Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/db2-sjdbc.properties jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/db2.properties jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/default-sjdbc.properties jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/default.properties jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mssql-sjdbc.properties jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mssql.properties jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mysql-sjdbc.properties jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mysql.properties jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/oracle-sjdbc.properties jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/oracle.properties jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/pgsql-sjdbc.properties jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/pgsql.properties jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/sybase-sjdbc.properties jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/sybase.properties Removed: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-db2-jbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-db2-sjdbc-jbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-mssql-jbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-mssql-sjdbc-jbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-mysql-jbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-mysql-sjdbc-jbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-oracle-sjdbc-jbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-pgsql-jbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-pgsql-sjdbc-jbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sybase-jbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sybase-sjdbc-jbc.xml Modified: jcr/trunk/exo.jcr.component.core/pom.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-configuration-jbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-configuration.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-jbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc-jbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml Log: EXOJCR-1624: Propose a maven profile for each supported configuration * All changing values have been moved into properties files * Configuration files for each db have been removed * A new variable has been added in order to enable the statistics easily * We have now one profile per driver instead of per db type * Some changes have been applied at kernel level to be able to use the PropertyConfigurator with the StandaloneContainer Modified: jcr/trunk/exo.jcr.component.core/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/pom.xml 2011-11-11 21:12:47 UTC (rev 5181) +++ jcr/trunk/exo.jcr.component.core/pom.xml 2011-11-11 21:13:18 UTC (rev 5182) @@ -34,6 +34,9 @@ <jbosscache.shareable>true</jbosscache.shareable> <cache.enabled>true</cache.enabled> <value.storage.enabled>true</value.storage.enabled> + <statistics.enabled>false</statistics.enabled> + <properties.url.suffix>.properties</properties.url.suffix> + <properties.url.prefix>classpath:/conf/standalone/default</properties.url.prefix> <jbc.specific.1>**/jbc/**</jbc.specific.1> <jbc.specific.2>**/jbosscache/**</jbc.specific.2> <ispn.specific.1>**/ispn/**</ispn.specific.1> @@ -324,11 +327,14 @@ <name>value-storage-enabled</name> <value>${value.storage.enabled}</value> </property> - <!-- Uncomment the line below if you want to enable the statistics --> - <!--property> + <property> <name>JDBCWorkspaceDataContainer.statistics.enabled</name> - <value>true</value> - </property--> + <value>${statistics.enabled}</value> + </property> + <property> + <name>exo.properties.url</name> + <value>${properties.url.prefix}${properties.url.suffix}</value> + </property> <!-- We add this system property due to some incompatibility between IPv6 and some JVM of Linux distributions such as Ubuntu and Fedora--> <property> @@ -561,11 +567,14 @@ org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersionable org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersion</value> </property> - <!-- Uncomment the line below if you want to enable the statistics --> - <!--property> - <name>JDBCWorkspaceDataContainer.statistics.enabled</name> - <value>true</value> - </property--> + <property> + <name>JDBCWorkspaceDataContainer.statistics.enabled</name> + <value>${statistics.enabled}</value> + </property> + <property> + <name>exo.properties.url</name> + <value>${properties.url.prefix}${properties.url.suffix}</value> + </property> <!-- We add this system property due to some incompatibility between IPv6 and some JVM of Linux distributions such as Ubuntu and Fedora--> <property> @@ -622,7 +631,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <!-- TAKE CARE TO UPDATE ALSO run-tck PROFILE --> - <argLine>${env.MAVEN_OPTS} -Dcom.arjuna.ats.arjuna.objectstore.objectStoreDir=${project.build.directory} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy</argLine> + <argLine>${env.MAVEN_OPTS} -Dcom.arjuna.ats.arjuna.objectstore.objectStoreDir=${project.build.directory} -Djava.security.manager=org.exoplatform.commons.test.TestSecurityManager -Djava.security.policy=${project.build.directory}/test-classes/test.policy -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y</argLine> <systemProperties> <property> <name>jcr.test.configuration.file</name> @@ -652,11 +661,14 @@ org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersionable org.apache.jackrabbit.test.api.nodetype.PredefinedNodeTypeTest#testVersion</value> </property> - <!-- Uncomment the line below if you want to enable the statistics --> - <!--property> - <name>JDBCWorkspaceDataContainer.statistics.enabled</name> - <value>true</value> - </property--> + <property> + <name>JDBCWorkspaceDataContainer.statistics.enabled</name> + <value>${statistics.enabled}</value> + </property> + <property> + <name>exo.properties.url</name> + <value>${properties.url.prefix}${properties.url.suffix}</value> + </property> <!-- We add this system property due to some incompatibility between IPv6 and some JVM of Linux distributions such as Ubuntu and Fedora--> <property> @@ -737,6 +749,14 @@ <name>value-storage-enabled</name> <value>${value.storage.enabled}</value> </property> + <property> + <name>JDBCWorkspaceDataContainer.statistics.enabled</name> + <value>${statistics.enabled}</value> + </property> + <property> + <name>exo.properties.url</name> + <value>${properties.url.prefix}${properties.url.suffix}</value> + </property> <!-- We add this system property due to some incompatibility between IPv6 and some JVM of Linux distributions such as Ubuntu and Fedora--> <property> @@ -769,106 +789,127 @@ </plugins> </build> </profile> + <!-- We define one profile per driver --> <profile> - <id>oracle</id> + <id>oracle-10G-R2</id> <properties> - <jcr.test.configuration.file>/conf/standalone/test-configuration-oracle-sjdbc-jbc.xml</jcr.test.configuration.file> + <properties.url.prefix>classpath:/conf/standalone/oracle</properties.url.prefix> </properties> <dependencies> <dependency> <groupId>ojdbc</groupId> <artifactId>ojdbc</artifactId> - <version>14</version> + <version>10.2.0.4</version> <scope>test</scope> </dependency> <dependency> <groupId>ojdbc</groupId> <artifactId>orai18n</artifactId> - <version>14</version> + <version>10.2.0.4</version> <scope>test</scope> </dependency> </dependencies> </profile> <profile> - <id>mysql</id> + <id>oracle-11G-R1</id> <properties> - <jcr.test.configuration.file>/conf/standalone/test-configuration-mysql-jbc.xml</jcr.test.configuration.file> + <properties.url.prefix>classpath:/conf/standalone/oracle</properties.url.prefix> </properties> <dependencies> <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.1.14</version> + <groupId>ojdbc</groupId> + <artifactId>ojdbc</artifactId> + <version>11.1.0.6.0</version> <scope>test</scope> </dependency> + <dependency> + <groupId>ojdbc</groupId> + <artifactId>orai18n</artifactId> + <version>11.1.0.6.0</version> + <scope>test</scope> + </dependency> </dependencies> </profile> <profile> - <id>mysql-sjdbc</id> + <id>oracle-11G-R2</id> <properties> - <jcr.test.configuration.file>/conf/standalone/test-configuration-mysql-sjdbc-jbc.xml</jcr.test.configuration.file> + <properties.url.prefix>classpath:/conf/standalone/oracle</properties.url.prefix> </properties> <dependencies> <dependency> + <groupId>ojdbc</groupId> + <artifactId>ojdbc</artifactId> + <version>11.2.0.1.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>ojdbc</groupId> + <artifactId>orai18n</artifactId> + <version>11.2.0.1.0</version> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>mysql-5.0</id> + <properties> + <properties.url.prefix>classpath:/conf/standalone/mysql</properties.url.prefix> + </properties> + <dependencies> + <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>5.1.14</version> + <version>5.0.8</version> <scope>test</scope> </dependency> </dependencies> </profile> <profile> - <id>mssql</id> + <id>mysql-5.1</id> <properties> - <jcr.test.configuration.file>/conf/standalone/test-configuration-mssql-jbc.xml</jcr.test.configuration.file> + <properties.url.prefix>classpath:/conf/standalone/mysql</properties.url.prefix> </properties> <dependencies> <dependency> - <groupId>com.microsoft</groupId> - <artifactId>sqljdbc</artifactId> - <version>3.0.1301.101</version> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.14</version> <scope>test</scope> </dependency> </dependencies> </profile> <profile> - <id>mssql-sjdbc</id> + <id>mysql-5.5</id> <properties> - <jcr.test.configuration.file>/conf/standalone/test-configuration-mssql-sjdbc-jbc.xml</jcr.test.configuration.file> + <properties.url.prefix>classpath:/conf/standalone/mysql</properties.url.prefix> </properties> <dependencies> <dependency> - <groupId>com.microsoft</groupId> - <artifactId>sqljdbc</artifactId> - <version>3.0.1301.101</version> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>5.1.18</version> <scope>test</scope> </dependency> </dependencies> </profile> <profile> - <id>db2</id> + <id>mssql</id> <properties> - <jcr.test.configuration.file>/conf/standalone/test-configuration-db2-jbc.xml</jcr.test.configuration.file> + <properties.url.prefix>classpath:/conf/standalone/mssql</properties.url.prefix> </properties> <dependencies> <dependency> - <groupId>com.ibm.db2</groupId> - <artifactId>db2jcc</artifactId> - <version>9.7</version> + <groupId>com.microsoft</groupId> + <artifactId>sqljdbc</artifactId> + <version>3.0.1301.101</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> + <id>db2</id> <properties> - <jcr.test.configuration.file>/conf/standalone/test-configuration-db2-sjdbc-jbc.xml</jcr.test.configuration.file> + <properties.url.prefix>classpath:/conf/standalone/db2</properties.url.prefix> </properties> <dependencies> <dependency> @@ -888,7 +929,7 @@ <profile> <id>sybase</id> <properties> - <jcr.test.configuration.file>/conf/standalone/test-configuration-sybase-jbc.xml</jcr.test.configuration.file> + <properties.url.prefix>classpath:/conf/standalone/sybase</properties.url.prefix> </properties> <dependencies> <dependency> @@ -900,43 +941,43 @@ </dependencies> </profile> <profile> - <id>sybase-sjdbc</id> + <id>pgsql-8.2</id> <properties> - <jcr.test.configuration.file>/conf/standalone/test-configuration-sybase-sjdbc-jbc.xml</jcr.test.configuration.file> + <properties.url.prefix>classpath:/conf/standalone/pgsql</properties.url.prefix> </properties> <dependencies> <dependency> - <groupId>com.sybase.jdbc4.jdbc</groupId> - <artifactId>jconn4</artifactId> - <version>26502</version> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.2-507.jdbc4</version> <scope>test</scope> </dependency> </dependencies> </profile> <profile> - <id>pgsql</id> + <id>pgsql-8.3</id> <properties> - <jcr.test.configuration.file>/conf/standalone/test-configuration-pgsql-jbc.xml</jcr.test.configuration.file> + <properties.url.prefix>classpath:/conf/standalone/pgsql</properties.url.prefix> </properties> <dependencies> <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> - <version>8.3-606.jdbc3</version> + <version>8.3-606.jdbc4</version> <scope>test</scope> </dependency> </dependencies> </profile> <profile> - <id>pgsql-sjdbc</id> + <id>pgsql-8.4</id> <properties> - <jcr.test.configuration.file>/conf/standalone/test-configuration-pgsql-sjdbc-jbc.xml</jcr.test.configuration.file> + <properties.url.prefix>classpath:/conf/standalone/pgsql</properties.url.prefix> </properties> <dependencies> <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> - <version>8.3-606.jdbc3</version> + <version>8.4-702.jdbc4</version> <scope>test</scope> </dependency> </dependencies> @@ -957,6 +998,7 @@ <id>sjdbc</id> <properties> <jcr.test.configuration.file>/conf/standalone/test-configuration-sjdbc-jbc.xml</jcr.test.configuration.file> + <properties.url.suffix>-sjdbc.properties</properties.url.suffix> </properties> </profile> <profile> @@ -998,6 +1040,7 @@ <jcr.test.configuration.file>/conf/standalone/test-configuration-sjdbc.xml</jcr.test.configuration.file> <impl.specific.exclude.1>${jbc.specific.1}</impl.specific.exclude.1> <impl.specific.exclude.2>${jbc.specific.2}</impl.specific.exclude.2> + <properties.url.suffix>-sjdbc.properties</properties.url.suffix> </properties> <dependencies> <dependency> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-configuration-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-configuration-jbc.xml 2011-11-11 21:12:47 UTC (rev 5181) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-configuration-jbc.xml 2011-11-11 21:13:18 UTC (rev 5182) @@ -54,7 +54,7 @@ <property name="log4j.appender.file.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - <property name="log4j.category.jcr.FileCleaner" value="DEBUG"/> + <!-- property name="log4j.category.jcr.FileCleaner" value="DEBUG"/ --> <!-- property name="log4j.category.jcr.JDBCStorageConnection" value="DEBUG"/> <property name="log4j.category.jcr.NodeImpl" value="DEBUG"/ --> @@ -140,7 +140,6 @@ <value>jar:/conf/test/publication-plugins-nodetypes-config.xml</value> </values-param> - <values-param> <name>testInitNodeTypesRepository</name> <description> @@ -180,6 +179,7 @@ <properties-param> <name>working-conf</name> <description>working-conf</description> + <property name="dialect" value="auto" /> <property name="source-name" value="jdbcjcr"/> <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/> </properties-param> @@ -266,11 +266,11 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> <!-- MVCC configured to prevent possible deadlocks when a global Tx is active --> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portal;hsqldb.tx=mvcc"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="url" value="${jdbcjcr.url:jdbc:hsqldb:file:target/temp/data/portal;hsqldb.tx=mvcc}"/> + <property name="username" value="${jdbcjcr.username:sa}"/> + <property name="password" value="${jdbcjcr.password:}"/> </properties-param> </init-params> </component-plugin> @@ -294,10 +294,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr1.url:jdbc:hsqldb:file:target/temp/data/jcr}"/> + <property name="username" value="${jdbcjcr1.username:sa}"/> + <property name="password" value="${jdbcjcr1.password:}"/> </properties-param> </init-params> </component-plugin> @@ -321,10 +321,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr2.url:jdbc:hsqldb:file:target/temp/data/jcr2}"/> + <property name="username" value="${jdbcjcr2.username:sa}"/> + <property name="password" value="${jdbcjcr2.password:}"/> </properties-param> </init-params> </component-plugin> @@ -348,10 +348,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr3"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr3.url:jdbc:hsqldb:file:target/temp/data/jcr3}"/> + <property name="username" value="${jdbcjcr3.username:sa}"/> + <property name="password" value="${jdbcjcr3.password:}"/> </properties-param> </init-params> </component-plugin> @@ -403,10 +403,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portaldb2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcrdb2.url:jdbc:hsqldb:file:target/temp/data/portaldb2}"/> + <property name="username" value="${jdbcjcrdb2.username:sa}"/> + <property name="password" value="${jdbcjcrdb2.password:}"/> </properties-param> </init-params> </component-plugin> @@ -430,10 +430,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrdb2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr1db2.url:jdbc:hsqldb:file:target/temp/data/jcrdb2}"/> + <property name="username" value="${jdbcjcr1db2.username:sa}"/> + <property name="password" value="${jdbcjcr1db2.password:}"/> </properties-param> </init-params> </component-plugin> @@ -457,10 +457,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portaltck"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcrtck.url:jdbc:hsqldb:file:target/temp/data/portaltck}"/> + <property name="username" value="${jdbcjcrtck.username:sa}"/> + <property name="password" value="${jdbcjcrtck.password:}"/> </properties-param> </init-params> </component-plugin> @@ -484,10 +484,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrtck"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr1tck.url:jdbc:hsqldb:file:target/temp/data/jcrtck}"/> + <property name="username" value="${jdbcjcr1tck.username:sa}"/> + <property name="password" value="${jdbcjcr1tck.password:}"/> </properties-param> </init-params> </component-plugin> @@ -511,10 +511,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr2tck"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr2tck.url:jdbc:hsqldb:file:target/temp/data/jcr2tck}"/> + <property name="username" value="${jdbcjcr2tck.username:sa}"/> + <property name="password" value="${jdbcjcr2tck.password:}"/> </properties-param> </init-params> </component-plugin> @@ -619,10 +619,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/testdbcleaner"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${testdbcleaner.url:jdbc:hsqldb:file:target/temp/data/testdbcleaner}"/> + <property name="username" value="${testdbcleaner.username:sa}"/> + <property name="password" value="${testdbcleaner.password:}"/> <property name="maxActive" value="20" /> </properties-param> </init-params> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-configuration.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-configuration.xml 2011-11-11 21:12:47 UTC (rev 5181) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-configuration.xml 2011-11-11 21:13:18 UTC (rev 5182) @@ -54,7 +54,7 @@ <property name="log4j.appender.file.layout.ConversionPattern" value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - <property name="log4j.category.jcr.FileCleaner" value="DEBUG"/> + <!-- property name="log4j.category.jcr.FileCleaner" value="DEBUG"/ --> <!-- property name="log4j.category.jcr.JDBCStorageConnection" value="DEBUG"/> <property name="log4j.category.jcr.NodeImpl" value="DEBUG"/ --> @@ -140,7 +140,6 @@ <value>jar:/conf/test/publication-plugins-nodetypes-config.xml</value> </values-param> - <values-param> <name>testInitNodeTypesRepository</name> <description> @@ -180,6 +179,7 @@ <properties-param> <name>working-conf</name> <description>working-conf</description> + <property name="dialect" value="auto" /> <property name="source-name" value="jdbcjcr"/> <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/> </properties-param> @@ -266,11 +266,11 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> <!-- MVCC configured to prevent possible deadlocks when a global Tx is active --> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portal;hsqldb.tx=mvcc"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="url" value="${jdbcjcr.url:jdbc:hsqldb:file:target/temp/data/portal;hsqldb.tx=mvcc}"/> + <property name="username" value="${jdbcjcr.username:sa}"/> + <property name="password" value="${jdbcjcr.password:}"/> </properties-param> </init-params> </component-plugin> @@ -294,10 +294,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr1.url:jdbc:hsqldb:file:target/temp/data/jcr}"/> + <property name="username" value="${jdbcjcr1.username:sa}"/> + <property name="password" value="${jdbcjcr1.password:}"/> </properties-param> </init-params> </component-plugin> @@ -321,10 +321,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr2.url:jdbc:hsqldb:file:target/temp/data/jcr2}"/> + <property name="username" value="${jdbcjcr2.username:sa}"/> + <property name="password" value="${jdbcjcr2.password:}"/> </properties-param> </init-params> </component-plugin> @@ -348,10 +348,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr3"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr3.url:jdbc:hsqldb:file:target/temp/data/jcr3}"/> + <property name="username" value="${jdbcjcr3.username:sa}"/> + <property name="password" value="${jdbcjcr3.password:}"/> </properties-param> </init-params> </component-plugin> @@ -403,10 +403,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portaldb2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcrdb2.url:jdbc:hsqldb:file:target/temp/data/portaldb2}"/> + <property name="username" value="${jdbcjcrdb2.username:sa}"/> + <property name="password" value="${jdbcjcrdb2.password:}"/> </properties-param> </init-params> </component-plugin> @@ -430,10 +430,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrdb2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr1db2.url:jdbc:hsqldb:file:target/temp/data/jcrdb2}"/> + <property name="username" value="${jdbcjcr1db2.username:sa}"/> + <property name="password" value="${jdbcjcr1db2.password:}"/> </properties-param> </init-params> </component-plugin> @@ -457,10 +457,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portaltck"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcrtck.url:jdbc:hsqldb:file:target/temp/data/portaltck}"/> + <property name="username" value="${jdbcjcrtck.username:sa}"/> + <property name="password" value="${jdbcjcrtck.password:}"/> </properties-param> </init-params> </component-plugin> @@ -484,10 +484,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrtck"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr1tck.url:jdbc:hsqldb:file:target/temp/data/jcrtck}"/> + <property name="username" value="${jdbcjcr1tck.username:sa}"/> + <property name="password" value="${jdbcjcr1tck.password:}"/> </properties-param> </init-params> </component-plugin> @@ -511,10 +511,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr2tck"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr2tck.url:jdbc:hsqldb:file:target/temp/data/jcr2tck}"/> + <property name="username" value="${jdbcjcr2tck.username:sa}"/> + <property name="password" value="${jdbcjcr2tck.password:}"/> </properties-param> </init-params> </component-plugin> @@ -619,10 +619,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/testdbcleaner"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${testdbcleaner.url:jdbc:hsqldb:file:target/temp/data/testdbcleaner}"/> + <property name="username" value="${testdbcleaner.username:sa}"/> + <property name="password" value="${testdbcleaner.password:}"/> <property name="maxActive" value="20" /> </properties-param> </init-params> Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/db2-sjdbc.properties =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/db2-sjdbc.properties (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/db2-sjdbc.properties 2011-11-11 21:13:18 UTC (rev 5182) @@ -0,0 +1,22 @@ +# Global Properties +all.driverClassName=com.ibm.db2.jcc.DB2Driver + +# Properties for jdbcjcr +jdbcjcr.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1 +jdbcjcr.username=db2inst1 +jdbcjcr.password=eXoAdmin + +# Properties for jdbcjcrdb2 +jdbcjcrdb2.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db2 +jdbcjcrdb2.username=db2inst1 +jdbcjcrdb2.password=eXoAdmin + +# Properties for jdbcjcrtck +jdbcjcrtck.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1tck +jdbcjcrtck.username=db2inst1 +jdbcjcrtck.password=eXoAdmin + +# Properties for testdbcleaner +testdbcleaner.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/dbclns +testdbcleaner.username=db2inst1 +testdbcleaner.password=eXoAdmin \ No newline at end of file Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/db2.properties =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/db2.properties (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/db2.properties 2011-11-11 21:13:18 UTC (rev 5182) @@ -0,0 +1,52 @@ +# Global Properties +all.driverClassName=com.ibm.db2.jcc.DB2Driver + +# Properties for jdbcjcr +jdbcjcr.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1_ws +jdbcjcr.username=db2inst1 +jdbcjcr.password=eXoAdmin + +# Properties for jdbcjcr1 +jdbcjcr1.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1_ws1 +jdbcjcr1.username=db2inst1 +jdbcjcr1.password=eXoAdmin + +# Properties for jdbcjcr2 +jdbcjcr2.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1_ws2 +jdbcjcr2.username=db2inst1 +jdbcjcr2.password=eXoAdmin + +# Properties for jdbcjcr3 +jdbcjcr3.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1_ws3 +jdbcjcr3.username=db2inst1 +jdbcjcr3.password=eXoAdmin + +# Properties for jdbcjcrdb2 +jdbcjcrdb2.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db2_ws +jdbcjcrdb2.username=db2inst1 +jdbcjcrdb2.password=eXoAdmin + +# Properties for jdbcjcr1db2 +jdbcjcr1db2.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db2_ws1 +jdbcjcr1db2.username=db2inst1 +jdbcjcr1db2.password=eXoAdmin + +# Properties for jdbcjcrtck +jdbcjcrtck.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/dbtckws +jdbcjcrtck.username=db2inst1 +jdbcjcrtck.password=eXoAdmin + +# Properties for jdbcjcr1tck +jdbcjcr1tck.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/dbtckws1 +jdbcjcr1tck.username=db2inst1 +jdbcjcr1tck.password=eXoAdmin + +# Properties for jdbcjcr2tck +jdbcjcr2tck.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/dbtckws2 +jdbcjcr2tck.username=db2inst1 +jdbcjcr2tck.password=eXoAdmin + +# Properties for testdbcleaner +testdbcleaner.url=jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/dbcln +testdbcleaner.username=db2inst1 +testdbcleaner.password=eXoAdmin \ No newline at end of file Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/default-sjdbc.properties =================================================================== Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/default.properties =================================================================== Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mssql-sjdbc.properties =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mssql-sjdbc.properties (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mssql-sjdbc.properties 2011-11-11 21:13:18 UTC (rev 5182) @@ -0,0 +1,22 @@ +# Global Properties +all.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver" + +# Properties for jdbcjcr +jdbcjcr.url=jdbc:sqlserver://localhost:1433;databaseName=db1; +jdbcjcr.username=tester +jdbcjcr.password=tester + +# Properties for jdbcjcrdb2 +jdbcjcrdb2.url=jdbc:sqlserver://localhost:1433;databaseName=db2; +jdbcjcrdb2.username=tester +jdbcjcrdb2.password=tester + +# Properties for jdbcjcrtck +jdbcjcrtck.url=jdbc:sqlserver://localhost:1433;databaseName=db1tck; +jdbcjcrtck.username=tester +jdbcjcrtck.password=tester + +# Properties for testdbcleaner +testdbcleaner.url=jdbc:sqlserver://localhost:1433;databaseName=testdbcleaner_sjdbc; +testdbcleaner.username=tester +testdbcleaner.password=tester \ No newline at end of file Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mssql.properties =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mssql.properties (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mssql.properties 2011-11-11 21:13:18 UTC (rev 5182) @@ -0,0 +1,52 @@ +# Global Properties +all.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver" + +# Properties for jdbcjcr +jdbcjcr.url=jdbc:sqlserver://localhost:1433;databaseName=db1_ws; +jdbcjcr.username=tester +jdbcjcr.password=tester + +# Properties for jdbcjcr1 +jdbcjcr1.url=jdbc:sqlserver://localhost:1433;databaseName=db1_ws1; +jdbcjcr1.username=tester +jdbcjcr1.password=tester + +# Properties for jdbcjcr2 +jdbcjcr2.url=jdbc:sqlserver://localhost:1433;databaseName=db1_ws2; +jdbcjcr2.username=tester +jdbcjcr2.password=tester + +# Properties for jdbcjcr3 +jdbcjcr3.url=jdbc:sqlserver://localhost:1433;databaseName=db1_ws3; +jdbcjcr3.username=tester +jdbcjcr3.password=tester + +# Properties for jdbcjcrdb2 +jdbcjcrdb2.url=jdbc:sqlserver://localhost:1433;databaseName=db2_ws; +jdbcjcrdb2.username=tester +jdbcjcrdb2.password=tester + +# Properties for jdbcjcr1db2 +jdbcjcr1db2.url=jdbc:sqlserver://localhost:1433;databaseName=db2_ws1; +jdbcjcr1db2.username=tester +jdbcjcr1db2.password=tester + +# Properties for jdbcjcrtck +jdbcjcrtck.url=jdbc:sqlserver://localhost:1433;databaseName=db1tck_ws; +jdbcjcrtck.username=tester +jdbcjcrtck.password=tester + +# Properties for jdbcjcr1tck +jdbcjcr1tck.url=jdbc:sqlserver://localhost:1433;databaseName=db1tck_ws1; +jdbcjcr1tck.username=tester +jdbcjcr1tck.password=tester + +# Properties for jdbcjcr2tck +jdbcjcr2tck.url=jdbc:sqlserver://localhost:1433;databaseName=db1tck_ws2; +jdbcjcr2tck.username=tester +jdbcjcr2tck.password=tester + +# Properties for testdbcleaner +testdbcleaner.url=jdbc:sqlserver://localhost:1433;databaseName=testdbcleaner; +testdbcleaner.username=tester +testdbcleaner.password=tester \ No newline at end of file Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mysql-sjdbc.properties =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mysql-sjdbc.properties (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mysql-sjdbc.properties 2011-11-11 21:13:18 UTC (rev 5182) @@ -0,0 +1,22 @@ +# Global Properties +all.driverClassName=com.mysql.jdbc.Driver + +# Properties for jdbcjcr +jdbcjcr.url=jdbc:mysql://localhost/db1 +jdbcjcr.username=root +jdbcjcr.password=eXoAdmin + +# Properties for jdbcjcrdb2 +jdbcjcrdb2.url=jdbc:mysql://localhost/db2 +jdbcjcrdb2.username=root +jdbcjcrdb2.password=eXoAdmin + +# Properties for jdbcjcrtck +jdbcjcrtck.url=jdbc:mysql://localhost/db1tck +jdbcjcrtck.username=root +jdbcjcrtck.password=eXoAdmin + +# Properties for testdbcleaner +testdbcleaner.url=jdbc:mysql://localhost/testdbcleaner_sjdbc +testdbcleaner.username=root +testdbcleaner.password=eXoAdmin \ No newline at end of file Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mysql.properties =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mysql.properties (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/mysql.properties 2011-11-11 21:13:18 UTC (rev 5182) @@ -0,0 +1,52 @@ +# Global Properties +all.driverClassName=com.mysql.jdbc.Driver + +# Properties for jdbcjcr +jdbcjcr.url=jdbc:mysql://localhost/db1_ws +jdbcjcr.username=root +jdbcjcr.password=admin + +# Properties for jdbcjcr1 +jdbcjcr1.url=jdbc:mysql://localhost/db1_ws1 +jdbcjcr1.username=root +jdbcjcr1.password=admin + +# Properties for jdbcjcr2 +jdbcjcr2.url=jdbc:mysql://localhost/db1_ws2 +jdbcjcr2.username=root +jdbcjcr2.password=admin + +# Properties for jdbcjcr3 +jdbcjcr3.url=jdbc:mysql://localhost/db1_ws3 +jdbcjcr3.username=root +jdbcjcr3.password=admin + +# Properties for jdbcjcrdb2 +jdbcjcrdb2.url=jdbc:mysql://localhost/db2_ws +jdbcjcrdb2.username=root +jdbcjcrdb2.password=admin + +# Properties for jdbcjcr1db2 +jdbcjcr1db2.url=jdbc:mysql://localhost/db2_ws1 +jdbcjcr1db2.username=root +jdbcjcr1db2.password=admin + +# Properties for jdbcjcrtck +jdbcjcrtck.url=jdbc:mysql://localhost/db1tck_ws +jdbcjcrtck.username=root +jdbcjcrtck.password=admin + +# Properties for jdbcjcr1tck +jdbcjcr1tck.url=jdbc:mysql://localhost/db1tck_ws1 +jdbcjcr1tck.username=root +jdbcjcr1tck.password=admin + +# Properties for jdbcjcr2tck +jdbcjcr2tck.url=jdbc:mysql://localhost/db1tck_ws2 +jdbcjcr2tck.username=root +jdbcjcr2tck.password=admin + +# Properties for testdbcleaner +testdbcleaner.url=jdbc:mysql://localhost/testdbcleaner +testdbcleaner.username=root +testdbcleaner.password=admin \ No newline at end of file Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/oracle-sjdbc.properties =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/oracle-sjdbc.properties (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/oracle-sjdbc.properties 2011-11-11 21:13:18 UTC (rev 5182) @@ -0,0 +1,22 @@ +# Global Properties +all.driverClassName=oracle.jdbc.OracleDriver + +# Properties for jdbcjcr +jdbcjcr.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm +jdbcjcr.username=exoperf +jdbcjcr.password=exo12321 + +# Properties for jdbcjcrdb2 +jdbcjcrdb2.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm +jdbcjcrdb2.username=exoperf1 +jdbcjcrdb2.password=exo12321 + +# Properties for jdbcjcrtck +jdbcjcrtck.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm +jdbcjcrtck.username=exoperf2 +jdbcjcrtck.password=exo12321 + +# Properties for testdbcleaner +testdbcleaner.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm +testdbcleaner.username=exoperf3 +testdbcleaner.password=exo12321 \ No newline at end of file Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/oracle.properties =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/oracle.properties (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/oracle.properties 2011-11-11 21:13:18 UTC (rev 5182) @@ -0,0 +1,52 @@ +# Global Properties +all.driverClassName=oracle.jdbc.OracleDriver + +# Properties for jdbcjcr +jdbcjcr.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm +jdbcjcr.username=exoperfdb1_ws +jdbcjcr.password=exo12321 + +# Properties for jdbcjcr1 +jdbcjcr1.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm +jdbcjcr1.username=exoperfdb1_ws1 +jdbcjcr1.password=exo12321 + +# Properties for jdbcjcr2 +jdbcjcr2.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm +jdbcjcr2.username=exoperfdb1_ws2 +jdbcjcr2.password=exo12321 + +# Properties for jdbcjcr3 +jdbcjcr3.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm +jdbcjcr3.username=exoperfdb1_ws3 +jdbcjcr3.password=exo12321 + +# Properties for jdbcjcrdb2 +jdbcjcrdb2.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm +jdbcjcrdb2.username=exoperfdb2_ws +jdbcjcrdb2.password=exo12321 + +# Properties for jdbcjcr1db2 +jdbcjcr1db2.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm +jdbcjcr1db2.username=exoperfdb2_ws1 +jdbcjcr1db2.password=exo12321 + +# Properties for jdbcjcrtck +jdbcjcrtck.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm +jdbcjcrtck.username=exoperfdb1tck_ws +jdbcjcrtck.password=exo12321 + +# Properties for jdbcjcr1tck +jdbcjcr1tck.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm +jdbcjcr1tck.username=exoperfdb1tck_ws1 +jdbcjcr1tck.password=exo12321 + +# Properties for jdbcjcr2tck +jdbcjcr2tck.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm +jdbcjcr2tck.username=exoperfdb1tck_ws2 +jdbcjcr2tck.password=exo12321 + +# Properties for testdbcleaner +testdbcleaner.url=jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm +testdbcleaner.username=exoperftestdbcleaner +testdbcleaner.password=exo12321 \ No newline at end of file Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/pgsql-sjdbc.properties =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/pgsql-sjdbc.properties (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/pgsql-sjdbc.properties 2011-11-11 21:13:18 UTC (rev 5182) @@ -0,0 +1,22 @@ +# Global Properties +all.driverClassName=org.postgresql.Driver + +# Properties for jdbcjcr +jdbcjcr.url=jdbc:postgresql://localhost:5433/db1 +jdbcjcr.username=root +jdbcjcr.password=eXoAdmin + +# Properties for jdbcjcrdb2 +jdbcjcrdb2.url=jdbc:postgresql://localhost:5433/db2 +jdbcjcrdb2.username=root +jdbcjcrdb2.password=eXoAdmin + +# Properties for jdbcjcrtck +jdbcjcrtck.url=jdbc:postgresql://localhost:5433/db1tck +jdbcjcrtck.username=root +jdbcjcrtck.password=eXoAdmin + +# Properties for testdbcleaner +testdbcleaner.url=jdbc:postgresql://localhost:5433/testdbcleaner +testdbcleaner.username=root +testdbcleaner.password=eXoAdmin \ No newline at end of file Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/pgsql.properties =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/pgsql.properties (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/pgsql.properties 2011-11-11 21:13:18 UTC (rev 5182) @@ -0,0 +1,52 @@ +# Global Properties +all.driverClassName=org.postgresql.Driver + +# Properties for jdbcjcr +jdbcjcr.url=jdbc:postgresql://localhost:5433/db1_ws +jdbcjcr.username=root +jdbcjcr.password=eXoAdmin + +# Properties for jdbcjcr1 +jdbcjcr1.url=jdbc:postgresql://localhost:5433/db1_ws1 +jdbcjcr1.username=root +jdbcjcr1.password=eXoAdmin + +# Properties for jdbcjcr2 +jdbcjcr2.url=jdbc:postgresql://localhost:5433/db1_ws2 +jdbcjcr2.username=root +jdbcjcr2.password=eXoAdmin + +# Properties for jdbcjcr3 +jdbcjcr3.url=jdbc:postgresql://localhost:5433/db1_ws3 +jdbcjcr3.username=root +jdbcjcr3.password=eXoAdmin + +# Properties for jdbcjcrdb2 +jdbcjcrdb2.url=jdbc:postgresql://localhost:5433/db2_ws +jdbcjcrdb2.username=root +jdbcjcrdb2.password=eXoAdmin + +# Properties for jdbcjcr1db2 +jdbcjcr1db2.url=jdbc:postgresql://localhost:5433/db2_ws1 +jdbcjcr1db2.username=root +jdbcjcr1db2.password=eXoAdmin + +# Properties for jdbcjcrtck +jdbcjcrtck.url=jdbc:postgresql://localhost:5433/db1tck_ws +jdbcjcrtck.username=root +jdbcjcrtck.password=eXoAdmin + +# Properties for jdbcjcr1tck +jdbcjcr1tck.url=jdbc:postgresql://localhost:5433/db1tck_ws1 +jdbcjcr1tck.username=root +jdbcjcr1tck.password=eXoAdmin + +# Properties for jdbcjcr2tck +jdbcjcr2tck.url=jdbc:postgresql://localhost:5433/db1tck_ws2 +jdbcjcr2tck.username=root +jdbcjcr2tck.password=eXoAdmin + +# Properties for testdbcleaner +testdbcleaner.url=jdbc:postgresql://localhost:5433/testdbcleaner_sjdbc +testdbcleaner.username=root +testdbcleaner.password=eXoAdmin \ No newline at end of file Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/sybase-sjdbc.properties =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/sybase-sjdbc.properties (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/sybase-sjdbc.properties 2011-11-11 21:13:18 UTC (rev 5182) @@ -0,0 +1,22 @@ +# Global Properties +all.driverClassName=com.sybase.jdbc4.jdbc.SybDriver + +# Properties for jdbcjcr +jdbcjcr.url=jdbc:sybase:Tds:localhost:5003/db1 +jdbcjcr.username=sa +jdbcjcr.password= + +# Properties for jdbcjcrdb2 +jdbcjcrdb2.url=jdbc:sybase:Tds:localhost:5003/db2 +jdbcjcrdb2.username=sa +jdbcjcrdb2.password= + +# Properties for jdbcjcrtck +jdbcjcrtck.url=jdbc:sybase:Tds:localhost:5003/db1_tck +jdbcjcrtck.username=sa +jdbcjcrtck.password= + +# Properties for testdbcleaner +testdbcleaner.url=jdbc:sybase:Tds:localhost:5003/testdbcleaner_sjdbc +testdbcleaner.username=sa +testdbcleaner.password= \ No newline at end of file Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/sybase.properties =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/sybase.properties (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/sybase.properties 2011-11-11 21:13:18 UTC (rev 5182) @@ -0,0 +1,52 @@ +# Global Properties +all.driverClassName=com.sybase.jdbc4.jdbc.SybDriver + +# Properties for jdbcjcr +jdbcjcr.url=jdbc:sybase:Tds:localhost:5003/db1_ws +jdbcjcr.username=sa +jdbcjcr.password= + +# Properties for jdbcjcr1 +jdbcjcr1.url=jdbc:sybase:Tds:localhost:5003/db1_ws1 +jdbcjcr1.username=sa +jdbcjcr1.password= + +# Properties for jdbcjcr2 +jdbcjcr2.url=jdbc:sybase:Tds:localhost:5003/db1_ws2 +jdbcjcr2.username=sa +jdbcjcr2.password= + +# Properties for jdbcjcr3 +jdbcjcr3.url=jdbc:sybase:Tds:localhost:5003/db1_ws3 +jdbcjcr3.username=sa +jdbcjcr3.password= + +# Properties for jdbcjcrdb2 +jdbcjcrdb2.url=jdbc:sybase:Tds:localhost:5003/db2_ws +jdbcjcrdb2.username=sa +jdbcjcrdb2.password= + +# Properties for jdbcjcr1db2 +jdbcjcr1db2.url=jdbc:sybase:Tds:localhost:5003/db2_ws1 +jdbcjcr1db2.username=sa +jdbcjcr1db2.password= + +# Properties for jdbcjcrtck +jdbcjcrtck.url=jdbc:sybase:Tds:localhost:5003/db1tck_ws +jdbcjcrtck.username=sa +jdbcjcrtck.password= + +# Properties for jdbcjcr1tck +jdbcjcr1tck.url=jdbc:sybase:Tds:localhost:5003/db1tck_ws1 +jdbcjcr1tck.username=sa +jdbcjcr1tck.password= + +# Properties for jdbcjcr2tck +jdbcjcr2tck.url=jdbc:sybase:Tds:localhost:5003/db1tck_ws2 +jdbcjcr2tck.username=sa +jdbcjcr2tck.password= + +# Properties for testdbcleaner +testdbcleaner.url=jdbc:sybase:Tds:localhost:5003/testdbcleaner +testdbcleaner.username=sa +testdbcleaner.password= \ No newline at end of file Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-db2-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-db2-jbc.xml 2011-11-11 21:12:47 UTC (rev 5181) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-db2-jbc.xml 2011-11-11 21:13:18 UTC (rev 5182) @@ -1,664 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> - <component> - <key>org.exoplatform.services.log.LogConfigurationInitializer</key> - <type>org.exoplatform.services.log.LogConfigurationInitializer</type> - <init-params> - <value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Log4JConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>Log4J properties</description> - <property name="log4j.rootLogger" value="INFO, stdout, file"/> - - <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender"/> - <property name="log4j.appender.stdout.threshold" value="DEBUG"/> - - <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.stdout.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <property name="log4j.appender.file" value="org.apache.log4j.FileAppender"/> - <property name="log4j.appender.file.File" value="target/jcr.log"/> - - <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.file.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <!-- property name="log4j.category.jcr.FileCleaner" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.JDBCStorageConnection" value="DEBUG"/> - <property name="log4j.category.jcr.NodeImpl" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.database.DBSchemaCreator" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspaceDataReplicator" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspacePersistentDataManager" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.SessionDataManager" value="DEBUG"/ --> - </properties-param> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedSimpleLog</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.SimpleLogConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>SimpleLog properties</description> - <property name="org.apache.commons.logging.simplelog.defaultlog" value="debug"/> - <property name="org.apache.commons.logging.simplelog.showdatetime" value="true"/> - </properties-param --> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedJdk14Logger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Jdk14Configurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>jdk1.4 Logger properties</description> - <property name="handlers" value="java.util.logging.ConsoleHandler"/> - <property name=".level" value="FINE"/> - <property name="java.util.logging.ConsoleHandler.level" value="FINE"/> - </properties-param --> - - </init-params> - </component> - - <component> - <key>org.exoplatform.services.jcr.RepositoryService</key> - <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> - <component-plugins> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="test" value="http://www.apache.org/jackrabbit/test"/> - <property name="exojcrtest" value="http://www.exoplatform.org/jcr/test/1.0"/> - <property name="rma" value="http://www.rma.com/jcr/"/> - <property name="metadata" value="http://www.exoplatform.com/jcr/metadata/1.1/"/> - <property name="dc" value="http://purl.org/dc/elements/1.1/"/> - <property name="publication" value="http://www.exoplatform.com/jcr/publication/1.1/"/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>jar:/conf/test/nodetypes-tck.xml</value> - <value>jar:/conf/test/nodetypes-impl.xml</value> - <value>jar:/conf/test/nodetypes-usecase.xml</value> - <value>jar:/conf/test/nodetypes-config.xml</value> - <value>jar:/conf/test/nodetypes-config-extended.xml</value> - <value>jar:/conf/test/wcm-nodetypes.xml</value> - <value>jar:/conf/test/nodetypes-publication-config.xml</value> - <value>jar:/conf/test/publication-plugins-nodetypes-config.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepository</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepository - </description> - <value>jar:/conf/test/nodetypes-test.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepositoryTest2</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepositoryTest2 - </description> - <value>jar:/conf/test/nodetypes-test2.xml</value> - </values-param> - - <!--values-param> - <name>testInitNodeTypesRepositoryTest3</name> - <description>Node types from ext. Needed bacause core starup earlie than ext</description> - <value>jar:/conf/test/nodetypes-test3_ext.xml</value> - </values-param--> - - </init-params> - </component-plugin> - </component-plugins> - </component> - - <component> - <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> - <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> - <init-params> - <value-param> - <name>conf-path</name> - <description>JCR configuration file</description> - <value>jar:/conf/standalone/test-jcr-config-jbc.xml</value> - </value-param> - <properties-param> - <name>working-conf</name> - <description>working-conf</description> - <property name="dialect" value="auto" /> - <property name="source-name" value="jdbcjcr"/> - <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/> - </properties-param> - </init-params> - </component> - - <component> - <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type> - </component> - - <component> - <key>org.exoplatform.services.security.Authenticator</key> - <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> - </component> - - <component> - <type>org.exoplatform.services.jcr.impl.ext.action.SessionActionCatalog</type> - </component> - - <component> - <key>org.jboss.cache.transaction.TransactionManagerLookup</key> - <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type> - </component> - - <component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type> - <init-params> - <value-param> - <name>timeout</name> - <value>3000</value> - </value-param> - </init-params> - </component> - - <!-- component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.impl.jotm.TransactionServiceJotmImpl</type> - <init-params> - <value-param> - <name>timeout</name> - <value>300</value> - </value-param> - </init-params> - </component --> - - <external-component-plugins> - <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" /> - <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1_ws" /> - <property name="username" value="db2inst1" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr1</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" /> - <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1_ws1" /> - <property name="username" value="db2inst1" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" /> - <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1_ws2" /> - <property name="username" value="db2inst1" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr3</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" /> - <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1_ws3" /> - <property name="username" value="db2inst1" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtest</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrtest"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - <property name="maxActive" value="100" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrdb2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" /> - <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db2_ws" /> - <property name="username" value="db2inst1" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr1db2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" /> - <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db2_ws1" /> - <property name="username" value="db2inst1" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" /> - <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/dbtckws" /> - <property name="username" value="db2inst1" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr1tck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" /> - <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/dbtckws1" /> - <property name="username" value="db2inst1" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2tck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" /> - <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/dbtckws2" /> - <property name="username" value="db2inst1" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export1</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export1"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export3</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export3"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>testdbcleaner</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" /> - <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/dbcln" /> - <property name="username" value="db2inst1" /> - <property name="password" value="eXoAdmin" /> - <property name="maxActive" value="20" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>repo</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.impl.jndi.BindableRepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="repositoryName" value="db1"/> - <!-- property name="containerConfig" value="exo-configuration.xml"/ --> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>rmi.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>rmirepository</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.rmi.RepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="url" value="//localhost:9999/repository"/> - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <remove-configuration>org.exoplatform.services.scheduler.JobSchedulerService</remove-configuration> - <!--<import>jar:/conf/database-configuration.hsql.xml</import> --> -</configuration> Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-db2-sjdbc-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-db2-sjdbc-jbc.xml 2011-11-11 21:12:47 UTC (rev 5181) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-db2-sjdbc-jbc.xml 2011-11-11 21:13:18 UTC (rev 5182) @@ -1,503 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> - <component> - <key>org.exoplatform.services.log.LogConfigurationInitializer</key> - <type>org.exoplatform.services.log.LogConfigurationInitializer</type> - <init-params> - <value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Log4JConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>Log4J properties</description> - <property name="log4j.rootLogger" value="INFO, stdout, file"/> - - <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender"/> - <property name="log4j.appender.stdout.threshold" value="DEBUG"/> - - <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.stdout.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <property name="log4j.appender.file" value="org.apache.log4j.FileAppender"/> - <property name="log4j.appender.file.File" value="target/jcr.log"/> - - <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.file.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <!-- property name="log4j.category.jcr.FileCleaner" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.JDBCStorageConnection" value="DEBUG"/> - <property name="log4j.category.jcr.NodeImpl" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.database.DBSchemaCreator" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspaceDataReplicator" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspacePersistentDataManager" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.SessionDataManager" value="DEBUG"/ --> - </properties-param> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedSimpleLog</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.SimpleLogConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>SimpleLog properties</description> - <property name="org.apache.commons.logging.simplelog.defaultlog" value="debug"/> - <property name="org.apache.commons.logging.simplelog.showdatetime" value="true"/> - </properties-param --> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedJdk14Logger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Jdk14Configurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>jdk1.4 Logger properties</description> - <property name="handlers" value="java.util.logging.ConsoleHandler"/> - <property name=".level" value="FINE"/> - <property name="java.util.logging.ConsoleHandler.level" value="FINE"/> - </properties-param --> - - </init-params> - </component> - - <component> - <key>org.exoplatform.services.jcr.RepositoryService</key> - <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> - <component-plugins> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="test" value="http://www.apache.org/jackrabbit/test"/> - <property name="exojcrtest" value="http://www.exoplatform.org/jcr/test/1.0"/> - <property name="rma" value="http://www.rma.com/jcr/"/> - <property name="metadata" value="http://www.exoplatform.com/jcr/metadata/1.1/"/> - <property name="dc" value="http://purl.org/dc/elements/1.1/"/> - <property name="publication" value="http://www.exoplatform.com/jcr/publication/1.1/"/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>jar:/conf/test/nodetypes-tck.xml</value> - <value>jar:/conf/test/nodetypes-impl.xml</value> - <value>jar:/conf/test/nodetypes-usecase.xml</value> - <value>jar:/conf/test/nodetypes-config.xml</value> - <value>jar:/conf/test/nodetypes-config-extended.xml</value> - <value>jar:/conf/test/wcm-nodetypes.xml</value> - <value>jar:/conf/test/nodetypes-publication-config.xml</value> - <value>jar:/conf/test/publication-plugins-nodetypes-config.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepository</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepository - </description> - <value>jar:/conf/test/nodetypes-test.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepositoryTest2</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepositoryTest2 - </description> - <value>jar:/conf/test/nodetypes-test2.xml</value> - </values-param> - - <!--values-param> - <name>testInitNodeTypesRepositoryTest3</name> - <description>Node types from ext. Needed bacause core starup earlie than ext</description> - <value>jar:/conf/test/nodetypes-test3_ext.xml</value> - </values-param--> - - </init-params> - </component-plugin> - </component-plugins> - </component> - - <component> - <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> - <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> - <init-params> - <value-param> - <name>conf-path</name> - <description>JCR configuration file</description> - <value>jar:/conf/standalone/test-jcr-config-sjdbc-jbc.xml</value> - </value-param> - <properties-param> - <name>working-conf</name> - <description>working-conf</description> - <property name="dialect" value="auto" /> - <property name="source-name" value="jdbcjcr"/> - <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/> - </properties-param> - </init-params> - </component> - - <component> - <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type> - </component> - - <component> - <key>org.exoplatform.services.security.Authenticator</key> - <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> - </component> - - <component> - <type>org.exoplatform.services.jcr.impl.ext.action.SessionActionCatalog</type> - </component> - - <component> - <key>org.jboss.cache.transaction.TransactionManagerLookup</key> - <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type> - </component> - - <component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type> - <init-params> - <value-param> - <name>timeout</name> - <value>3000</value> - </value-param> - </init-params> - </component> - - <!-- component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.impl.jotm.TransactionServiceJotmImpl</type> - <init-params> - <value-param> - <name>timeout</name> - <value>300</value> - </value-param> - </init-params> - </component --> - - <external-component-plugins> - <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" /> - <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1" /> - <property name="username" value="db2inst1" /> - <property name="password" value="eXoAdmin" /> - <property name="maxActive" value="20" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtest</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrtest"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - <property name="maxActive" value="100" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrdb2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" /> - <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db2" /> - <property name="username" value="db2inst1" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" /> - <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/db1tck" /> - <property name="username" value="db2inst1" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export1</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export1"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export3</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export3"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>testdbcleaner</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.ibm.db2.jcc.DB2Driver" /> - <property name="url" value="jdbc:db2://dbs-jcr.exoplatform.com.ua:50002/dbclns" /> - <property name="username" value="db2inst1" /> - <property name="password" value="eXoAdmin" /> - <property name="maxActive" value="20" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>repo</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.impl.jndi.BindableRepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="repositoryName" value="db1"/> - <!-- property name="containerConfig" value="exo-configuration.xml"/ --> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>rmi.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>rmirepository</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.rmi.RepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="url" value="//localhost:9999/repository"/> - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <remove-configuration>org.exoplatform.services.scheduler.JobSchedulerService</remove-configuration> - <!--<import>jar:/conf/database-configuration.hsql.xml</import> --> -</configuration> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-jbc.xml 2011-11-11 21:12:47 UTC (rev 5181) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-jbc.xml 2011-11-11 21:13:18 UTC (rev 5182) @@ -248,11 +248,11 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> <!-- MVCC configured to prevent possible deadlocks when a global Tx is active --> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portal;hsqldb.tx=mvcc"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="url" value="${jdbcjcr.url:jdbc:hsqldb:file:target/temp/data/portal;hsqldb.tx=mvcc}"/> + <property name="username" value="${jdbcjcr.username:sa}"/> + <property name="password" value="${jdbcjcr.password:}"/> </properties-param> </init-params> </component-plugin> @@ -276,10 +276,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr1.url:jdbc:hsqldb:file:target/temp/data/jcr}"/> + <property name="username" value="${jdbcjcr1.username:sa}"/> + <property name="password" value="${jdbcjcr1.password:}"/> </properties-param> </init-params> </component-plugin> @@ -303,10 +303,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr2.url:jdbc:hsqldb:file:target/temp/data/jcr2}"/> + <property name="username" value="${jdbcjcr2.username:sa}"/> + <property name="password" value="${jdbcjcr2.password:}"/> </properties-param> </init-params> </component-plugin> @@ -330,10 +330,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr3"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr3.url:jdbc:hsqldb:file:target/temp/data/jcr3}"/> + <property name="username" value="${jdbcjcr3.username:sa}"/> + <property name="password" value="${jdbcjcr3.password:}"/> </properties-param> </init-params> </component-plugin> @@ -385,10 +385,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portaldb2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcrdb2.url:jdbc:hsqldb:file:target/temp/data/portaldb2}"/> + <property name="username" value="${jdbcjcrdb2.username:sa}"/> + <property name="password" value="${jdbcjcrdb2.password:}"/> </properties-param> </init-params> </component-plugin> @@ -412,10 +412,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrdb2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr1db2.url:jdbc:hsqldb:file:target/temp/data/jcrdb2}"/> + <property name="username" value="${jdbcjcr1db2.username:sa}"/> + <property name="password" value="${jdbcjcr1db2.password:}"/> </properties-param> </init-params> </component-plugin> @@ -439,10 +439,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portaltck"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcrtck.url:jdbc:hsqldb:file:target/temp/data/portaltck}"/> + <property name="username" value="${jdbcjcrtck.username:sa}"/> + <property name="password" value="${jdbcjcrtck.password:}"/> </properties-param> </init-params> </component-plugin> @@ -466,10 +466,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrtck"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr1tck.url:jdbc:hsqldb:file:target/temp/data/jcrtck}"/> + <property name="username" value="${jdbcjcr1tck.username:sa}"/> + <property name="password" value="${jdbcjcr1tck.password:}"/> </properties-param> </init-params> </component-plugin> @@ -493,10 +493,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr2tck"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr2tck.url:jdbc:hsqldb:file:target/temp/data/jcr2tck}"/> + <property name="username" value="${jdbcjcr2tck.username:sa}"/> + <property name="password" value="${jdbcjcr2tck.password:}"/> </properties-param> </init-params> </component-plugin> @@ -601,10 +601,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/testdbcleaner"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${testdbcleaner.url:jdbc:hsqldb:file:target/temp/data/testdbcleaner}"/> + <property name="username" value="${testdbcleaner.username:sa}"/> + <property name="password" value="${testdbcleaner.password:}"/> <property name="maxActive" value="20" /> </properties-param> </init-params> Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-mssql-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-mssql-jbc.xml 2011-11-11 21:12:47 UTC (rev 5181) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-mssql-jbc.xml 2011-11-11 21:13:18 UTC (rev 5182) @@ -1,664 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> - <component> - <key>org.exoplatform.services.log.LogConfigurationInitializer</key> - <type>org.exoplatform.services.log.LogConfigurationInitializer</type> - <init-params> - <value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Log4JConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>Log4J properties</description> - <property name="log4j.rootLogger" value="INFO, stdout, file"/> - - <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender"/> - <property name="log4j.appender.stdout.threshold" value="DEBUG"/> - - <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.stdout.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <property name="log4j.appender.file" value="org.apache.log4j.FileAppender"/> - <property name="log4j.appender.file.File" value="target/jcr.log"/> - - <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.file.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <!-- property name="log4j.category.jcr.FileCleaner" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.JDBCStorageConnection" value="DEBUG"/> - <property name="log4j.category.jcr.NodeImpl" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.database.DBSchemaCreator" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspaceDataReplicator" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspacePersistentDataManager" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.SessionDataManager" value="DEBUG"/ --> - </properties-param> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedSimpleLog</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.SimpleLogConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>SimpleLog properties</description> - <property name="org.apache.commons.logging.simplelog.defaultlog" value="debug"/> - <property name="org.apache.commons.logging.simplelog.showdatetime" value="true"/> - </properties-param --> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedJdk14Logger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Jdk14Configurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>jdk1.4 Logger properties</description> - <property name="handlers" value="java.util.logging.ConsoleHandler"/> - <property name=".level" value="FINE"/> - <property name="java.util.logging.ConsoleHandler.level" value="FINE"/> - </properties-param --> - - </init-params> - </component> - - <component> - <key>org.exoplatform.services.jcr.RepositoryService</key> - <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> - <component-plugins> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="test" value="http://www.apache.org/jackrabbit/test"/> - <property name="exojcrtest" value="http://www.exoplatform.org/jcr/test/1.0"/> - <property name="rma" value="http://www.rma.com/jcr/"/> - <property name="metadata" value="http://www.exoplatform.com/jcr/metadata/1.1/"/> - <property name="dc" value="http://purl.org/dc/elements/1.1/"/> - <property name="publication" value="http://www.exoplatform.com/jcr/publication/1.1/"/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>jar:/conf/test/nodetypes-tck.xml</value> - <value>jar:/conf/test/nodetypes-impl.xml</value> - <value>jar:/conf/test/nodetypes-usecase.xml</value> - <value>jar:/conf/test/nodetypes-config.xml</value> - <value>jar:/conf/test/nodetypes-config-extended.xml</value> - <value>jar:/conf/test/wcm-nodetypes.xml</value> - <value>jar:/conf/test/nodetypes-publication-config.xml</value> - <value>jar:/conf/test/publication-plugins-nodetypes-config.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepository</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepository - </description> - <value>jar:/conf/test/nodetypes-test.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepositoryTest2</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepositoryTest2 - </description> - <value>jar:/conf/test/nodetypes-test2.xml</value> - </values-param> - - <!--values-param> - <name>testInitNodeTypesRepositoryTest3</name> - <description>Node types from ext. Needed bacause core starup earlie than ext</description> - <value>jar:/conf/test/nodetypes-test3_ext.xml</value> - </values-param--> - - </init-params> - </component-plugin> - </component-plugins> - </component> - - <component> - <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> - <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> - <init-params> - <value-param> - <name>conf-path</name> - <description>JCR configuration file</description> - <value>jar:/conf/standalone/test-jcr-config-jbc.xml</value> - </value-param> - <properties-param> - <name>working-conf</name> - <description>working-conf</description> - <property name="dialect" value="auto" /> - <property name="source-name" value="jdbcjcr"/> - <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/> - </properties-param> - </init-params> - </component> - - <component> - <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type> - </component> - - <component> - <key>org.exoplatform.services.security.Authenticator</key> - <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> - </component> - - <component> - <type>org.exoplatform.services.jcr.impl.ext.action.SessionActionCatalog</type> - </component> - - <component> - <key>org.jboss.cache.transaction.TransactionManagerLookup</key> - <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type> - </component> - - <component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type> - <init-params> - <value-param> - <name>timeout</name> - <value>3000</value> - </value-param> - </init-params> - </component> - - <!-- component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.impl.jotm.TransactionServiceJotmImpl</type> - <init-params> - <value-param> - <name>timeout</name> - <value>300</value> - </value-param> - </init-params> - </component --> - - <external-component-plugins> - <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" /> - <property name="url" value="jdbc:sqlserver://localhost:1433;databaseName=db1_ws;" /> - <property name="username" value="tester" /> - <property name="password" value="tester" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr1</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" /> - <property name="url" value="jdbc:sqlserver://localhost:1433;databaseName=db1_ws1;" /> - <property name="username" value="tester" /> - <property name="password" value="tester" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" /> - <property name="url" value="jdbc:sqlserver://localhost:1433;databaseName=db1_ws2;" /> - <property name="username" value="tester" /> - <property name="password" value="tester" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr3</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" /> - <property name="url" value="jdbc:sqlserver://localhost:1433;databaseName=db1_ws3;" /> - <property name="username" value="tester" /> - <property name="password" value="tester" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtest</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrtest"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - <property name="maxActive" value="100" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrdb2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" /> - <property name="url" value="jdbc:sqlserver://localhost:1433;databaseName=db2_ws;" /> - <property name="username" value="tester" /> - <property name="password" value="tester" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr1db2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" /> - <property name="url" value="jdbc:sqlserver://localhost:1433;databaseName=db2_ws1;" /> - <property name="username" value="tester" /> - <property name="password" value="tester" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" /> - <property name="url" value="jdbc:sqlserver://localhost:1433;databaseName=db1tck_ws;" /> - <property name="username" value="tester" /> - <property name="password" value="tester" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr1tck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" /> - <property name="url" value="jdbc:sqlserver://localhost:1433;databaseName=db1tck_ws1;" /> - <property name="username" value="tester" /> - <property name="password" value="tester" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2tck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" /> - <property name="url" value="jdbc:sqlserver://localhost:1433;databaseName=db1tck_ws2;" /> - <property name="username" value="tester" /> - <property name="password" value="tester" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export1</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export1"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export3</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export3"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>testdbcleaner</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" /> - <property name="url" value="jdbc:sqlserver://localhost:1433;databaseName=testdbcleaner;" /> - <property name="username" value="tester" /> - <property name="password" value="tester" /> - <property name="maxActive" value="20" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>repo</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.impl.jndi.BindableRepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="repositoryName" value="db1"/> - <!-- property name="containerConfig" value="exo-configuration.xml"/ --> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>rmi.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>rmirepository</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.rmi.RepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="url" value="//localhost:9999/repository"/> - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <remove-configuration>org.exoplatform.services.scheduler.JobSchedulerService</remove-configuration> - <!--<import>jar:/conf/database-configuration.hsql.xml</import> --> -</configuration> Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-mssql-sjdbc-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-mssql-sjdbc-jbc.xml 2011-11-11 21:12:47 UTC (rev 5181) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-mssql-sjdbc-jbc.xml 2011-11-11 21:13:18 UTC (rev 5182) @@ -1,503 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> - <component> - <key>org.exoplatform.services.log.LogConfigurationInitializer</key> - <type>org.exoplatform.services.log.LogConfigurationInitializer</type> - <init-params> - <value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Log4JConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>Log4J properties</description> - <property name="log4j.rootLogger" value="INFO, stdout, file"/> - - <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender"/> - <property name="log4j.appender.stdout.threshold" value="DEBUG"/> - - <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.stdout.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <property name="log4j.appender.file" value="org.apache.log4j.FileAppender"/> - <property name="log4j.appender.file.File" value="target/jcr.log"/> - - <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.file.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <!-- property name="log4j.category.jcr.FileCleaner" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.JDBCStorageConnection" value="DEBUG"/> - <property name="log4j.category.jcr.NodeImpl" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.database.DBSchemaCreator" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspaceDataReplicator" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspacePersistentDataManager" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.SessionDataManager" value="DEBUG"/ --> - </properties-param> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedSimpleLog</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.SimpleLogConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>SimpleLog properties</description> - <property name="org.apache.commons.logging.simplelog.defaultlog" value="debug"/> - <property name="org.apache.commons.logging.simplelog.showdatetime" value="true"/> - </properties-param --> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedJdk14Logger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Jdk14Configurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>jdk1.4 Logger properties</description> - <property name="handlers" value="java.util.logging.ConsoleHandler"/> - <property name=".level" value="FINE"/> - <property name="java.util.logging.ConsoleHandler.level" value="FINE"/> - </properties-param --> - - </init-params> - </component> - - <component> - <key>org.exoplatform.services.jcr.RepositoryService</key> - <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> - <component-plugins> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="test" value="http://www.apache.org/jackrabbit/test"/> - <property name="exojcrtest" value="http://www.exoplatform.org/jcr/test/1.0"/> - <property name="rma" value="http://www.rma.com/jcr/"/> - <property name="metadata" value="http://www.exoplatform.com/jcr/metadata/1.1/"/> - <property name="dc" value="http://purl.org/dc/elements/1.1/"/> - <property name="publication" value="http://www.exoplatform.com/jcr/publication/1.1/"/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>jar:/conf/test/nodetypes-tck.xml</value> - <value>jar:/conf/test/nodetypes-impl.xml</value> - <value>jar:/conf/test/nodetypes-usecase.xml</value> - <value>jar:/conf/test/nodetypes-config.xml</value> - <value>jar:/conf/test/nodetypes-config-extended.xml</value> - <value>jar:/conf/test/wcm-nodetypes.xml</value> - <value>jar:/conf/test/nodetypes-publication-config.xml</value> - <value>jar:/conf/test/publication-plugins-nodetypes-config.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepository</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepository - </description> - <value>jar:/conf/test/nodetypes-test.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepositoryTest2</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepositoryTest2 - </description> - <value>jar:/conf/test/nodetypes-test2.xml</value> - </values-param> - - <!--values-param> - <name>testInitNodeTypesRepositoryTest3</name> - <description>Node types from ext. Needed bacause core starup earlie than ext</description> - <value>jar:/conf/test/nodetypes-test3_ext.xml</value> - </values-param--> - - </init-params> - </component-plugin> - </component-plugins> - </component> - - <component> - <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> - <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> - <init-params> - <value-param> - <name>conf-path</name> - <description>JCR configuration file</description> - <value>jar:/conf/standalone/test-jcr-config-sjdbc-jbc.xml</value> - </value-param> - <properties-param> - <name>working-conf</name> - <description>working-conf</description> - <property name="dialect" value="auto" /> - <property name="source-name" value="jdbcjcr"/> - <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/> - </properties-param> - </init-params> - </component> - - <component> - <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type> - </component> - - <component> - <key>org.exoplatform.services.security.Authenticator</key> - <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> - </component> - - <component> - <type>org.exoplatform.services.jcr.impl.ext.action.SessionActionCatalog</type> - </component> - - <component> - <key>org.jboss.cache.transaction.TransactionManagerLookup</key> - <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type> - </component> - - <component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type> - <init-params> - <value-param> - <name>timeout</name> - <value>3000</value> - </value-param> - </init-params> - </component> - - <!-- component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.impl.jotm.TransactionServiceJotmImpl</type> - <init-params> - <value-param> - <name>timeout</name> - <value>300</value> - </value-param> - </init-params> - </component --> - - <external-component-plugins> - <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" /> - <property name="url" value="jdbc:sqlserver://localhost:1433;databaseName=db1;" /> - <property name="username" value="tester" /> - <property name="password" value="tester" /> - <property name="maxActive" value="20" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtest</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrtest"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - <property name="maxActive" value="100" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrdb2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" /> - <property name="url" value="jdbc:sqlserver://localhost:1433;databaseName=db2;" /> - <property name="username" value="tester" /> - <property name="password" value="tester" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" /> - <property name="url" value="jdbc:sqlserver://localhost:1433;databaseName=db1tck;" /> - <property name="username" value="tester" /> - <property name="password" value="tester" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export1</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export1"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export3</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export3"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>testdbcleaner</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" /> - <property name="url" value="jdbc:sqlserver://localhost:1433;databaseName=testdbcleaner_sjdbc;" /> - <property name="username" value="tester" /> - <property name="password" value="tester" /> - <property name="maxActive" value="20" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>repo</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.impl.jndi.BindableRepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="repositoryName" value="db1"/> - <!-- property name="containerConfig" value="exo-configuration.xml"/ --> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>rmi.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>rmirepository</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.rmi.RepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="url" value="//localhost:9999/repository"/> - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <remove-configuration>org.exoplatform.services.scheduler.JobSchedulerService</remove-configuration> - <!--<import>jar:/conf/database-configuration.hsql.xml</import> --> -</configuration> Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-mysql-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-mysql-jbc.xml 2011-11-11 21:12:47 UTC (rev 5181) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-mysql-jbc.xml 2011-11-11 21:13:18 UTC (rev 5182) @@ -1,664 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> - <component> - <key>org.exoplatform.services.log.LogConfigurationInitializer</key> - <type>org.exoplatform.services.log.LogConfigurationInitializer</type> - <init-params> - <value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Log4JConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>Log4J properties</description> - <property name="log4j.rootLogger" value="INFO, stdout, file"/> - - <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender"/> - <property name="log4j.appender.stdout.threshold" value="DEBUG"/> - - <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.stdout.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <property name="log4j.appender.file" value="org.apache.log4j.FileAppender"/> - <property name="log4j.appender.file.File" value="target/jcr.log"/> - - <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.file.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <!-- property name="log4j.category.jcr.FileCleaner" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.JDBCStorageConnection" value="DEBUG"/> - <property name="log4j.category.jcr.NodeImpl" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.database.DBSchemaCreator" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspaceDataReplicator" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspacePersistentDataManager" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.SessionDataManager" value="DEBUG"/ --> - </properties-param> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedSimpleLog</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.SimpleLogConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>SimpleLog properties</description> - <property name="org.apache.commons.logging.simplelog.defaultlog" value="debug"/> - <property name="org.apache.commons.logging.simplelog.showdatetime" value="true"/> - </properties-param --> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedJdk14Logger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Jdk14Configurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>jdk1.4 Logger properties</description> - <property name="handlers" value="java.util.logging.ConsoleHandler"/> - <property name=".level" value="FINE"/> - <property name="java.util.logging.ConsoleHandler.level" value="FINE"/> - </properties-param --> - - </init-params> - </component> - - <component> - <key>org.exoplatform.services.jcr.RepositoryService</key> - <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> - <component-plugins> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="test" value="http://www.apache.org/jackrabbit/test"/> - <property name="exojcrtest" value="http://www.exoplatform.org/jcr/test/1.0"/> - <property name="rma" value="http://www.rma.com/jcr/"/> - <property name="metadata" value="http://www.exoplatform.com/jcr/metadata/1.1/"/> - <property name="dc" value="http://purl.org/dc/elements/1.1/"/> - <property name="publication" value="http://www.exoplatform.com/jcr/publication/1.1/"/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>jar:/conf/test/nodetypes-tck.xml</value> - <value>jar:/conf/test/nodetypes-impl.xml</value> - <value>jar:/conf/test/nodetypes-usecase.xml</value> - <value>jar:/conf/test/nodetypes-config.xml</value> - <value>jar:/conf/test/nodetypes-config-extended.xml</value> - <value>jar:/conf/test/wcm-nodetypes.xml</value> - <value>jar:/conf/test/nodetypes-publication-config.xml</value> - <value>jar:/conf/test/publication-plugins-nodetypes-config.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepository</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepository - </description> - <value>jar:/conf/test/nodetypes-test.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepositoryTest2</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepositoryTest2 - </description> - <value>jar:/conf/test/nodetypes-test2.xml</value> - </values-param> - - <!--values-param> - <name>testInitNodeTypesRepositoryTest3</name> - <description>Node types from ext. Needed bacause core starup earlie than ext</description> - <value>jar:/conf/test/nodetypes-test3_ext.xml</value> - </values-param--> - - </init-params> - </component-plugin> - </component-plugins> - </component> - - <component> - <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> - <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> - <init-params> - <value-param> - <name>conf-path</name> - <description>JCR configuration file</description> - <value>jar:/conf/standalone/test-jcr-config-jbc.xml</value> - </value-param> - <properties-param> - <name>working-conf</name> - <description>working-conf</description> - <property name="dialect" value="auto" /> - <property name="source-name" value="jdbcjcr"/> - <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/> - </properties-param> - </init-params> - </component> - - <component> - <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type> - </component> - - <component> - <key>org.exoplatform.services.security.Authenticator</key> - <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> - </component> - - <component> - <type>org.exoplatform.services.jcr.impl.ext.action.SessionActionCatalog</type> - </component> - - <component> - <key>org.jboss.cache.transaction.TransactionManagerLookup</key> - <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type> - </component> - - <component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type> - <init-params> - <value-param> - <name>timeout</name> - <value>3000</value> - </value-param> - </init-params> - </component> - - <!-- component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.impl.jotm.TransactionServiceJotmImpl</type> - <init-params> - <value-param> - <name>timeout</name> - <value>300</value> - </value-param> - </init-params> - </component --> - - <external-component-plugins> - <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.mysql.jdbc.Driver" /> - <property name="url" value="jdbc:mysql://localhost/db1_ws" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr1</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.mysql.jdbc.Driver" /> - <property name="url" value="jdbc:mysql://localhost/db1_ws1" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.mysql.jdbc.Driver" /> - <property name="url" value="jdbc:mysql://localhost/db1_ws2" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr3</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.mysql.jdbc.Driver" /> - <property name="url" value="jdbc:mysql://localhost/db1_ws3" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtest</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrtest"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - <property name="maxActive" value="100" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrdb2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.mysql.jdbc.Driver" /> - <property name="url" value="jdbc:mysql://localhost/db2_ws" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr1db2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.mysql.jdbc.Driver" /> - <property name="url" value="jdbc:mysql://localhost/db2_ws1" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.mysql.jdbc.Driver" /> - <property name="url" value="jdbc:mysql://localhost/db1tck_ws" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr1tck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.mysql.jdbc.Driver" /> - <property name="url" value="jdbc:mysql://localhost/db1tck_ws1" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2tck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.mysql.jdbc.Driver" /> - <property name="url" value="jdbc:mysql://localhost/db1tck_ws2" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export1</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export1"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export3</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export3"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>testdbcleaner</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.mysql.jdbc.Driver" /> - <property name="url" value="jdbc:mysql://localhost/testdbcleaner" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - <property name="maxActive" value="20" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>repo</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.impl.jndi.BindableRepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="repositoryName" value="db1"/> - <!-- property name="containerConfig" value="exo-configuration.xml"/ --> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>rmi.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>rmirepository</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.rmi.RepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="url" value="//localhost:9999/repository"/> - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <remove-configuration>org.exoplatform.services.scheduler.JobSchedulerService</remove-configuration> - <!--<import>jar:/conf/database-configuration.hsql.xml</import> --> -</configuration> Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-mysql-sjdbc-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-mysql-sjdbc-jbc.xml 2011-11-11 21:12:47 UTC (rev 5181) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-mysql-sjdbc-jbc.xml 2011-11-11 21:13:18 UTC (rev 5182) @@ -1,503 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> - <component> - <key>org.exoplatform.services.log.LogConfigurationInitializer</key> - <type>org.exoplatform.services.log.LogConfigurationInitializer</type> - <init-params> - <value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Log4JConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>Log4J properties</description> - <property name="log4j.rootLogger" value="INFO, stdout, file"/> - - <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender"/> - <property name="log4j.appender.stdout.threshold" value="DEBUG"/> - - <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.stdout.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <property name="log4j.appender.file" value="org.apache.log4j.FileAppender"/> - <property name="log4j.appender.file.File" value="target/jcr.log"/> - - <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.file.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <!-- property name="log4j.category.jcr.FileCleaner" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.JDBCStorageConnection" value="DEBUG"/> - <property name="log4j.category.jcr.NodeImpl" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.database.DBSchemaCreator" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspaceDataReplicator" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspacePersistentDataManager" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.SessionDataManager" value="DEBUG"/ --> - </properties-param> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedSimpleLog</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.SimpleLogConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>SimpleLog properties</description> - <property name="org.apache.commons.logging.simplelog.defaultlog" value="debug"/> - <property name="org.apache.commons.logging.simplelog.showdatetime" value="true"/> - </properties-param --> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedJdk14Logger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Jdk14Configurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>jdk1.4 Logger properties</description> - <property name="handlers" value="java.util.logging.ConsoleHandler"/> - <property name=".level" value="FINE"/> - <property name="java.util.logging.ConsoleHandler.level" value="FINE"/> - </properties-param --> - - </init-params> - </component> - - <component> - <key>org.exoplatform.services.jcr.RepositoryService</key> - <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> - <component-plugins> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="test" value="http://www.apache.org/jackrabbit/test"/> - <property name="exojcrtest" value="http://www.exoplatform.org/jcr/test/1.0"/> - <property name="rma" value="http://www.rma.com/jcr/"/> - <property name="metadata" value="http://www.exoplatform.com/jcr/metadata/1.1/"/> - <property name="dc" value="http://purl.org/dc/elements/1.1/"/> - <property name="publication" value="http://www.exoplatform.com/jcr/publication/1.1/"/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>jar:/conf/test/nodetypes-tck.xml</value> - <value>jar:/conf/test/nodetypes-impl.xml</value> - <value>jar:/conf/test/nodetypes-usecase.xml</value> - <value>jar:/conf/test/nodetypes-config.xml</value> - <value>jar:/conf/test/nodetypes-config-extended.xml</value> - <value>jar:/conf/test/wcm-nodetypes.xml</value> - <value>jar:/conf/test/nodetypes-publication-config.xml</value> - <value>jar:/conf/test/publication-plugins-nodetypes-config.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepository</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepository - </description> - <value>jar:/conf/test/nodetypes-test.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepositoryTest2</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepositoryTest2 - </description> - <value>jar:/conf/test/nodetypes-test2.xml</value> - </values-param> - - <!--values-param> - <name>testInitNodeTypesRepositoryTest3</name> - <description>Node types from ext. Needed bacause core starup earlie than ext</description> - <value>jar:/conf/test/nodetypes-test3_ext.xml</value> - </values-param--> - - </init-params> - </component-plugin> - </component-plugins> - </component> - - <component> - <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> - <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> - <init-params> - <value-param> - <name>conf-path</name> - <description>JCR configuration file</description> - <value>jar:/conf/standalone/test-jcr-config-sjdbc-jbc.xml</value> - </value-param> - <properties-param> - <name>working-conf</name> - <description>working-conf</description> - <property name="dialect" value="auto" /> - <property name="source-name" value="jdbcjcr"/> - <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/> - </properties-param> - </init-params> - </component> - - <component> - <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type> - </component> - - <component> - <key>org.exoplatform.services.security.Authenticator</key> - <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> - </component> - - <component> - <type>org.exoplatform.services.jcr.impl.ext.action.SessionActionCatalog</type> - </component> - - <component> - <key>org.jboss.cache.transaction.TransactionManagerLookup</key> - <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type> - </component> - - <component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type> - <init-params> - <value-param> - <name>timeout</name> - <value>3000</value> - </value-param> - </init-params> - </component> - - <!-- component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.impl.jotm.TransactionServiceJotmImpl</type> - <init-params> - <value-param> - <name>timeout</name> - <value>300</value> - </value-param> - </init-params> - </component --> - - <external-component-plugins> - <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.mysql.jdbc.Driver" /> - <property name="url" value="jdbc:mysql://localhost/db1" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - <property name="maxActive" value="20" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtest</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrtest"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - <property name="maxActive" value="100" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrdb2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.mysql.jdbc.Driver" /> - <property name="url" value="jdbc:mysql://localhost/db2" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.mysql.jdbc.Driver" /> - <property name="url" value="jdbc:mysql://localhost/db1tck" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export1</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export1"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export3</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export3"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>testdbcleaner</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.mysql.jdbc.Driver" /> - <property name="url" value="jdbc:mysql://localhost/testdbcleaner_sjdbc" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - <property name="maxActive" value="20" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>repo</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.impl.jndi.BindableRepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="repositoryName" value="db1"/> - <!-- property name="containerConfig" value="exo-configuration.xml"/ --> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>rmi.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>rmirepository</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.rmi.RepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="url" value="//localhost:9999/repository"/> - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <remove-configuration>org.exoplatform.services.scheduler.JobSchedulerService</remove-configuration> - <!--<import>jar:/conf/database-configuration.hsql.xml</import> --> -</configuration> Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-oracle-sjdbc-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-oracle-sjdbc-jbc.xml 2011-11-11 21:12:47 UTC (rev 5181) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-oracle-sjdbc-jbc.xml 2011-11-11 21:13:18 UTC (rev 5182) @@ -1,503 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> - <component> - <key>org.exoplatform.services.log.LogConfigurationInitializer</key> - <type>org.exoplatform.services.log.LogConfigurationInitializer</type> - <init-params> - <value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Log4JConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>Log4J properties</description> - <property name="log4j.rootLogger" value="INFO, stdout, file"/> - - <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender"/> - <property name="log4j.appender.stdout.threshold" value="DEBUG"/> - - <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.stdout.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <property name="log4j.appender.file" value="org.apache.log4j.FileAppender"/> - <property name="log4j.appender.file.File" value="target/jcr.log"/> - - <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.file.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <!-- property name="log4j.category.jcr.FileCleaner" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.JDBCStorageConnection" value="DEBUG"/> - <property name="log4j.category.jcr.NodeImpl" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.database.DBSchemaCreator" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspaceDataReplicator" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspacePersistentDataManager" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.SessionDataManager" value="DEBUG"/ --> - </properties-param> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedSimpleLog</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.SimpleLogConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>SimpleLog properties</description> - <property name="org.apache.commons.logging.simplelog.defaultlog" value="debug"/> - <property name="org.apache.commons.logging.simplelog.showdatetime" value="true"/> - </properties-param --> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedJdk14Logger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Jdk14Configurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>jdk1.4 Logger properties</description> - <property name="handlers" value="java.util.logging.ConsoleHandler"/> - <property name=".level" value="FINE"/> - <property name="java.util.logging.ConsoleHandler.level" value="FINE"/> - </properties-param --> - - </init-params> - </component> - - <component> - <key>org.exoplatform.services.jcr.RepositoryService</key> - <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> - <component-plugins> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="test" value="http://www.apache.org/jackrabbit/test"/> - <property name="exojcrtest" value="http://www.exoplatform.org/jcr/test/1.0"/> - <property name="rma" value="http://www.rma.com/jcr/"/> - <property name="metadata" value="http://www.exoplatform.com/jcr/metadata/1.1/"/> - <property name="dc" value="http://purl.org/dc/elements/1.1/"/> - <property name="publication" value="http://www.exoplatform.com/jcr/publication/1.1/"/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>jar:/conf/test/nodetypes-tck.xml</value> - <value>jar:/conf/test/nodetypes-impl.xml</value> - <value>jar:/conf/test/nodetypes-usecase.xml</value> - <value>jar:/conf/test/nodetypes-config.xml</value> - <value>jar:/conf/test/nodetypes-config-extended.xml</value> - <value>jar:/conf/test/wcm-nodetypes.xml</value> - <value>jar:/conf/test/nodetypes-publication-config.xml</value> - <value>jar:/conf/test/publication-plugins-nodetypes-config.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepository</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepository - </description> - <value>jar:/conf/test/nodetypes-test.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepositoryTest2</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepositoryTest2 - </description> - <value>jar:/conf/test/nodetypes-test2.xml</value> - </values-param> - - <!--values-param> - <name>testInitNodeTypesRepositoryTest3</name> - <description>Node types from ext. Needed bacause core starup earlie than ext</description> - <value>jar:/conf/test/nodetypes-test3_ext.xml</value> - </values-param--> - - </init-params> - </component-plugin> - </component-plugins> - </component> - - <component> - <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> - <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> - <init-params> - <value-param> - <name>conf-path</name> - <description>JCR configuration file</description> - <value>jar:/conf/standalone/test-jcr-config-sjdbc-jbc.xml</value> - </value-param> - <properties-param> - <name>working-conf</name> - <description>working-conf</description> - <property name="dialect" value="auto" /> - <property name="source-name" value="jdbcjcr"/> - <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/> - </properties-param> - </init-params> - </component> - - <component> - <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type> - </component> - - <component> - <key>org.exoplatform.services.security.Authenticator</key> - <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> - </component> - - <component> - <type>org.exoplatform.services.jcr.impl.ext.action.SessionActionCatalog</type> - </component> - - <component> - <key>org.jboss.cache.transaction.TransactionManagerLookup</key> - <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type> - </component> - - <component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type> - <init-params> - <value-param> - <name>timeout</name> - <value>3000</value> - </value-param> - </init-params> - </component> - - <!-- component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.impl.jotm.TransactionServiceJotmImpl</type> - <init-params> - <value-param> - <name>timeout</name> - <value>300</value> - </value-param> - </init-params> - </component --> - - <external-component-plugins> - <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="oracle.jdbc.OracleDriver" /> - <property name="url" value="jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm" /> - <property name="username" value="exoperf" /> - <property name="password" value="exo12321" /> - <property name="maxActive" value="20" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtest</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrtest"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - <property name="maxActive" value="100" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrdb2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="oracle.jdbc.OracleDriver" /> - <property name="url" value="jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm" /> - <property name="username" value="exoperf1" /> - <property name="password" value="exo12321" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="oracle.jdbc.OracleDriver" /> - <property name="url" value="jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm" /> - <property name="username" value="exoperf2" /> - <property name="password" value="exo12321" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export1</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export1"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export3</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export3"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>testdbcleaner</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="oracle.jdbc.OracleDriver" /> - <property name="url" value="jdbc:oracle:thin:@v06.storm.exoplatform.com.ua:1521:orclvm" /> - <property name="username" value="exoperf3" /> - <property name="password" value="exo12321" /> - <property name="maxActive" value="20" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>repo</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.impl.jndi.BindableRepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="repositoryName" value="db1"/> - <!-- property name="containerConfig" value="exo-configuration.xml"/ --> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>rmi.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>rmirepository</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.rmi.RepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="url" value="//localhost:9999/repository"/> - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <remove-configuration>org.exoplatform.services.scheduler.JobSchedulerService</remove-configuration> - <!--<import>jar:/conf/database-configuration.hsql.xml</import> --> -</configuration> Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-pgsql-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-pgsql-jbc.xml 2011-11-11 21:12:47 UTC (rev 5181) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-pgsql-jbc.xml 2011-11-11 21:13:18 UTC (rev 5182) @@ -1,664 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> - <component> - <key>org.exoplatform.services.log.LogConfigurationInitializer</key> - <type>org.exoplatform.services.log.LogConfigurationInitializer</type> - <init-params> - <value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Log4JConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>Log4J properties</description> - <property name="log4j.rootLogger" value="INFO, stdout, file"/> - - <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender"/> - <property name="log4j.appender.stdout.threshold" value="DEBUG"/> - - <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.stdout.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <property name="log4j.appender.file" value="org.apache.log4j.FileAppender"/> - <property name="log4j.appender.file.File" value="target/jcr.log"/> - - <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.file.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <!-- property name="log4j.category.jcr.FileCleaner" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.JDBCStorageConnection" value="DEBUG"/> - <property name="log4j.category.jcr.NodeImpl" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.database.DBSchemaCreator" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspaceDataReplicator" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspacePersistentDataManager" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.SessionDataManager" value="DEBUG"/ --> - </properties-param> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedSimpleLog</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.SimpleLogConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>SimpleLog properties</description> - <property name="org.apache.commons.logging.simplelog.defaultlog" value="debug"/> - <property name="org.apache.commons.logging.simplelog.showdatetime" value="true"/> - </properties-param --> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedJdk14Logger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Jdk14Configurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>jdk1.4 Logger properties</description> - <property name="handlers" value="java.util.logging.ConsoleHandler"/> - <property name=".level" value="FINE"/> - <property name="java.util.logging.ConsoleHandler.level" value="FINE"/> - </properties-param --> - - </init-params> - </component> - - <component> - <key>org.exoplatform.services.jcr.RepositoryService</key> - <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> - <component-plugins> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="test" value="http://www.apache.org/jackrabbit/test"/> - <property name="exojcrtest" value="http://www.exoplatform.org/jcr/test/1.0"/> - <property name="rma" value="http://www.rma.com/jcr/"/> - <property name="metadata" value="http://www.exoplatform.com/jcr/metadata/1.1/"/> - <property name="dc" value="http://purl.org/dc/elements/1.1/"/> - <property name="publication" value="http://www.exoplatform.com/jcr/publication/1.1/"/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>jar:/conf/test/nodetypes-tck.xml</value> - <value>jar:/conf/test/nodetypes-impl.xml</value> - <value>jar:/conf/test/nodetypes-usecase.xml</value> - <value>jar:/conf/test/nodetypes-config.xml</value> - <value>jar:/conf/test/nodetypes-config-extended.xml</value> - <value>jar:/conf/test/wcm-nodetypes.xml</value> - <value>jar:/conf/test/nodetypes-publication-config.xml</value> - <value>jar:/conf/test/publication-plugins-nodetypes-config.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepository</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepository - </description> - <value>jar:/conf/test/nodetypes-test.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepositoryTest2</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepositoryTest2 - </description> - <value>jar:/conf/test/nodetypes-test2.xml</value> - </values-param> - - <!--values-param> - <name>testInitNodeTypesRepositoryTest3</name> - <description>Node types from ext. Needed bacause core starup earlie than ext</description> - <value>jar:/conf/test/nodetypes-test3_ext.xml</value> - </values-param--> - - </init-params> - </component-plugin> - </component-plugins> - </component> - - <component> - <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> - <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> - <init-params> - <value-param> - <name>conf-path</name> - <description>JCR configuration file</description> - <value>jar:/conf/standalone/test-jcr-config-jbc.xml</value> - </value-param> - <properties-param> - <name>working-conf</name> - <description>working-conf</description> - <property name="dialect" value="auto" /> - <property name="source-name" value="jdbcjcr"/> - <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/> - </properties-param> - </init-params> - </component> - - <component> - <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type> - </component> - - <component> - <key>org.exoplatform.services.security.Authenticator</key> - <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> - </component> - - <component> - <type>org.exoplatform.services.jcr.impl.ext.action.SessionActionCatalog</type> - </component> - - <component> - <key>org.jboss.cache.transaction.TransactionManagerLookup</key> - <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type> - </component> - - <component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type> - <init-params> - <value-param> - <name>timeout</name> - <value>3000</value> - </value-param> - </init-params> - </component> - - <!-- component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.impl.jotm.TransactionServiceJotmImpl</type> - <init-params> - <value-param> - <name>timeout</name> - <value>300</value> - </value-param> - </init-params> - </component --> - - <external-component-plugins> - <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.postgresql.Driver" /> - <property name="url" value="jdbc:postgresql://localhost:5433/db1_ws" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr1</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.postgresql.Driver" /> - <property name="url" value="jdbc:postgresql://localhost:5433/db1_ws1" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.postgresql.Driver" /> - <property name="url" value="jdbc:postgresql://localhost:5433/db1_ws2" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr3</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.postgresql.Driver" /> - <property name="url" value="jdbc:postgresql://localhost:5433/db1_ws3" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtest</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrtest"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - <property name="maxActive" value="100" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrdb2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.postgresql.Driver" /> - <property name="url" value="jdbc:postgresql://localhost:5433/db2_ws" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr1db2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.postgresql.Driver" /> - <property name="url" value="jdbc:postgresql://localhost:5433/db2_ws1" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.postgresql.Driver" /> - <property name="url" value="jdbc:postgresql://localhost:5433/db1tck_ws" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr1tck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.postgresql.Driver" /> - <property name="url" value="jdbc:postgresql://localhost:5433/db1tck_ws1" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2tck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.postgresql.Driver" /> - <property name="url" value="jdbc:postgresql://localhost:5433/db1tck_ws2" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export1</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export1"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export3</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export3"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>testdbcleaner</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.postgresql.Driver" /> - <property name="url" value="jdbc:postgresql://localhost:5433/testdbcleaner_sjdbc" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - <property name="maxActive" value="20" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>repo</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.impl.jndi.BindableRepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="repositoryName" value="db1"/> - <!-- property name="containerConfig" value="exo-configuration.xml"/ --> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>rmi.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>rmirepository</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.rmi.RepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="url" value="//localhost:9999/repository"/> - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <remove-configuration>org.exoplatform.services.scheduler.JobSchedulerService</remove-configuration> - <!--<import>jar:/conf/database-configuration.hsql.xml</import> --> -</configuration> Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-pgsql-sjdbc-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-pgsql-sjdbc-jbc.xml 2011-11-11 21:12:47 UTC (rev 5181) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-pgsql-sjdbc-jbc.xml 2011-11-11 21:13:18 UTC (rev 5182) @@ -1,503 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> - <component> - <key>org.exoplatform.services.log.LogConfigurationInitializer</key> - <type>org.exoplatform.services.log.LogConfigurationInitializer</type> - <init-params> - <value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Log4JConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>Log4J properties</description> - <property name="log4j.rootLogger" value="INFO, stdout, file"/> - - <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender"/> - <property name="log4j.appender.stdout.threshold" value="DEBUG"/> - - <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.stdout.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <property name="log4j.appender.file" value="org.apache.log4j.FileAppender"/> - <property name="log4j.appender.file.File" value="target/jcr.log"/> - - <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.file.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <!-- property name="log4j.category.jcr.FileCleaner" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.JDBCStorageConnection" value="DEBUG"/> - <property name="log4j.category.jcr.NodeImpl" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.database.DBSchemaCreator" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspaceDataReplicator" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspacePersistentDataManager" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.SessionDataManager" value="DEBUG"/ --> - </properties-param> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedSimpleLog</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.SimpleLogConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>SimpleLog properties</description> - <property name="org.apache.commons.logging.simplelog.defaultlog" value="debug"/> - <property name="org.apache.commons.logging.simplelog.showdatetime" value="true"/> - </properties-param --> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedJdk14Logger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Jdk14Configurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>jdk1.4 Logger properties</description> - <property name="handlers" value="java.util.logging.ConsoleHandler"/> - <property name=".level" value="FINE"/> - <property name="java.util.logging.ConsoleHandler.level" value="FINE"/> - </properties-param --> - - </init-params> - </component> - - <component> - <key>org.exoplatform.services.jcr.RepositoryService</key> - <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> - <component-plugins> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="test" value="http://www.apache.org/jackrabbit/test"/> - <property name="exojcrtest" value="http://www.exoplatform.org/jcr/test/1.0"/> - <property name="rma" value="http://www.rma.com/jcr/"/> - <property name="metadata" value="http://www.exoplatform.com/jcr/metadata/1.1/"/> - <property name="dc" value="http://purl.org/dc/elements/1.1/"/> - <property name="publication" value="http://www.exoplatform.com/jcr/publication/1.1/"/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>jar:/conf/test/nodetypes-tck.xml</value> - <value>jar:/conf/test/nodetypes-impl.xml</value> - <value>jar:/conf/test/nodetypes-usecase.xml</value> - <value>jar:/conf/test/nodetypes-config.xml</value> - <value>jar:/conf/test/nodetypes-config-extended.xml</value> - <value>jar:/conf/test/wcm-nodetypes.xml</value> - <value>jar:/conf/test/nodetypes-publication-config.xml</value> - <value>jar:/conf/test/publication-plugins-nodetypes-config.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepository</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepository - </description> - <value>jar:/conf/test/nodetypes-test.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepositoryTest2</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepositoryTest2 - </description> - <value>jar:/conf/test/nodetypes-test2.xml</value> - </values-param> - - <!--values-param> - <name>testInitNodeTypesRepositoryTest3</name> - <description>Node types from ext. Needed bacause core starup earlie than ext</description> - <value>jar:/conf/test/nodetypes-test3_ext.xml</value> - </values-param--> - - </init-params> - </component-plugin> - </component-plugins> - </component> - - <component> - <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> - <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> - <init-params> - <value-param> - <name>conf-path</name> - <description>JCR configuration file</description> - <value>jar:/conf/standalone/test-jcr-config-sjdbc-jbc.xml</value> - </value-param> - <properties-param> - <name>working-conf</name> - <description>working-conf</description> - <property name="dialect" value="auto" /> - <property name="source-name" value="jdbcjcr"/> - <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/> - </properties-param> - </init-params> - </component> - - <component> - <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type> - </component> - - <component> - <key>org.exoplatform.services.security.Authenticator</key> - <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> - </component> - - <component> - <type>org.exoplatform.services.jcr.impl.ext.action.SessionActionCatalog</type> - </component> - - <component> - <key>org.jboss.cache.transaction.TransactionManagerLookup</key> - <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type> - </component> - - <component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type> - <init-params> - <value-param> - <name>timeout</name> - <value>3000</value> - </value-param> - </init-params> - </component> - - <!-- component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.impl.jotm.TransactionServiceJotmImpl</type> - <init-params> - <value-param> - <name>timeout</name> - <value>300</value> - </value-param> - </init-params> - </component --> - - <external-component-plugins> - <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.postgresql.Driver" /> - <property name="url" value="jdbc:postgresql://localhost:5433/db1" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - <property name="maxActive" value="20" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtest</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrtest"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - <property name="maxActive" value="100" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrdb2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.postgresql.Driver" /> - <property name="url" value="jdbc:postgresql://localhost:5433/db2" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.postgresql.Driver" /> - <property name="url" value="jdbc:postgresql://localhost:5433/db1tck" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export1</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export1"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export3</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export3"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>testdbcleaner</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.postgresql.Driver" /> - <property name="url" value="jdbc:postgresql://localhost:5433/testdbcleaner" /> - <property name="username" value="root" /> - <property name="password" value="eXoAdmin" /> - <property name="maxActive" value="20" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>repo</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.impl.jndi.BindableRepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="repositoryName" value="db1"/> - <!-- property name="containerConfig" value="exo-configuration.xml"/ --> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>rmi.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>rmirepository</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.rmi.RepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="url" value="//localhost:9999/repository"/> - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <remove-configuration>org.exoplatform.services.scheduler.JobSchedulerService</remove-configuration> - <!--<import>jar:/conf/database-configuration.hsql.xml</import> --> -</configuration> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc-jbc.xml 2011-11-11 21:12:47 UTC (rev 5181) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc-jbc.xml 2011-11-11 21:13:18 UTC (rev 5182) @@ -248,11 +248,11 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> <!-- MVCC configured to prevent possible deadlocks when a global Tx is active --> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portal;hsqldb.tx=mvcc"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="url" value="${jdbcjcr.url:jdbc:hsqldb:file:target/temp/data/portal;hsqldb.tx=mvcc}"/> + <property name="username" value="${jdbcjcr.username:sa}"/> + <property name="password" value="${jdbcjcr.password:}"/> <property name="maxActive" value="20" /> </properties-param> </init-params> @@ -305,10 +305,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portaldb2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcrdb2.url:jdbc:hsqldb:file:target/temp/data/portaldb2}"/> + <property name="username" value="${jdbcjcrdb2.username:sa}"/> + <property name="password" value="${jdbcjcrdb2.password:}"/> </properties-param> </init-params> </component-plugin> @@ -332,10 +332,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portaltck"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcrtck.url:jdbc:hsqldb:file:target/temp/data/portaltck}"/> + <property name="username" value="${jdbcjcrtck.username:sa}"/> + <property name="password" value="${jdbcjcrtck.password:}"/> </properties-param> </init-params> </component-plugin> @@ -440,10 +440,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/testdbcleaner"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${testdbcleaner.url:jdbc:hsqldb:file:target/temp/data/testdbcleaner}"/> + <property name="username" value="${testdbcleaner.username:sa}"/> + <property name="password" value="${testdbcleaner.password:}"/> <property name="maxActive" value="20" /> </properties-param> </init-params> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml 2011-11-11 21:12:47 UTC (rev 5181) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sjdbc.xml 2011-11-11 21:13:18 UTC (rev 5182) @@ -248,11 +248,11 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> <!-- MVCC configured to prevent possible deadlocks when a global Tx is active --> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portal;hsqldb.tx=mvcc"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="url" value="${jdbcjcr.url:jdbc:hsqldb:file:target/temp/data/portal;hsqldb.tx=mvcc}"/> + <property name="username" value="${jdbcjcr.username:sa}"/> + <property name="password" value="${jdbcjcr.password:}"/> <property name="maxActive" value="20" /> </properties-param> </init-params> @@ -305,10 +305,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portaldb2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcrdb2.url:jdbc:hsqldb:file:target/temp/data/portaldb2}"/> + <property name="username" value="${jdbcjcrdb2.username:sa}"/> + <property name="password" value="${jdbcjcrdb2.password:}"/> </properties-param> </init-params> </component-plugin> @@ -332,10 +332,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portaltck"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcrtck.url:jdbc:hsqldb:file:target/temp/data/portaltck}"/> + <property name="username" value="${jdbcjcrtck.username:sa}"/> + <property name="password" value="${jdbcjcrtck.password:}"/> </properties-param> </init-params> </component-plugin> @@ -440,10 +440,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/testdbcleaner"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${testdbcleaner.url:jdbc:hsqldb:file:target/temp/data/testdbcleaner}"/> + <property name="username" value="${testdbcleaner.username:sa}"/> + <property name="password" value="${testdbcleaner.password:}"/> <property name="maxActive" value="20" /> </properties-param> </init-params> Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sybase-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sybase-jbc.xml 2011-11-11 21:12:47 UTC (rev 5181) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sybase-jbc.xml 2011-11-11 21:13:18 UTC (rev 5182) @@ -1,663 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> - <component> - <key>org.exoplatform.services.log.LogConfigurationInitializer</key> - <type>org.exoplatform.services.log.LogConfigurationInitializer</type> - <init-params> - <value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Log4JConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>Log4J properties</description> - <property name="log4j.rootLogger" value="INFO, stdout, file"/> - - <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender"/> - <property name="log4j.appender.stdout.threshold" value="DEBUG"/> - - <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.stdout.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <property name="log4j.appender.file" value="org.apache.log4j.FileAppender"/> - <property name="log4j.appender.file.File" value="target/jcr.log"/> - - <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.file.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <!-- property name="log4j.category.jcr.FileCleaner" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.JDBCStorageConnection" value="DEBUG"/> - <property name="log4j.category.jcr.NodeImpl" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.database.DBSchemaCreator" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspaceDataReplicator" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspacePersistentDataManager" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.SessionDataManager" value="DEBUG"/ --> - </properties-param> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedSimpleLog</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.SimpleLogConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>SimpleLog properties</description> - <property name="org.apache.commons.logging.simplelog.defaultlog" value="debug"/> - <property name="org.apache.commons.logging.simplelog.showdatetime" value="true"/> - </properties-param --> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedJdk14Logger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Jdk14Configurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>jdk1.4 Logger properties</description> - <property name="handlers" value="java.util.logging.ConsoleHandler"/> - <property name=".level" value="FINE"/> - <property name="java.util.logging.ConsoleHandler.level" value="FINE"/> - </properties-param --> - - </init-params> - </component> - - <component> - <key>org.exoplatform.services.jcr.RepositoryService</key> - <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> - <component-plugins> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="test" value="http://www.apache.org/jackrabbit/test"/> - <property name="exojcrtest" value="http://www.exoplatform.org/jcr/test/1.0"/> - <property name="rma" value="http://www.rma.com/jcr/"/> - <property name="metadata" value="http://www.exoplatform.com/jcr/metadata/1.1/"/> - <property name="dc" value="http://purl.org/dc/elements/1.1/"/> - <property name="publication" value="http://www.exoplatform.com/jcr/publication/1.1/"/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>jar:/conf/test/nodetypes-tck.xml</value> - <value>jar:/conf/test/nodetypes-impl.xml</value> - <value>jar:/conf/test/nodetypes-usecase.xml</value> - <value>jar:/conf/test/nodetypes-config.xml</value> - <value>jar:/conf/test/nodetypes-config-extended.xml</value> - <value>jar:/conf/test/wcm-nodetypes.xml</value> - <value>jar:/conf/test/nodetypes-publication-config.xml</value> - <value>jar:/conf/test/publication-plugins-nodetypes-config.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepository</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepository - </description> - <value>jar:/conf/test/nodetypes-test.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepositoryTest2</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepositoryTest2 - </description> - <value>jar:/conf/test/nodetypes-test2.xml</value> - </values-param> - - <!--values-param> - <name>testInitNodeTypesRepositoryTest3</name> - <description>Node types from ext. Needed bacause core starup earlie than ext</description> - <value>jar:/conf/test/nodetypes-test3_ext.xml</value> - </values-param--> - - </init-params> - </component-plugin> - </component-plugins> - </component> - - <component> - <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> - <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> - <init-params> - <value-param> - <name>conf-path</name> - <description>JCR configuration file</description> - <value>jar:/conf/standalone/test-jcr-config-jbc.xml</value> - </value-param> - <properties-param> - <name>working-conf</name> - <description>working-conf</description> - <property name="dialect" value="auto" /> - <property name="source-name" value="jdbcjcr"/> - <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/> - </properties-param> - </init-params> - </component> - - <component> - <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type> - </component> - - <component> - <key>org.exoplatform.services.security.Authenticator</key> - <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> - </component> - - <component> - <type>org.exoplatform.services.jcr.impl.ext.action.SessionActionCatalog</type> - </component> - - <component> - <key>org.jboss.cache.transaction.TransactionManagerLookup</key> - <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type> - </component> - - <component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type> - <init-params> - <value-param> - <name>timeout</name> - <value>3000</value> - </value-param> - </init-params> - </component> - - <!-- component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.impl.jotm.TransactionServiceJotmImpl</type> - <init-params> - <value-param> - <name>timeout</name> - <value>300</value> - </value-param> - </init-params> - </component --> - - <external-component-plugins> - <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.sybase.jdbc4.jdbc.SybDriver" /> - <property name="url" value="jdbc:sybase:Tds:localhost:5003/db1_ws" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr1</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.sybase.jdbc4.jdbc.SybDriver" /> - <property name="url" value="jdbc:sybase:Tds:localhost:5003/db1_ws1" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.sybase.jdbc4.jdbc.SybDriver" /> - <property name="url" value="jdbc:sybase:Tds:localhost:5003/db1_ws2" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr3</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.sybase.jdbc4.jdbc.SybDriver" /> - <property name="url" value="jdbc:sybase:Tds:localhost:5003/db1_ws3" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtest</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrtest"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - <property name="maxActive" value="100" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrdb2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.sybase.jdbc4.jdbc.SybDriver" /> - <property name="url" value="jdbc:sybase:Tds:localhost:5003/db2_ws" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr1db2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.sybase.jdbc4.jdbc.SybDriver" /> - <property name="url" value="jdbc:sybase:Tds:localhost:5003/db2_ws1" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.sybase.jdbc4.jdbc.SybDriver" /> - <property name="url" value="jdbc:sybase:Tds:localhost:5003/db1tck_ws" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr1tck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.sybase.jdbc4.jdbc.SybDriver" /> - <property name="url" value="jdbc:sybase:Tds:localhost:5003/db1tck_ws1" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2tck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.sybase.jdbc4.jdbc.SybDriver" /> - <property name="url" value="jdbc:sybase:Tds:localhost:5003/db1tck_ws2" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export1</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export1"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export3</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export3"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>testdbcleaner</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.sybase.jdbc4.jdbc.SybDriver" /> - <property name="url" value="jdbc:sybase:Tds:localhost:5003/testdbcleaner" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>repo</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.impl.jndi.BindableRepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="repositoryName" value="db1"/> - <!-- property name="containerConfig" value="exo-configuration.xml"/ --> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>rmi.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>rmirepository</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.rmi.RepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="url" value="//localhost:9999/repository"/> - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <remove-configuration>org.exoplatform.services.scheduler.JobSchedulerService</remove-configuration> - <!--<import>jar:/conf/database-configuration.hsql.xml</import> --> -</configuration> Deleted: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sybase-sjdbc-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sybase-sjdbc-jbc.xml 2011-11-11 21:12:47 UTC (rev 5181) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-sybase-sjdbc-jbc.xml 2011-11-11 21:13:18 UTC (rev 5182) @@ -1,503 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - - Copyright (C) 2009 eXo Platform SAS. - - This is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of - the License, or (at your option) any later version. - - This software is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this software; if not, write to the Free - Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA, or see the FSF site: http://www.fsf.org. - ---> -<configuration - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd http://www.exoplatform.org/xml/ns/kernel_1_2.xsd" - xmlns="http://www.exoplatform.org/xml/ns/kernel_1_2.xsd"> - <component> - <key>org.exoplatform.services.log.LogConfigurationInitializer</key> - <type>org.exoplatform.services.log.LogConfigurationInitializer</type> - <init-params> - <value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedLog4JLogger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Log4JConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>Log4J properties</description> - <property name="log4j.rootLogger" value="INFO, stdout, file"/> - - <property name="log4j.appender.stdout" value="org.apache.log4j.ConsoleAppender"/> - <property name="log4j.appender.stdout.threshold" value="DEBUG"/> - - <property name="log4j.appender.stdout.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.stdout.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <property name="log4j.appender.file" value="org.apache.log4j.FileAppender"/> - <property name="log4j.appender.file.File" value="target/jcr.log"/> - - <property name="log4j.appender.file.layout" value="org.apache.log4j.PatternLayout"/> - <property name="log4j.appender.file.layout.ConversionPattern" - value="%d{dd.MM.yyyy HH:mm:ss} *%-5p* [%t] %c{1}: %m (%F, line %L) %n"/> - - <!-- property name="log4j.category.jcr.FileCleaner" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.JDBCStorageConnection" value="DEBUG"/> - <property name="log4j.category.jcr.NodeImpl" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.database.DBSchemaCreator" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspaceDataReplicator" value="DEBUG"/ --> - - <!-- property name="log4j.category.jcr.WorkspaceStorageCacheImpl" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.WorkspacePersistentDataManager" value="DEBUG"/ --> - <!-- property name="log4j.category.jcr.SessionDataManager" value="DEBUG"/ --> - </properties-param> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedSimpleLog</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.SimpleLogConfigurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>SimpleLog properties</description> - <property name="org.apache.commons.logging.simplelog.defaultlog" value="debug"/> - <property name="org.apache.commons.logging.simplelog.showdatetime" value="true"/> - </properties-param --> - - <!-- value-param> - <name>logger</name> - <value>org.exoplatform.services.log.impl.BufferedJdk14Logger</value> - </value-param> - <value-param> - <name>configurator</name> - <value>org.exoplatform.services.log.impl.Jdk14Configurator</value> - </value-param> - <properties-param> - <name>properties</name> - <description>jdk1.4 Logger properties</description> - <property name="handlers" value="java.util.logging.ConsoleHandler"/> - <property name=".level" value="FINE"/> - <property name="java.util.logging.ConsoleHandler.level" value="FINE"/> - </properties-param --> - - </init-params> - </component> - - <component> - <key>org.exoplatform.services.jcr.RepositoryService</key> - <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type> - <component-plugins> - <component-plugin> - <name>add.namespaces</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type> - <init-params> - <properties-param> - <name>namespaces</name> - <property name="test" value="http://www.apache.org/jackrabbit/test"/> - <property name="exojcrtest" value="http://www.exoplatform.org/jcr/test/1.0"/> - <property name="rma" value="http://www.rma.com/jcr/"/> - <property name="metadata" value="http://www.exoplatform.com/jcr/metadata/1.1/"/> - <property name="dc" value="http://purl.org/dc/elements/1.1/"/> - <property name="publication" value="http://www.exoplatform.com/jcr/publication/1.1/"/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>add.nodeType</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type> - <init-params> - <values-param> - <name>autoCreatedInNewRepository</name> - <description>Node types configuration file</description> - <value>jar:/conf/test/nodetypes-tck.xml</value> - <value>jar:/conf/test/nodetypes-impl.xml</value> - <value>jar:/conf/test/nodetypes-usecase.xml</value> - <value>jar:/conf/test/nodetypes-config.xml</value> - <value>jar:/conf/test/nodetypes-config-extended.xml</value> - <value>jar:/conf/test/wcm-nodetypes.xml</value> - <value>jar:/conf/test/nodetypes-publication-config.xml</value> - <value>jar:/conf/test/publication-plugins-nodetypes-config.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepository</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepository - </description> - <value>jar:/conf/test/nodetypes-test.xml</value> - </values-param> - - <values-param> - <name>testInitNodeTypesRepositoryTest2</name> - <description> - Node types configuration file for repository with name testInitNodeTypesRepositoryTest2 - </description> - <value>jar:/conf/test/nodetypes-test2.xml</value> - </values-param> - - <!--values-param> - <name>testInitNodeTypesRepositoryTest3</name> - <description>Node types from ext. Needed bacause core starup earlie than ext</description> - <value>jar:/conf/test/nodetypes-test3_ext.xml</value> - </values-param--> - - </init-params> - </component-plugin> - </component-plugins> - </component> - - <component> - <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key> - <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type> - <init-params> - <value-param> - <name>conf-path</name> - <description>JCR configuration file</description> - <value>jar:/conf/standalone/test-jcr-config-sjdbc-jbc.xml</value> - </value-param> - <properties-param> - <name>working-conf</name> - <description>working-conf</description> - <property name="dialect" value="auto" /> - <property name="source-name" value="jdbcjcr"/> - <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/> - </properties-param> - </init-params> - </component> - - <component> - <type>org.exoplatform.services.organization.impl.mock.DummyOrganizationService</type> - </component> - - <component> - <key>org.exoplatform.services.security.Authenticator</key> - <type>org.exoplatform.services.organization.auth.OrganizationAuthenticatorImpl</type> - </component> - - <component> - <type>org.exoplatform.services.jcr.impl.ext.action.SessionActionCatalog</type> - </component> - - <component> - <key>org.jboss.cache.transaction.TransactionManagerLookup</key> - <type>org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup</type> - </component> - - <component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type> - <init-params> - <value-param> - <name>timeout</name> - <value>3000</value> - </value-param> - </init-params> - </component> - - <!-- component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.impl.jotm.TransactionServiceJotmImpl</type> - <init-params> - <value-param> - <name>timeout</name> - <value>300</value> - </value-param> - </init-params> - </component --> - - <external-component-plugins> - <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.sybase.jdbc4.jdbc.SybDriver" /> - <property name="url" value="jdbc:sybase:Tds:localhost:5003/db1" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - <property name="maxActive" value="20" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtest</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrtest"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - <property name="maxActive" value="100" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrdb2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.sybase.jdbc4.jdbc.SybDriver" /> - <property name="url" value="jdbc:sybase:Tds:localhost:5003/db2" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcrtck</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.sybase.jdbc4.jdbc.SybDriver" /> - <property name="url" value="jdbc:sybase:Tds:localhost:5003/db1_tck" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export1</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export1"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export2</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>jdbcjcr2export3</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jdbcjcr2export3"/> - <property name="username" value="sa"/> - <property name="password" value=""/> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.datasource</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>testdbcleaner</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.sql.DataSource</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.apache.commons.dbcp.BasicDataSourceFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="driverClassName" value="com.sybase.jdbc4.jdbc.SybDriver" /> - <property name="url" value="jdbc:sybase:Tds:localhost:5003/testdbcleaner_sjdbc" /> - <property name="username" value="sa" /> - <property name="password" value="" /> - <property name="maxActive" value="20" /> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>bind.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>repo</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.impl.jndi.BindableRepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="repositoryName" value="db1"/> - <!-- property name="containerConfig" value="exo-configuration.xml"/ --> - </properties-param> - </init-params> - </component-plugin> - <component-plugin> - <name>rmi.jcr</name> - <set-method>addPlugin</set-method> - <type>org.exoplatform.services.naming.BindReferencePlugin</type> - <init-params> - <value-param> - <name>bind-name</name> - <value>rmirepository</value> - </value-param> - <value-param> - <name>class-name</name> - <value>javax.jcr.Repository</value> - </value-param> - <value-param> - <name>factory</name> - <value>org.exoplatform.services.jcr.rmi.RepositoryFactory</value> - </value-param> - <properties-param> - <name>ref-addresses</name> - <description>ref-addresses</description> - <property name="url" value="//localhost:9999/repository"/> - </properties-param> - </init-params> - </component-plugin> - </external-component-plugins> - - <remove-configuration>org.exoplatform.services.scheduler.JobSchedulerService</remove-configuration> - <!--<import>jar:/conf/database-configuration.hsql.xml</import> --> -</configuration> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml 2011-11-11 21:12:47 UTC (rev 5181) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration.xml 2011-11-11 21:13:18 UTC (rev 5182) @@ -248,11 +248,11 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> <!-- MVCC configured to prevent possible deadlocks when a global Tx is active --> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portal;hsqldb.tx=mvcc"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="url" value="${jdbcjcr.url:jdbc:hsqldb:file:target/temp/data/portal;hsqldb.tx=mvcc}"/> + <property name="username" value="${jdbcjcr.username:sa}"/> + <property name="password" value="${jdbcjcr.password:}"/> </properties-param> </init-params> </component-plugin> @@ -276,10 +276,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr1.url:jdbc:hsqldb:file:target/temp/data/jcr}"/> + <property name="username" value="${jdbcjcr1.username:sa}"/> + <property name="password" value="${jdbcjcr1.password:}"/> </properties-param> </init-params> </component-plugin> @@ -303,10 +303,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr2.url:jdbc:hsqldb:file:target/temp/data/jcr2}"/> + <property name="username" value="${jdbcjcr2.username:sa}"/> + <property name="password" value="${jdbcjcr2.password:}"/> </properties-param> </init-params> </component-plugin> @@ -330,10 +330,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr3"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr3.url:jdbc:hsqldb:file:target/temp/data/jcr3}"/> + <property name="username" value="${jdbcjcr3.username:sa}"/> + <property name="password" value="${jdbcjcr3.password:}"/> </properties-param> </init-params> </component-plugin> @@ -385,10 +385,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portaldb2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcrdb2.url:jdbc:hsqldb:file:target/temp/data/portaldb2}"/> + <property name="username" value="${jdbcjcrdb2.username:sa}"/> + <property name="password" value="${jdbcjcrdb2.password:}"/> </properties-param> </init-params> </component-plugin> @@ -412,10 +412,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrdb2"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr1db2.url:jdbc:hsqldb:file:target/temp/data/jcrdb2}"/> + <property name="username" value="${jdbcjcr1db2.username:sa}"/> + <property name="password" value="${jdbcjcr1db2.password:}"/> </properties-param> </init-params> </component-plugin> @@ -439,10 +439,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/portaltck"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcrtck.url:jdbc:hsqldb:file:target/temp/data/portaltck}"/> + <property name="username" value="${jdbcjcrtck.username:sa}"/> + <property name="password" value="${jdbcjcrtck.password:}"/> </properties-param> </init-params> </component-plugin> @@ -466,10 +466,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcrtck"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr1tck.url:jdbc:hsqldb:file:target/temp/data/jcrtck}"/> + <property name="username" value="${jdbcjcr1tck.username:sa}"/> + <property name="password" value="${jdbcjcr1tck.password:}"/> </properties-param> </init-params> </component-plugin> @@ -493,10 +493,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/jcr2tck"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${jdbcjcr2tck.url:jdbc:hsqldb:file:target/temp/data/jcr2tck}"/> + <property name="username" value="${jdbcjcr2tck.username:sa}"/> + <property name="password" value="${jdbcjcr2tck.password:}"/> </properties-param> </init-params> </component-plugin> @@ -601,10 +601,10 @@ <properties-param> <name>ref-addresses</name> <description>ref-addresses</description> - <property name="driverClassName" value="org.hsqldb.jdbcDriver"/> - <property name="url" value="jdbc:hsqldb:file:target/temp/data/testdbcleaner"/> - <property name="username" value="sa"/> - <property name="password" value=""/> + <property name="driverClassName" value="${all.driverClassName:org.hsqldb.jdbcDriver}"/> + <property name="url" value="${testdbcleaner.url:jdbc:hsqldb:file:target/temp/data/testdbcleaner}"/> + <property name="username" value="${testdbcleaner.username:sa}"/> + <property name="password" value="${testdbcleaner.password:}"/> <property name="maxActive" value="20" /> </properties-param> </init-params>