Author: smcgowan(a)redhat.com Date: 2009-12-01 13:12:38 -0500 (Tue, 01 Dec 2009) New Revision: 857 Modified: trunk/core/pom.xml trunk/jbas5/pom.xml trunk/jsfunit/pom.xml trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java trunk/pom.xml Log: EMBJOPR-260 - update poms to use RichFaces 3.3.3/JSF 2 Modified: trunk/core/pom.xml =================================================================== --- trunk/core/pom.xml 2009-11-16 22:40:10 UTC (rev 856) +++ trunk/core/pom.xml 2009-12-01 18:12:38 UTC (rev 857) @@ -61,6 +61,12 @@ <groupId>${rhq.groupId}</groupId> <artifactId>rhq-core-gui</artifactId> <version>${rhq.version}</version> + <exclusions> + <exclusion> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>${rhq.groupId}</groupId> @@ -89,6 +95,10 @@ <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> </exclusion> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -166,15 +176,15 @@ <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <version>1.2_10</version> + <version>2.0.1-FCS</version> <scope>provided</scope> </dependency> <!-- Provided in 5.0 --> <dependency> - <groupId>javax.el</groupId> + <groupId>jboss.web</groupId> <artifactId>el-api</artifactId> - <version>1.0</version> + <version>2.1.5.GA</version> <scope>provided</scope> </dependency> <dependency> @@ -192,13 +202,19 @@ </dependency> <dependency> <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> + <artifactId>richfaces-impl-jsf2</artifactId> <version>${richfaces.version}</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>richfaces-ui</artifactId> <version>${richfaces.version}</version> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + </exclusions> </dependency> <!-- == 3rd Party Provided Dependencies ================ --> @@ -210,9 +226,9 @@ <!-- by JBossAS --> </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>jboss.web</groupId> <artifactId>jsp-api</artifactId> - <version>2.0</version> + <version>2.1.5.GA</version> <scope>provided</scope> <!-- by JBossAS --> </dependency> Modified: trunk/jbas5/pom.xml =================================================================== --- trunk/jbas5/pom.xml 2009-11-16 22:40:10 UTC (rev 856) +++ trunk/jbas5/pom.xml 2009-12-01 18:12:38 UTC (rev 857) @@ -22,7 +22,7 @@ <warDir>${basedir}/target/${project.build.finalName}</warDir> <warFile>${warDir}.war</warFile> <contextRoot>admin-console</contextRoot> - <product.name>JBoss EAP Admin Console</product.name> + <product.name>JBoss AS Admin Console</product.name> </properties> <dependencies> @@ -217,4 +217,4 @@ </profile> </profiles> -</project> \ No newline at end of file +</project> Modified: trunk/jsfunit/pom.xml =================================================================== --- trunk/jsfunit/pom.xml 2009-11-16 22:40:10 UTC (rev 856) +++ trunk/jsfunit/pom.xml 2009-12-01 18:12:38 UTC (rev 857) @@ -138,19 +138,19 @@ <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-api</artifactId> - <version>1.2</version> <!-- 2.0 --> + <version>2.0.1-FCS</version> <!-- 2.0 --> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-j2se</artifactId> - <version>5.0.1.GA</version> <!-- 5.1.0.GA --> + <version>5.1.0.GA</version> <!-- 5.1.0.GA --> <scope>provided</scope> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.4</version> <!-- 2.5 --> + <version>2.5</version> <!-- 2.5 --> <scope>provided</scope> </dependency> <dependency> @@ -184,7 +184,7 @@ <dependency> <groupId>org.jboss.man</groupId> <artifactId>jboss-metatype</artifactId> - <version>2.1.0.SP1</version> <!-- 2.1.1.GA --> + <version>2.1.1.GA</version> <!-- 2.1.1.GA --> <scope>provided</scope> </dependency> <dependency> Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-11-16 22:40:10 UTC (rev 856) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-12-01 18:12:38 UTC (rev 857) @@ -129,16 +129,16 @@ //public static final String NAV_EJB = "EJB Application (EJB JAR)s"; public static final String NAV_EJB2 = "EJB2 JARs"; public static final String NAV_EJB3 = "EJB3 JARs"; - //public static final String NAV_EAR = "EARs"; - public static final String NAV_EAR = AppConstantsLoaded.getLabels().get("NAV_EAR"); + public static final String NAV_EAR = "Enterprise Application (EAR)s"; + //public static final String NAV_EAR = AppConstantsLoaded.getLabels().get("NAV_EAR"); public static final String NAV_SAR = "SARs"; public static final String NAV_MC = "MC Beans"; public static final String NAV_PAR = "PARs"; - public static final String NAV_RAR = "RARs"; - //public static final String NAV_WAR = "WARs"; - public static final String NAV_WAR = AppConstantsLoaded.getLabels().get("NAV_WAR"); - public static final String NAV_EMB_WAR = "Embedded WARs"; - public static final String NAV_EMB_RAR = "Embedded RARs"; + public static final String NAV_RAR = "Resource Adapter Archive (RAR)s"; + public static final String NAV_WAR = "Web Application (WAR)s"; + //public static final String NAV_WAR = AppConstantsLoaded.getLabels().get("NAV_WAR"); + public static final String NAV_EMB_WAR = "Embedded Web Application (WAR)s"; + public static final String NAV_EMB_RAR = "Embedded Resource Adapter Archive (RAR)s"; // Non-app resource types. public static final String NAV_SBM = "Service Binding Manager"; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-16 22:40:10 UTC (rev 856) +++ trunk/pom.xml 2009-12-01 18:12:38 UTC (rev 857) @@ -65,7 +65,7 @@ <jaxb-api.version>2.1</jaxb-api.version> <jaxb-impl.version>2.1.6</jaxb-impl.version> <jopr.version>2.4.0-SNAPSHOT</jopr.version> - <richfaces.version>3.3.2.SR1</richfaces.version> + <richfaces.version>3.3.3-SNAPSHOT</richfaces.version> <rhq.version>1.4.0-SNAPSHOT</rhq.version> <seam.version>2.1.0.SP1</seam.version> <seam.embedded.version>beta3.SP3</seam.embedded.version>