Author: awiner
Date: Fri Oct 20 09:35:33 2006
New Revision: 466194
URL: http://svn.apache.org/viewvc?view=rev&rev=466194
Log:
Merge back JSF 1.2 modifications, one step at a time. Having svn problems with
some files
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/pom.xml
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/pom.xml
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/convert/ConvertIntegerTag.java
Modified: incubator/adffaces/branches/faces-1_2-second/trinidad/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/pom.xml?view=diff&rev=466194&r1=466193&r2=466194
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/pom.xml (original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/pom.xml Fri Oct 20
09:35:33 2006
@@ -22,7 +22,7 @@
<artifactId>trinidad</artifactId>
<packaging>pom</packaging>
<name>Apache Incubator Trinidad Podling</name>
- <version>incubator-m1-SNAPSHOT</version>
+ <version>incubator-1.2-m1-SNAPSHOT</version>
<description>Apache Incubator Trinidad Podling</description>
<issueManagement>
@@ -222,7 +222,7 @@
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-faces-plugin</artifactId>
- <version>incubator-m1-SNAPSHOT</version>
+ <version>incubator-1.2-m1-SNAPSHOT</version>
<inherited>true</inherited>
</plugin>
@@ -247,8 +247,10 @@
<configuration>
<source>1.5</source>
<target>1.5</target>
+<!--
<showWarnings>true</showWarnings>
-
<compilerArgument>-Xlint:all,-serial,-fallthrough</compilerArgument>
+
<compilerArgument>-Xlint:all,-serial,-fallthrough,-deprecation</compilerArgument>
+-->
</configuration>
</plugin>
@@ -338,16 +340,16 @@
</dependency>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.1.4</version>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2-b19</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>1.1.4</version>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2-b19</version>
<scope>provided</scope>
</dependency>
@@ -356,6 +358,26 @@
<artifactId>shale-test</artifactId>
<version>1.0.3</version>
<scope>test</scope>
+ <!-- Ignore the references to myfaces and the JSP API -->
+ <!-- We could force shale to JSF RI 1.2, but it's better
+ this way - Shale isn't marking JSF 1.2 as provided,
+ so it's pulling in its own version -->
+ <exclusions>
+ <exclusion>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </exclusion>
+
+ <exclusion>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ </exclusion>
+
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -375,20 +397,20 @@
<dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-build</artifactId>
- <version>incubator-m1-SNAPSHOT</version>
+ <version>${pom.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-api</artifactId>
- <version>incubator-m1-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-api</artifactId>
- <version>incubator-m1-SNAPSHOT</version>
+ <version>${pom.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -396,7 +418,7 @@
<dependency>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad-impl</artifactId>
- <version>incubator-m1-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
@@ -408,11 +430,18 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
- <version>1.1.6</version>
+ <version>1.1.11</version>
</dependency>
<!--
@@ -466,5 +495,4 @@
</snapshotRepository>
-->
</distributionManagement>
-
</project>
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/pom.xml?view=diff&rev=466194&r1=466193&r2=466194
==============================================================================
--- incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/pom.xml
(original)
+++ incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-api/pom.xml
Fri Oct 20 09:35:33 2006
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.myfaces.trinidad</groupId>
<artifactId>trinidad</artifactId>
- <version>incubator-m1-SNAPSHOT</version>
+ <version>incubator-1.2-m1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -132,8 +132,8 @@
</dependency>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
</dependency>
<!-- "test" scope dependencies -->
@@ -146,6 +146,13 @@
<dependency>
<groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
<scope>test</scope>
</dependency>
Modified:
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/convert/ConvertIntegerTag.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/convert/ConvertIntegerTag.java?view=diff&rev=466194&r1=466193&r2=466194
==============================================================================
---
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/convert/ConvertIntegerTag.java
(original)
+++
incubator/adffaces/branches/faces-1_2-second/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/convert/ConvertIntegerTag.java
Fri Oct 20 09:35:33 2006
@@ -15,8 +15,10 @@
*/
package org.apache.myfaces.trinidadinternal.taglib.convert;
+import javax.faces.application.Application;
import javax.faces.convert.Converter;
-import javax.faces.webapp.ConverterTag;
+import javax.faces.context.FacesContext;
+import javax.faces.webapp.ConverterELTag;
import javax.servlet.jsp.JspException;
import org.apache.myfaces.trinidadinternal.convert.IntegerConverter;
@@ -25,28 +27,22 @@
* @version 2.0 (1.0) 2000/03/16 23:23:33
*/
-public class ConvertIntegerTag extends ConverterTag
+public class ConvertIntegerTag extends ConverterELTag
{
public ConvertIntegerTag()
{
}
- @Override
- public int doStartTag() throws JspException
- {
- super.setConverterId(IntegerConverter.CONVERTER_ID);
- return super.doStartTag();
- }
-
/**
*
*/
@Override
protected Converter createConverter() throws JspException
{
- IntegerConverter converter =
- (IntegerConverter)super.createConverter();
+ Application application =
FacesContext.getCurrentInstance().getApplication();
+ IntegerConverter converter = (IntegerConverter)
+ application.createConverter(IntegerConverter.CONVERTER_ID);
return converter;
}
}
