[gatein-commits] gatein SVN: r2572 - in portal/trunk: component/common/src/main/java/org/exoplatform/commons and 1 other directory.
Author: julien_viet
Date: 2010-04-09 14:27:17 -0400 (Fri, 09 Apr 2010)
New Revision: 2572
Modified:
portal/trunk/component/common/src/main/java/org/exoplatform/commons/InitialContextInitializer2.java
portal/trunk/pom.xml
Log:
GTNPORTAL-1056 : Integrate JCR 1.12.1-CR1 / MOP 1.0.1-CR01 / Chromattic 1.0.1-cr1
Modified:
portal/trunk/component/common/src/main/java/org/exoplatform/commons/InitialContextInitializer2.java
===================================================================
---
portal/trunk/component/common/src/main/java/org/exoplatform/commons/InitialContextInitializer2.java 2010-04-09
18:26:36 UTC (rev 2571)
+++
portal/trunk/component/common/src/main/java/org/exoplatform/commons/InitialContextInitializer2.java 2010-04-09
18:27:17 UTC (rev 2572)
@@ -27,6 +27,8 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import javax.xml.stream.XMLStreamException;
+import java.io.FileNotFoundException;
/**
* This code should be moved in the core, for now it is here as it is needed here.
@@ -40,7 +42,7 @@
public class InitialContextInitializer2 extends InitialContextInitializer
{
- public InitialContextInitializer2(InitParams params) throws NamingException,
ConfigurationException
+ public InitialContextInitializer2(InitParams params) throws NamingException,
ConfigurationException, FileNotFoundException, XMLStreamException
{
super(params);
}
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-04-09 18:26:36 UTC (rev 2571)
+++ portal/trunk/pom.xml 2010-04-09 18:27:17 UTC (rev 2572)
@@ -37,10 +37,10 @@
<name>GateIn - Portal</name>
<properties>
-
<org.exoplatform.kernel.version>2.2.0-GA</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.0-GA</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.0-GA</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.12.0-GA</org.exoplatform.jcr.version>
+
<org.exoplatform.kernel.version>2.2.1-CR1</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.1-CR1</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.1-CR1</org.exoplatform.ws.version>
+ <org.exoplatform.jcr.version>1.12.1-CR1</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>1.0-r790473-Patch02</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
@@ -49,12 +49,12 @@
<org.gatein.pc.version>2.1.0-GA</org.gatein.pc.version>
<org.picketlink.idm>1.1.2.CR01</org.picketlink.idm>
<org.gatein.wsrp.version>1.1.0-CR01</org.gatein.wsrp.version>
- <org.gatein.mop.version>1.0.0</org.gatein.mop.version>
+ <org.gatein.mop.version>1.0.1-CR01</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
<org.codehaus.groovy.version>1.6.5</org.codehaus.groovy.version>
<javax.servlet.version>2.5</javax.servlet.version>
- <version.chromattic>1.0.0</version.chromattic>
+ <version.chromattic>1.0.1-cr1</version.chromattic>
<version.reflect>1.0.0</version.reflect>
<jcip.version>1.0</jcip.version>