Author: theute Date: 2011-08-16 14:47:41 -0400 (Tue, 16 Aug 2011) New Revision: 7161 Modified: portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml portal/trunk/packaging/jboss-as5/pkg/pom.xml portal/trunk/packaging/jboss-as6/pkg/pom.xml portal/trunk/packaging/jetty/pkg/pom.xml portal/trunk/packaging/tomcat/pkg/pom.xml portal/trunk/packaging/tomcat/pkg/tc6/pom.xml portal/trunk/pom.xml portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/core/UIPortletApplication.java Log: GTNPORTAL-2027 Upgrade eXo JCR to 1.14.0-CR4-CP01 (and dependencies) Modified: portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml =================================================================== --- portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml 2011-08-16 16:15:19 UTC (rev 7160) +++ portal/trunk/component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml 2011-08-16 18:47:41 UTC (rev 7161) @@ -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: portal/trunk/packaging/jboss-as5/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-08-16 16:15:19 UTC (rev 7160) +++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-08-16 18:47:41 UTC (rev 7161) @@ -836,6 +836,11 @@ <artifactId>closure-compiler</artifactId> <version>r706</version> </dependency> + <dependency> + <groupId>eu.medsea.mimeutil</groupId> + <artifactId>mime-util</artifactId> + <version>2.1.3</version> + </dependency> <dependency> <?context LIB?> Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-08-16 16:15:19 UTC (rev 7160) +++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-08-16 18:47:41 UTC (rev 7161) @@ -827,6 +827,11 @@ <artifactId>closure-compiler</artifactId> <version>r706</version> </dependency> + <dependency> + <groupId>eu.medsea.mimeutil</groupId> + <artifactId>mime-util</artifactId> + <version>2.1.3</version> + </dependency> <dependency> <?context LIB?> Modified: portal/trunk/packaging/jetty/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jetty/pkg/pom.xml 2011-08-16 16:15:19 UTC (rev 7160) +++ portal/trunk/packaging/jetty/pkg/pom.xml 2011-08-16 18:47:41 UTC (rev 7161) @@ -757,6 +757,11 @@ <groupId>com.google.javascript</groupId> <artifactId>closure-compiler</artifactId> </dependency> + <dependency> + <groupId>eu.medsea.mimeutil</groupId> + <artifactId>mime-util</artifactId> + <version>2.1.3</version> + </dependency> <!-- War files --> <dependency> Modified: portal/trunk/packaging/tomcat/pkg/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/pom.xml 2011-08-16 16:15:19 UTC (rev 7160) +++ portal/trunk/packaging/tomcat/pkg/pom.xml 2011-08-16 18:47:41 UTC (rev 7161) @@ -755,6 +755,11 @@ <groupId>com.google.javascript</groupId> <artifactId>closure-compiler</artifactId> </dependency> + <dependency> + <groupId>eu.medsea.mimeutil</groupId> + <artifactId>mime-util</artifactId> + <version>2.1.3</version> + </dependency> <!-- War files --> <dependency> Modified: portal/trunk/packaging/tomcat/pkg/tc6/pom.xml =================================================================== --- portal/trunk/packaging/tomcat/pkg/tc6/pom.xml 2011-08-16 16:15:19 UTC (rev 7160) +++ portal/trunk/packaging/tomcat/pkg/tc6/pom.xml 2011-08-16 18:47:41 UTC (rev 7161) @@ -215,4 +215,4 @@ </profile> </profiles> -</project> \ No newline at end of file +</project> Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2011-08-16 16:15:19 UTC (rev 7160) +++ portal/trunk/pom.xml 2011-08-16 18:47:41 UTC (rev 7161) @@ -37,10 +37,10 @@ <name>GateIn - Portal</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.shindig.version>2.0.2-Beta02</org.shindig.version> <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> <org.gatein.common.version>2.0.4-Beta03</org.gatein.common.version> @@ -986,6 +986,14 @@ <updatePolicy>never</updatePolicy> </snapshots> </repository> + <repository> + <id>caja</id> + <url>http://google-caja.googlecode.com/svn/maven</url> + </repository> + <repository> + <id>oauth</id> + <url>http://oauth.googlecode.com/svn/code/maven</url> + </repository> </repositories> <pluginRepositories> <pluginRepository> Modified: portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/core/UIPortletApplication.java =================================================================== --- portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/core/UIPortletApplication.java 2011-08-16 16:15:19 UTC (rev 7160) +++ portal/trunk/webui/portlet/src/main/java/org/exoplatform/webui/core/UIPortletApplication.java 2011-08-16 18:47:41 UTC (rev 7161) @@ -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 +}