Author: theute Date: 2011-08-16 08:43:16 -0400 (Tue, 16 Aug 2011) New Revision: 7155 Modified: epp/portal/branches/EPP_5_2_Branch/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml epp/portal/branches/EPP_5_2_Branch/pom.xml epp/portal/branches/EPP_5_2_Branch/webui/portlet/src/main/java/org/exoplatform/webui/core/UIPortletApplication.java Log: JBEPP-1076 Upgrade eXo JCR to 1.14.0-CR2 (and dependencies) Modified: epp/portal/branches/EPP_5_2_Branch/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml 2011-08-16 12:36:32 UTC (rev 7154) +++ epp/portal/branches/EPP_5_2_Branch/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml 2011-08-16 12:43:16 UTC (rev 7155) @@ -33,6 +33,11 @@ </component> <component> + <key>org.exoplatform.services.jdbc.DataSourceProvider</key> + <type>org.exoplatform.services.jdbc.impl.DataSourceProviderImpl</type> + </component> + + <component> <key>org.exoplatform.services.document.DocumentReaderService</key> <type>org.exoplatform.services.document.impl.DocumentReaderServiceImpl</type> <component-plugins> Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-16 12:36:32 UTC (rev 7154) +++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-08-16 12:43:16 UTC (rev 7155) @@ -37,10 +37,10 @@ <name>EPP GateIn - Portal - ${project.version}</name> <properties> - <org.exoplatform.kernel.version>2.3.0-CR2</org.exoplatform.kernel.version> - <org.exoplatform.core.version>2.4.0-CR2</org.exoplatform.core.version> - <org.exoplatform.ws.version>2.2.0-CR2</org.exoplatform.ws.version> - <org.exoplatform.jcr.version>1.14.0-CR2</org.exoplatform.jcr.version> + <org.exoplatform.kernel.version>2.3.0-CR4-CP01</org.exoplatform.kernel.version> + <org.exoplatform.core.version>2.4.0-CR4</org.exoplatform.core.version> + <org.exoplatform.ws.version>2.2.0-CR4</org.exoplatform.ws.version> + <org.exoplatform.jcr.version>1.14.0-CR4-CP01</org.exoplatform.jcr.version> <org.jibx.version>1.2.1</org.jibx.version> <org.shindig.version>1.0-r790473-Patch06</org.shindig.version> <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> Modified: epp/portal/branches/EPP_5_2_Branch/webui/portlet/src/main/java/org/exoplatform/webui/core/UIPortletApplication.java =================================================================== --- epp/portal/branches/EPP_5_2_Branch/webui/portlet/src/main/java/org/exoplatform/webui/core/UIPortletApplication.java 2011-08-16 12:36:32 UTC (rev 7154) +++ epp/portal/branches/EPP_5_2_Branch/webui/portlet/src/main/java/org/exoplatform/webui/core/UIPortletApplication.java 2011-08-16 12:43:16 UTC (rev 7155) @@ -26,7 +26,6 @@ import javax.portlet.ResourceRequest; import javax.portlet.ResourceResponse; import javax.portlet.WindowState; -import javax.resource.spi.IllegalStateException; import org.apache.commons.collections.map.HashedMap; import org.exoplatform.commons.serialization.api.annotations.Serialized; @@ -160,4 +159,4 @@ throw new IllegalStateException("serveSource can only be called in portlet context"); } } -} \ No newline at end of file +}