[gatein-commits] gatein SVN: r6371 - in portal/trunk: component/portal and 7 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Apr 27 12:15:01 EDT 2011
Author: julien_viet
Date: 2011-04-27 12:15:01 -0400 (Wed, 27 Apr 2011)
New Revision: 6371
Removed:
portal/trunk/packaging/dependencies/
Modified:
portal/trunk/component/portal/pom.xml
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java
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/pom.xml
portal/trunk/packaging/tomcat/pkg/pom.xml
portal/trunk/pom.xml
portal/trunk/webui/framework/pom.xml
Log:
GTNPORTAL-1882 : Externalize dependencies in the gatein-dep pom
Modified: portal/trunk/component/portal/pom.xml
===================================================================
--- portal/trunk/component/portal/pom.xml 2011-04-27 15:57:37 UTC (rev 6370)
+++ portal/trunk/component/portal/pom.xml 2011-04-27 16:15:01 UTC (rev 6371)
@@ -120,7 +120,6 @@
<plugin>
<groupId>org.jibx</groupId>
<artifactId>maven-jibx-plugin</artifactId>
- <version>${org.jibx.version}</version>
<configuration>
<directory>src/main/resources</directory>
<includes>
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2011-04-27 15:57:37 UTC (rev 6370)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/POMSession.java 2011-04-27 16:15:01 UTC (rev 6371)
@@ -41,6 +41,7 @@
import org.gatein.mop.core.api.workspace.PageImpl;
import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import java.io.Serializable;
import java.lang.reflect.Field;
import java.util.HashMap;
@@ -159,7 +160,9 @@
}
try
{
- modified = getSession().getJCRSession().hasPendingChanges();
+ ChromatticSession session = getSession();
+ Session jcrSession = session.getJCRSession();
+ modified = jcrSession.hasPendingChanges();
}
catch (RepositoryException e)
{
Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-04-27 15:57:37 UTC (rev 6370)
+++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-04-27 16:15:01 UTC (rev 6371)
@@ -646,12 +646,10 @@
<dependency>
<groupId>org.jibx</groupId>
<artifactId>jibx-bind</artifactId>
- <version>${org.jibx.version}</version>
</dependency>
<dependency>
<groupId>org.jibx</groupId>
<artifactId>jibx-run</artifactId>
- <version>${org.jibx.version}</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-04-27 15:57:37 UTC (rev 6370)
+++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-04-27 16:15:01 UTC (rev 6371)
@@ -637,12 +637,10 @@
<dependency>
<groupId>org.jibx</groupId>
<artifactId>jibx-bind</artifactId>
- <version>${org.jibx.version}</version>
</dependency>
<dependency>
<groupId>org.jibx</groupId>
<artifactId>jibx-run</artifactId>
- <version>${org.jibx.version}</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
Modified: portal/trunk/packaging/jetty/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jetty/pkg/pom.xml 2011-04-27 15:57:37 UTC (rev 6370)
+++ portal/trunk/packaging/jetty/pkg/pom.xml 2011-04-27 16:15:01 UTC (rev 6371)
@@ -18,18 +18,6 @@
<jetty.dir>${exo.projects.directory.dependencies}/${exo.projects.app.jetty.version}</jetty.dir>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.packaging.dependencies</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<!-- Logging -->
Modified: portal/trunk/packaging/pom.xml
===================================================================
--- portal/trunk/packaging/pom.xml 2011-04-27 15:57:37 UTC (rev 6370)
+++ portal/trunk/packaging/pom.xml 2011-04-27 16:15:01 UTC (rev 6371)
@@ -41,7 +41,6 @@
<profile>
<id>pkg-all</id>
<modules>
- <module>dependencies</module>
<module>tomcat</module>
<module>jetty</module>
<module>jboss-as5</module>
@@ -51,21 +50,18 @@
<profile>
<id>pkg-tomcat</id>
<modules>
- <module>dependencies</module>
<module>tomcat</module>
</modules>
</profile>
<profile>
<id>pkg-tomcat7</id>
<modules>
- <module>dependencies</module>
<module>tomcat</module>
</modules>
</profile>
<profile>
<id>pkg-jetty</id>
<modules>
- <module>dependencies</module>
<module>jetty</module>
</modules>
</profile>
Modified: portal/trunk/packaging/tomcat/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/tomcat/pkg/pom.xml 2011-04-27 15:57:37 UTC (rev 6370)
+++ portal/trunk/packaging/tomcat/pkg/pom.xml 2011-04-27 16:15:01 UTC (rev 6371)
@@ -14,18 +14,6 @@
<packaging>pom</packaging>
<name>GateIn for Tomcat packaging</name>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.packaging.dependencies</artifactId>
- <version>3.2.0-Beta01-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<!-- Logging -->
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-04-27 15:57:37 UTC (rev 6370)
+++ portal/trunk/pom.xml 2011-04-27 16:15:01 UTC (rev 6371)
@@ -42,7 +42,6 @@
<org.exoplatform.core.version>2.4.0-CR1</org.exoplatform.core.version>
<org.exoplatform.ws.version>2.2.0-CR1</org.exoplatform.ws.version>
<org.exoplatform.jcr.version>1.14.0-CR1</org.exoplatform.jcr.version>
- <org.jibx.version>1.2.2</org.jibx.version>
<org.shindig.version>1.0-r790473-Patch05</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.4-Beta02</org.gatein.common.version>
@@ -51,10 +50,6 @@
<org.picketlink.idm>1.1.9.CR01</org.picketlink.idm>
<org.gatein.wsrp.version>2.1.0-Beta03</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.0-Beta01</org.gatein.mop.version>
- <org.slf4j.version>1.5.8</org.slf4j.version>
- <rhino.version>1.6R5</rhino.version>
- <org.codehaus.groovy.version>1.7.6</org.codehaus.groovy.version>
- <javax.servlet.version>2.5</javax.servlet.version>
<version.chromattic>1.1.0-beta2</version.chromattic>
<version.reflext>1.1.0-beta12</version.reflext>
<jcip.version>1.0</jcip.version>
@@ -94,7 +89,7 @@
<dependency>
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.0.3-Beta01</version>
+ <version>1.1.0-Beta01</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -691,202 +686,6 @@
</dependency>
<dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-tomcat</artifactId>
- <version>5.1.0.GA</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.8.3</version>
- </dependency>
- <dependency>
- <groupId>commons-chain</groupId>
- <artifactId>commons-chain</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.5.5</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
- <exclusions>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.3.2</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.1</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.0</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
- <dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.7</version>
- </dependency>
-
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20070829</version>
- </dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>2.0.0</version>
- </dependency>
- <dependency>
- <groupId>javax.resource</groupId>
- <artifactId>connector-api</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${javax.servlet.version}</version>
- </dependency>
- <dependency>
- <groupId>rhino</groupId>
- <artifactId>js</artifactId>
- <version>${rhino.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>${org.codehaus.groovy.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
-
- <dependency>
- <groupId>caja</groupId>
- <artifactId>caja</artifactId>
- <version>r3375</version>
- </dependency>
- <dependency>
- <groupId>caja</groupId>
- <artifactId>json_simple</artifactId>
- <version>r1</version>
- </dependency>
- <dependency>
- <groupId>net.oauth</groupId>
- <artifactId>core</artifactId>
- <version>20080621</version>
- </dependency>
- <dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>1.0-rc2</version>
- </dependency>
- <dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-jmx</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>rome</groupId>
- <artifactId>rome</artifactId>
- <version>0.9</version>
- </dependency>
- <dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>3.8</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.nekohtml</groupId>
- <artifactId>nekohtml</artifactId>
- <version>1.9.9</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>nu.validator.htmlparser</groupId>
- <artifactId>htmlparser</artifactId>
- <version>1.0.7</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
-
- <dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
<version>${org.shindig.version}</version>
@@ -928,6 +727,7 @@
<artifactId>simplecaptcha</artifactId>
<version>${nl.captcha.simplecaptcha.version}</version>
</dependency>
+
<!-- needed for the IBM jdk, should be remove in the future when IBM fixes its jdk (see GTNPORTAL-636) -->
<dependency>
<groupId>net.jcip</groupId>
@@ -1019,6 +819,11 @@
<maxmem>1024m</maxmem>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.jibx</groupId>
+ <artifactId>maven-jibx-plugin</artifactId>
+ <version>1.2.2</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
Modified: portal/trunk/webui/framework/pom.xml
===================================================================
--- portal/trunk/webui/framework/pom.xml 2011-04-27 15:57:37 UTC (rev 6370)
+++ portal/trunk/webui/framework/pom.xml 2011-04-27 16:15:01 UTC (rev 6371)
@@ -51,7 +51,6 @@
<plugin>
<groupId>org.jibx</groupId>
<artifactId>maven-jibx-plugin</artifactId>
- <version>${org.jibx.version}</version>
<configuration>
<directory>src/main/resources</directory>
<includes>
More information about the gatein-commits
mailing list