August 2011 - exo-jcr-commits - Jboss List Archives

exo-jcr SVN: r4801 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc: optimisation and 1 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-08-26 08:07:28 -0400 (Fri, 26 Aug 2011) New Revision: 4801 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MultiDbJDBCConnection.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java Log: EXOJCR-1482: Use batch update for the property values Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2011-08-26 10:58:55 UTC (rev 4800) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2011-08-26 12:07:28 UTC (rev 4801) @@ -166,8 +166,6 @@ protected PreparedStatement findPropertiesByParentId; - protected PreparedStatement insertItem; - protected PreparedStatement insertNode; protected PreparedStatement insertProperty; @@ -176,20 +174,11 @@ protected PreparedStatement insertValue; - protected PreparedStatement updateItem; - - protected PreparedStatement updateItemPath; - protected PreparedStatement updateNode; protected PreparedStatement updateProperty; protected PreparedStatement deleteItem; - - protected PreparedStatement deleteNode; - - protected PreparedStatement deleteProperty; - protected PreparedStatement deleteReference; protected PreparedStatement deleteValue; @@ -486,11 +475,6 @@ findPropertiesByParentId.close(); } - if (insertItem != null) - { - insertItem.close(); - } - if (insertNode != null) { insertNode.close(); @@ -511,16 +495,6 @@ insertValue.close(); } - if (updateItem != null) - { - updateItem.close(); - } - - if (updateItemPath != null) - { - updateItemPath.close(); - } - if (updateNode != null) { updateNode.close(); @@ -536,16 +510,6 @@ deleteItem.close(); } - if (deleteNode != null) - { - deleteNode.close(); - } - - if (deleteProperty != null) - { - deleteProperty.close(); - } - if (deleteReference != null) { deleteReference.close(); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java 2011-08-26 10:58:55 UTC (rev 4800) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/CQJDBCStorageConnection.java 2011-08-26 12:07:28 UTC (rev 4801) @@ -153,6 +153,8 @@ protected Statement findNodesByParentIdAndComplexPatternCQ; + protected final boolean allowBatching; + /** * JDBCStorageConnection constructor. * @@ -176,6 +178,7 @@ throws SQLException { super(dbConnection, readOnly, containerName, valueStorageProvider, maxBufferSize, swapDirectory, swapCleaner); + this.allowBatching = dbConnection.getMetaData().supportsBatchUpdates(); } /** @@ -505,7 +508,7 @@ { List<ValueData> vdata = data.getValues(); - for (int i = 0; i < vdata.size(); i++) + for (int i = 0, length = vdata.size(); i < length; i++) { ValueData vd = vdata.get(i); ValueIOChannel channel = valueStorageProvider.getApplicableChannel(data, i); @@ -561,11 +564,11 @@ } if (i < totalOldValues) { - updateValueData(cid, i, stream, streamLength, storageId); + updateValueData(cid, i, stream, streamLength, storageId, i == length - 1 || i == totalOldValues - 1); } else { - addValueData(cid, i, stream, streamLength, storageId); + addValueData(cid, i, stream, streamLength, storageId, i == length - 1); } } } @@ -1240,6 +1243,9 @@ protected abstract int deleteValueDataByOrderNum(String id, int orderNum) throws SQLException; - protected abstract int updateValueData(String cid, int i, InputStream stream, int streamLength, String storageId) + protected abstract int updateValueData(String cid, int i, InputStream stream, int streamLength, String storageId, boolean lastValue) throws SQLException; + + protected abstract int addValueData(String cid, int orderNumber, InputStream stream, int streamLength, + String storageId, boolean lastValue) throws SQLException; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MultiDbJDBCConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MultiDbJDBCConnection.java 2011-08-26 10:58:55 UTC (rev 4800) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/MultiDbJDBCConnection.java 2011-08-26 12:07:28 UTC (rev 4801) @@ -667,7 +667,17 @@ protected int addValueData(String cid, int orderNumber, InputStream stream, int streamLength, String storageDesc) throws SQLException { + throw new UnsupportedOperationException("This method is not supported, use the mehod of the same name with lastValue"); + } + /** + * {@inheritDoc} + */ + @Override + protected int addValueData(String cid, int orderNumber, InputStream stream, int streamLength, String storageDesc, boolean lastValue) + throws SQLException + { + if (insertValue == null) { insertValue = dbConnection.prepareStatement(INSERT_VALUE); @@ -691,9 +701,18 @@ insertValue.setInt(2, orderNumber); insertValue.setString(3, cid); + if (allowBatching) + { + insertValue.addBatch(); + if (lastValue) + { + insertValue.executeBatch(); + } + return 1; + } return insertValue.executeUpdate(); } - + /** * {@inheritDoc} */ @@ -886,7 +905,7 @@ return findPropertyById.executeQuery(); } - protected int updateValueData(String cid, int orderNumber, InputStream stream, int streamLength, String storageDesc) + protected int updateValueData(String cid, int orderNumber, InputStream stream, int streamLength, String storageDesc, boolean lastValue) throws SQLException { @@ -913,6 +932,15 @@ updateValue.setString(3, cid); updateValue.setInt(4, orderNumber); + if (allowBatching) + { + updateValue.addBatch(); + if (lastValue) + { + updateValue.executeBatch(); + } + return 1; + } return updateValue.executeUpdate(); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java 2011-08-26 10:58:55 UTC (rev 4800) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SingleDbJDBCConnection.java 2011-08-26 12:07:28 UTC (rev 4801) @@ -520,7 +520,17 @@ protected int addValueData(String cid, int orderNumber, InputStream stream, int streamLength, String storageDesc) throws SQLException { + throw new UnsupportedOperationException("This method is not supported, use the mehod of the same name with lastValue"); + } + /** + * {@inheritDoc} + */ + @Override + protected int addValueData(String cid, int orderNumber, InputStream stream, int streamLength, String storageDesc, boolean lastValue) + throws SQLException + { + if (insertValue == null) insertValue = dbConnection.prepareStatement(INSERT_VALUE); else @@ -540,6 +550,15 @@ insertValue.setInt(2, orderNumber); insertValue.setString(3, cid); + if (allowBatching) + { + insertValue.addBatch(); + if (lastValue) + { + insertValue.executeBatch(); + } + return 1; + } return insertValue.executeUpdate(); } @@ -825,7 +844,7 @@ } @Override - protected int updateValueData(String cid, int orderNumber, InputStream stream, int streamLength, String storageDesc) + protected int updateValueData(String cid, int orderNumber, InputStream stream, int streamLength, String storageDesc, boolean lastValue) throws SQLException { @@ -848,6 +867,15 @@ updateValue.setString(3, cid); updateValue.setInt(4, orderNumber); + if (allowBatching) + { + updateValue.addBatch(); + if (lastValue) + { + updateValue.executeBatch(); + } + return 1; + } return updateValue.executeUpdate(); }

12 years, 8 months

1
0
0 / 0

exo-jcr SVN: r4800 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db.

by do-not-reply＠jboss.org

Author: nfilotto Date: 2011-08-26 06:58:55 -0400 (Fri, 26 Aug 2011) New Revision: 4800 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/DB2ConnectionFactory.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/PostgreConnectionFactory.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SybaseConnectionFactory.java Log: EXOJCR-1195: RDBMS indexing is disabled for DB2, Sybase and PGSQL until we improve it if it is possible as the perfs are better with old indexing Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/DB2ConnectionFactory.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/DB2ConnectionFactory.java 2011-08-26 08:44:53 UTC (rev 4799) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/DB2ConnectionFactory.java 2011-08-26 10:58:55 UTC (rev 4800) @@ -130,5 +130,14 @@ public boolean isIDNeededForPaging() { return false; + } + + /** + * {@inheritDoc} + */ + @Override + public boolean isReindexingSupport() + { + return false; } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/PostgreConnectionFactory.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/PostgreConnectionFactory.java 2011-08-26 08:44:53 UTC (rev 4799) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/PostgreConnectionFactory.java 2011-08-26 10:58:55 UTC (rev 4800) @@ -122,5 +122,13 @@ throw new RepositoryException(e); } } - + + /** + * {@inheritDoc} + */ + @Override + public boolean isReindexingSupport() + { + return false; + } } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SybaseConnectionFactory.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SybaseConnectionFactory.java 2011-08-26 08:44:53 UTC (rev 4799) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/optimisation/db/SybaseConnectionFactory.java 2011-08-26 10:58:55 UTC (rev 4800) @@ -130,6 +130,6 @@ @Override public boolean isReindexingSupport() { - return true; + return false; } }

12 years, 8 months

1
0
0 / 0

exo-jcr SVN: r4799 - ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/provider.

by do-not-reply＠jboss.org

Author: nfilotto Date: 2011-08-26 04:44:53 -0400 (Fri, 26 Aug 2011) New Revision: 4799 Modified: ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/provider/HierarchicalPropertyEntityProvider.java Log: EXOJCR-1496: Need add annotation @Provider to the org.exoplatform.services.rest.ext.provider.HierarchicalPropertyEntityProvider Modified: ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/provider/HierarchicalPropertyEntityProvider.java =================================================================== --- ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/provider/HierarchicalPropertyEntityProvider.java 2011-08-25 14:52:56 UTC (rev 4798) +++ ws/trunk/exo.ws.rest.ext/src/main/java/org/exoplatform/services/rest/ext/provider/HierarchicalPropertyEntityProvider.java 2011-08-26 08:44:53 UTC (rev 4799) @@ -34,6 +34,7 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.ext.Provider; import javax.xml.namespace.QName; import javax.xml.stream.EventFilter; import javax.xml.stream.FactoryConfigurationError; @@ -55,6 +56,7 @@ * @author <a href="dkatayev(a)gmail.com">Dmytro Katayev</a> * @version $Id: HierarchicalPropertyEntityProvider.java */ +@Provider public class HierarchicalPropertyEntityProvider implements EntityProvider<HierarchicalProperty> {

12 years, 8 months

1
0
0 / 0

exo-jcr SVN: r4798 - core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization.

by do-not-reply＠jboss.org

Author: nfilotto Date: 2011-08-25 10:52:56 -0400 (Thu, 25 Aug 2011) New Revision: 4798 Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/MembershipHandler.java Log: EXOJCR-1491: Fixed the comment Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/MembershipHandler.java =================================================================== --- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/MembershipHandler.java 2011-08-25 14:51:14 UTC (rev 4797) +++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/MembershipHandler.java 2011-08-25 14:52:56 UTC (rev 4798) @@ -143,7 +143,7 @@ * @return A collection of the memberships. The collection cannot be none and * empty if no membership is found. * @throws Exception - * @deprecated This method should no be called, use {@link MembershipHandler#findAllMembershipsByGroup(String)} + * @deprecated This method should no be called, use {@link MembershipHandler#findAllMembershipsByGroup(Group)} * instead */ public Collection findMembershipsByGroup(Group group) throws Exception;

12 years, 8 months

1
0
0 / 0

exo-jcr SVN: r4797 - core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization.

by do-not-reply＠jboss.org

Author: nfilotto Date: 2011-08-25 10:51:14 -0400 (Thu, 25 Aug 2011) New Revision: 4797 Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/MembershipHandler.java Log: EXOJCR-1491: The old method is now deprecated Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/MembershipHandler.java =================================================================== --- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/MembershipHandler.java 2011-08-25 14:12:10 UTC (rev 4796) +++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/MembershipHandler.java 2011-08-25 14:51:14 UTC (rev 4797) @@ -26,7 +26,7 @@ * Created by The eXo Platform SAS Author : Tuan Nguyen * tuan08(a)users.sourceforge.net Oct 13, 2005 This class is acted as a sub * component of the organization service. It is used to manage the membership - - * the ralation of user , group, and membership type - and broadcast the + * the relation of user , group, and membership type - and broadcast the * membership event to all the registered listener in the organization service. * The membership event can be: new linked membership and delete the membership * type event. Each event should have 2 phases: pre event and post event. The @@ -54,7 +54,7 @@ * * @param user The user of the membership * @param group The group of the membership - * @param m The MembershipType of the memebership + * @param m The MembershipType of the membership * @param broadcast Broadcast the event if the value of the broadcast is * 'true' * @throws Exception An exception is thrown if the method is fail to access @@ -143,6 +143,8 @@ * @return A collection of the memberships. The collection cannot be none and * empty if no membership is found. * @throws Exception + * @deprecated This method should no be called, use {@link MembershipHandler#findAllMembershipsByGroup(String)} + * instead */ public Collection findMembershipsByGroup(Group group) throws Exception;

12 years, 8 months

1
0
0 / 0

exo-jcr SVN: r4796 - jcr/trunk/exo.jcr.component.core.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-08-25 10:12:10 -0400 (Thu, 25 Aug 2011) New Revision: 4796 Modified: jcr/trunk/exo.jcr.component.core/pom.xml Log: EXOJCR-852: add profiles to run on DB2 Modified: jcr/trunk/exo.jcr.component.core/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/pom.xml 2011-08-25 13:48:01 UTC (rev 4795) +++ jcr/trunk/exo.jcr.component.core/pom.xml 2011-08-25 14:12:10 UTC (rev 4796) @@ -275,13 +275,13 @@ <dependency> <groupId>com.ibm.db2</groupId> <artifactId>db2jcc</artifactId> - <version>9.7</version> + <version>9.1</version> <scope>test</scope> </dependency> <dependency> <groupId>com.ibm.db2</groupId> <artifactId>db2jcc_license_cu</artifactId> - <version>9.7</version> + <version>9.1</version> <scope>test</scope> </dependency>

12 years, 8 months

1
0
0 / 0

exo-jcr SVN: r4795 - in jcr/trunk/exo.jcr.component.core: src/test/resources/conf/standalone and 1 other directory.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-08-25 09:48:01 -0400 (Thu, 25 Aug 2011) New Revision: 4795 Added: 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 Modified: jcr/trunk/exo.jcr.component.core/pom.xml Log: EXOJCR-852: add profiles to run on DB2 Modified: jcr/trunk/exo.jcr.component.core/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/pom.xml 2011-08-25 11:36:32 UTC (rev 4794) +++ jcr/trunk/exo.jcr.component.core/pom.xml 2011-08-25 13:48:01 UTC (rev 4795) @@ -272,7 +272,7 @@ <scope>test</scope> </dependency>  -  + </dependency>   +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.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"/> + +  + +  + +  +  +  + +  +  +  + </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> + +  + + </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> + +  + + <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"/> +  + </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> +  +</configuration> Added: 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 (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-configuration-db2-sjdbc-jbc.xml 2011-08-25 13:48:01 UTC (rev 4795) @@ -0,0 +1,503 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<configuration + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd" + xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.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"/> + +  + +  + +  +  +  + +  +  +  + </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> + +  + + </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> + +  + + <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"/> +  + </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> +  +</configuration>

12 years, 8 months

1
0
0 / 0

exo-jcr SVN: r4794 - jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session.

by do-not-reply＠jboss.org

Author: trang_vu Date: 2011-08-25 07:36:32 -0400 (Thu, 25 Aug 2011) New Revision: 4794 Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionItemPool.java Log: JCR-1656: remove explicit call of System.gc() Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionItemPool.java =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionItemPool.java 2011-08-25 11:35:13 UTC (rev 4793) +++ jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/session/SessionItemPool.java 2011-08-25 11:36:32 UTC (rev 4794) @@ -34,6 +34,7 @@ * @author <a href="mailto:geaz@users.sourceforge.net">Gennady Azarenkov</a> * @version $Id: SessionItemPool.java 11907 2008-03-13 15:36:21Z ksm $ */ +@Deprecated final class SessionItemPool { @@ -47,7 +48,6 @@ void remove(String identifier) { items.remove(identifier); - System.gc(); } void put(ItemImpl item)

12 years, 8 months

1
0
0 / 0

exo-jcr SVN: r4793 - ws/branches/2.1.x/exo.ws.commons/src/main/java/org/exoplatform/common/http/client.

by do-not-reply＠jboss.org

Author: trang_vu Date: 2011-08-25 07:35:13 -0400 (Thu, 25 Aug 2011) New Revision: 4793 Modified: ws/branches/2.1.x/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/DefaultAuthHandler.java Log: WS-269: remove explicit call of System.gc() Modified: ws/branches/2.1.x/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/DefaultAuthHandler.java =================================================================== --- ws/branches/2.1.x/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/DefaultAuthHandler.java 2011-08-23 09:29:51 UTC (rev 4792) +++ ws/branches/2.1.x/exo.ws.commons/src/main/java/org/exoplatform/common/http/client/DefaultAuthHandler.java 2011-08-25 11:35:13 UTC (rev 4793) @@ -192,7 +192,6 @@ // try to get rid of any unencoded passwords in memory answer = null; - System.gc(); // Done

12 years, 8 months

1
0
0 / 0

exo-jcr SVN: r4792 - in core/trunk: exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/cache and 4 other directories.

by do-not-reply＠jboss.org

Author: tolusha Date: 2011-08-23 05:29:51 -0400 (Tue, 23 Aug 2011) New Revision: 4792 Added: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/mock/SimpleMembershipListAccess.java Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/MembershipHandler.java core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/cache/CacheableMembershipHandlerImpl.java core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/mock/DummyOrganizationService.java core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipDAOImpl.java core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipDAOImpl.java core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java Log: EXOJCR-1491: Add new method to MembershipHandler interface Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/MembershipHandler.java =================================================================== --- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/MembershipHandler.java 2011-08-23 09:05:53 UTC (rev 4791) +++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/MembershipHandler.java 2011-08-23 09:29:51 UTC (rev 4792) @@ -18,6 +18,8 @@ */ package org.exoplatform.services.organization; +import org.exoplatform.commons.utils.ListAccess; + import java.util.Collection; /** @@ -145,6 +147,17 @@ public Collection findMembershipsByGroup(Group group) throws Exception; /** + * Use this method to find all the membership in a group. Note that an user + * can have more than one membership in a group. For example , user admin can + * have meberhsip 'member' and 'admin' in the group '/users' + * + * @param group + * @return the list of the memberships + * @throws Exception + */ + public ListAccess<Membership> findAllMembershipsByGroup(Group group) throws Exception; + + /** * Use this method to register a membership event listener. * * @param listener the listener instance. Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/cache/CacheableMembershipHandlerImpl.java =================================================================== --- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/cache/CacheableMembershipHandlerImpl.java 2011-08-23 09:05:53 UTC (rev 4791) +++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/cache/CacheableMembershipHandlerImpl.java 2011-08-23 09:29:51 UTC (rev 4792) @@ -16,8 +16,7 @@ */ package org.exoplatform.services.organization.cache; -import com.sun.org.apache.bcel.internal.generic.RETURN; - +import org.exoplatform.commons.utils.ListAccess; import org.exoplatform.services.cache.ExoCache; import org.exoplatform.services.organization.Group; import org.exoplatform.services.organization.Membership; @@ -25,6 +24,7 @@ import org.exoplatform.services.organization.MembershipHandler; import org.exoplatform.services.organization.MembershipType; import org.exoplatform.services.organization.User; + import java.util.Collection; /** @@ -136,6 +136,11 @@ return memberships; } + public ListAccess<Membership> findAllMembershipsByGroup(Group group) throws Exception + { + return membershipHandler.findAllMembershipsByGroup(group); + } + /** * {@inheritDoc} */ Modified: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/mock/DummyOrganizationService.java =================================================================== --- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/mock/DummyOrganizationService.java 2011-08-23 09:05:53 UTC (rev 4791) +++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/mock/DummyOrganizationService.java 2011-08-23 09:29:51 UTC (rev 4792) @@ -109,6 +109,11 @@ return null; } + public ListAccess<Membership> findAllMembershipsByGroup(Group group) throws Exception + { + return null; + } + public Collection findMembershipsByUser(String userName) throws Exception { Collection memberships = new ArrayList(); Added: core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/mock/SimpleMembershipListAccess.java =================================================================== --- core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/mock/SimpleMembershipListAccess.java (rev 0) +++ core/trunk/exo.core.component.organization.api/src/main/java/org/exoplatform/services/organization/impl/mock/SimpleMembershipListAccess.java 2011-08-23 09:29:51 UTC (rev 4792) @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2011 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. + */ +package org.exoplatform.services.organization.impl.mock; + +import org.exoplatform.commons.utils.ListAccess; +import org.exoplatform.services.organization.Membership; + +import java.util.Collection; +import java.util.Iterator; + +/** + * @author <a href="abazko(a)exoplatform.com">Anatoliy Bazko</a> + * @version $Id: SimpleJDBCMembershipListAccess.java 34360 2009-07-22 23:58:59Z tolusha $ + */ +public class SimpleMembershipListAccess implements ListAccess<Membership> +{ + + private final Collection<Membership> memberships; + + public SimpleMembershipListAccess(Collection<Membership> memberships) + { + this.memberships = memberships; + } + + /** + * {@inheritDoc} + */ + public Membership[] load(int index, int length) throws Exception, IllegalArgumentException + { + if (index < 0) + { + throw new IllegalArgumentException("Illegal index: can't be a negative number"); + } + + if (length < 0) + { + throw new IllegalArgumentException("Illegal length: can't be a negative number"); + } + + if (index + length > memberships.size()) + { + throw new IllegalArgumentException("The sum of the index and the length cannot be greater than the list size"); + } + + Membership[] results = new Membership[length]; + Iterator<Membership> iter = memberships.iterator(); + + for (int p = 0, counter = 0; counter < length; p++) + { + Membership membership = iter.next(); + + if (p >= index) + { + results[counter++] = membership; + } + } + + return results; + } + + /** + * {@inheritDoc} + */ + public int getSize() throws Exception + { + return memberships.size(); + } + +} Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipDAOImpl.java 2011-08-23 09:05:53 UTC (rev 4791) +++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/MembershipDAOImpl.java 2011-08-23 09:29:51 UTC (rev 4792) @@ -19,6 +19,7 @@ package org.exoplatform.services.organization.hibernate; import org.exoplatform.commons.utils.IdentifierUtil; +import org.exoplatform.commons.utils.ListAccess; import org.exoplatform.commons.utils.ListenerStack; import org.exoplatform.services.database.HibernateService; import org.exoplatform.services.organization.Group; @@ -30,6 +31,7 @@ import org.exoplatform.services.organization.OrganizationService; import org.exoplatform.services.organization.User; import org.exoplatform.services.organization.impl.MembershipImpl; +import org.exoplatform.services.organization.impl.mock.SimpleMembershipListAccess; import org.hibernate.Session; import java.util.Collection; @@ -298,6 +300,14 @@ /** * {@inheritDoc} */ + public ListAccess<Membership> findAllMembershipsByGroup(Group group) throws Exception + { + return new SimpleMembershipListAccess(findMembershipsByGroup(group)); + } + + /** + * {@inheritDoc} + */ public Collection findMembershipsByGroupId(String groupId) throws Exception { Session session = service_.openSession(); Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipDAOImpl.java 2011-08-23 09:05:53 UTC (rev 4791) +++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/jdbc/MembershipDAOImpl.java 2011-08-23 09:29:51 UTC (rev 4792) @@ -19,6 +19,7 @@ package org.exoplatform.services.organization.jdbc; import org.exoplatform.commons.utils.IdentifierUtil; +import org.exoplatform.commons.utils.ListAccess; import org.exoplatform.services.database.DBObjectMapper; import org.exoplatform.services.database.DBObjectQuery; import org.exoplatform.services.database.DBPageList; @@ -34,6 +35,7 @@ import org.exoplatform.services.organization.MembershipType; import org.exoplatform.services.organization.OrganizationService; import org.exoplatform.services.organization.User; +import org.exoplatform.services.organization.impl.mock.SimpleMembershipListAccess; import java.sql.Connection; import java.util.ArrayList; @@ -170,7 +172,6 @@ */ public Collection findMembershipsByGroup(Group group) throws Exception { - if (group == null) return null; List<MembershipImpl> list = new ArrayList<MembershipImpl>(); @@ -183,6 +184,14 @@ /** * {@inheritDoc} */ + public ListAccess<Membership> findAllMembershipsByGroup(Group group) throws Exception + { + return new SimpleMembershipListAccess(findMembershipsByGroup(group)); + } + + /** + * {@inheritDoc} + */ public Collection findMembershipsByUser(String userName) throws Exception { if (userName == null) Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java 2011-08-23 09:05:53 UTC (rev 4791) +++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/MembershipDAOImpl.java 2011-08-23 09:29:51 UTC (rev 4792) @@ -18,6 +18,7 @@ */ package org.exoplatform.services.organization.ldap; +import org.exoplatform.commons.utils.ListAccess; import org.exoplatform.services.ldap.LDAPService; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -30,6 +31,7 @@ import org.exoplatform.services.organization.OrganizationService; import org.exoplatform.services.organization.User; import org.exoplatform.services.organization.impl.MembershipImpl; +import org.exoplatform.services.organization.impl.mock.SimpleMembershipListAccess; import org.exoplatform.services.organization.ldap.CacheHandler.CacheType; import java.util.ArrayList; @@ -668,6 +670,14 @@ } } + /** + * {@inheritDoc} + */ + public ListAccess<Membership> findAllMembershipsByGroup(Group group) throws Exception + { + return new SimpleMembershipListAccess(findMembershipsByGroup(group)); + } + // /**

12 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits August 2011