[gatein-commits] gatein SVN: r6265 - in components/wsrp/trunk: admin-gui and 6 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon Apr 18 08:41:49 EDT 2011
Author: chris.laprun at jboss.com
Date: 2011-04-18 08:41:49 -0400 (Mon, 18 Apr 2011)
New Revision: 6265
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml
Log:
- GTNWSRP-222: Replaced Google collections by Guava.
- Removed now useless code from GTNWSRP-218.
- Changed version properties to be more in line with GateIn.
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2011-04-18 12:38:56 UTC (rev 6264)
+++ components/wsrp/trunk/admin-gui/pom.xml 2011-04-18 12:41:49 UTC (rev 6265)
@@ -21,7 +21,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
@@ -81,13 +82,6 @@
<version>1.1.15</version>
</dependency>
- <!-- To make JSF works on AS 6 -->
- <!--<dependency>
- <groupId>org.jboss.el</groupId>
- <artifactId>jboss-el</artifactId>
- <version>1.0_02.CR5</version>
- </dependency>-->
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Modified: components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml
===================================================================
--- components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml 2011-04-18 12:38:56 UTC (rev 6264)
+++ components/wsrp/trunk/admin-gui/src/main/webapp/WEB-INF/web.xml 2011-04-18 12:41:49 UTC (rev 6265)
@@ -43,12 +43,6 @@
<param-value>Mojarra-1.2</param-value>
</context-param>
- <!-- Tell JBoss AS 6 to use JBoss EL engine instead of default -->
- <!--<context-param>
- <param-name>com.sun.faces.expressionFactory</param-name>
- <param-value>org.jboss.el.ExpressionFactoryImpl</param-value>
- </context-param>-->
-
<!-- Facelet configuration -->
<context-param>
<param-name>facelets.DEVELOPMENT</param-name>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2011-04-18 12:38:56 UTC (rev 6264)
+++ components/wsrp/trunk/common/pom.xml 2011-04-18 12:41:49 UTC (rev 6265)
@@ -21,7 +21,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
@@ -75,8 +76,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<!-- tests -->
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2011-04-18 12:38:56 UTC (rev 6264)
+++ components/wsrp/trunk/consumer/pom.xml 2011-04-18 12:41:49 UTC (rev 6265)
@@ -21,7 +21,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
@@ -117,7 +118,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>${version.mockito}</version>
+ <version>${org.mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2011-04-18 12:38:56 UTC (rev 6264)
+++ components/wsrp/trunk/pom.xml 2011-04-18 12:41:49 UTC (rev 6265)
@@ -21,7 +21,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -46,20 +47,20 @@
</scm>
<properties>
- <version.gatein.pc>2.3.0-Beta02</version.gatein.pc>
- <version.gatein.common>2.0.4-Beta02</version.gatein.common>
- <version.gatein.wci>2.1.0-Beta01</version.gatein.wci>
+ <org.gatein.pc.version>2.3.0-Beta02</org.gatein.pc.version>
+ <org.gatein.common.version>2.0.4-Beta02</org.gatein.common.version>
+ <org.gatein.wci.version>2.1.0-Beta01</org.gatein.wci.version>
- <version.jsf>1.2_12</version.jsf>
- <version.servlet>2.5</version.servlet>
- <version.apache.commons-fileupload>1.2.1</version.apache.commons-fileupload>
- <version.javax.mail>1.4.1</version.javax.mail>
- <version.javax.xml.ws>2.1</version.javax.xml.ws>
- <version.javax.xml.soap.saaj>1.3</version.javax.xml.soap.saaj>
- <version.google-collections>1.0</version.google-collections>
- <version.chromattic>1.1.0-beta2</version.chromattic>
- <version.arquillian>1.0.0.Alpha2</version.arquillian>
- <version.mockito>1.8.5</version.mockito>
+ <jsf.version>1.2_12</jsf.version>
+ <servlet.version>2.5</servlet.version>
+ <apache.commons-fileupload.version>1.2.1</apache.commons-fileupload.version>
+ <javax.mail.version>1.4.1</javax.mail.version>
+ <javax.xml.ws.version>2.1</javax.xml.ws.version>
+ <javax.xml.soap.saaj.version>1.3</javax.xml.soap.saaj.version>
+ <org.chromattic.version>1.1.0-beta2</org.chromattic.version>
+ <org.jboss.arquillian.version>1.0.0.Alpha2</org.jboss.arquillian.version>
+ <org.mockito.version>1.8.5</org.mockito.version>
+ <com.google.guava.version>r09</com.google.guava.version>
</properties>
<dependencyManagement>
@@ -113,79 +114,78 @@
<dependency>
<groupId>org.gatein.common</groupId>
<artifactId>common-common</artifactId>
- <version>${version.gatein.common}</version>
+ <version>${org.gatein.common.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-api</artifactId>
- <version>${version.gatein.pc}</version>
+ <version>${org.gatein.pc.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-portlet</artifactId>
- <version>${version.gatein.pc}</version>
+ <version>${org.gatein.pc.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-federation</artifactId>
- <version>${version.gatein.pc}</version>
+ <version>${org.gatein.pc.version}</version>
</dependency>
<!-- external dependencies -->
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>${version.jsf}</version>
+ <version>${jsf.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>${version.servlet}</version>
+ <version>${servlet.version}</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>${version.apache.commons-fileupload}</version>
+ <version>${apache.commons-fileupload.version}</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>${version.javax.mail}</version>
+ <version>${javax.mail.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
- <version>${version.javax.xml.ws}</version>
+ <version>${javax.xml.ws.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.soap</groupId>
<artifactId>saaj-api</artifactId>
- <version>${version.javax.xml.soap.saaj}</version>
+ <version>${javax.xml.soap.saaj.version}</version>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
- <version>${version.google-collections}</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${com.google.guava.version}</version>
</dependency>
-
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.api</artifactId>
- <version>${version.chromattic}</version>
+ <version>${org.chromattic.version}</version>
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.apt</artifactId>
- <version>${version.chromattic}</version>
+ <version>${org.chromattic.version}</version>
<scope>compile</scope>
</dependency>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2011-04-18 12:38:56 UTC (rev 6264)
+++ components/wsrp/trunk/producer/pom.xml 2011-04-18 12:41:49 UTC (rev 6265)
@@ -21,7 +21,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
@@ -98,7 +99,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>${version.mockito}</version>
+ <version>${org.mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-04-18 12:38:56 UTC (rev 6264)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-04-18 12:41:49 UTC (rev 6265)
@@ -22,7 +22,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
@@ -314,7 +315,7 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat6</artifactId>
<scope>test</scope>
- <version>${version.gatein.wci}</version>
+ <version>${org.gatein.wci.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.wsrp</groupId>
@@ -326,13 +327,13 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-controller</artifactId>
<scope>test</scope>
- <version>${version.gatein.pc}</version>
+ <version>${org.gatein.pc.version}</version>
</dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-mc</artifactId>
<scope>test</scope>
- <version>${version.gatein.pc}</version>
+ <version>${org.gatein.pc.version}</version>
</dependency>
<dependency>
@@ -344,19 +345,19 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-api</artifactId>
- <version>${version.arquillian}</version>
+ <version>${org.jboss.arquillian.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-junit</artifactId>
- <version>${version.arquillian}</version>
+ <version>${org.jboss.arquillian.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-jbossas-remote-51</artifactId>
- <version>${version.arquillian}</version>
+ <version>${org.jboss.arquillian.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -429,7 +430,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.8.5</version>
+ <version>${org.mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml 2011-04-18 12:38:56 UTC (rev 6264)
+++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-producer.xml 2011-04-18 12:41:49 UTC (rev 6265)
@@ -62,7 +62,7 @@
<include>junit:junit</include>
<include>commons-fileupload:commons-fileupload</include>
- <include>com.google.collections:google-collections</include>
+ <include>com.google.guava:guava</include>
<!-- mockito and related dependencies -->
<include>org.mockito:mockito-core</include>
More information about the gatein-commits
mailing list