You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ba...@apache.org on 2007/05/28 17:14:55 UTC
svn commit: r542246 - in /myfaces/core/branches/jsf12: api/ build/
build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/
impl/
Author: baranda
Date: Mon May 28 08:14:54 2007
New Revision: 542246
URL: http://svn.apache.org/viewvc?view=rev&rev=542246
Log:
Fixes MYFACES-1651 (Default converters and validators not correctly registered).
This commit affects MYFACES-1648, which, instead of a build extension, uses a dependency with scope provided.
Modified:
myfaces/core/branches/jsf12/api/pom.xml
myfaces/core/branches/jsf12/build/pom.xml
myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml
myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/ComponentBase.xml
myfaces/core/branches/jsf12/impl/pom.xml
Modified: myfaces/core/branches/jsf12/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/pom.xml?view=diff&rev=542246&r1=542245&r2=542246
==============================================================================
--- myfaces/core/branches/jsf12/api/pom.xml (original)
+++ myfaces/core/branches/jsf12/api/pom.xml Mon May 28 08:14:54 2007
@@ -17,13 +17,6 @@
<url>http://svn.apache.org/repos/asf/myfaces/core/branches/jsf12/api</url>
</scm>
<build>
- <extensions>
- <extension>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-build</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </extension>
- </extensions>
<plugins>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
@@ -38,7 +31,7 @@
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-faces-plugin</artifactId>
- <version>1.2-07-apr-SNAPSHOT</version>
+ <version>1.2-07-may-SNAPSHOT</version>
<configuration>
<typePrefix>javax.faces</typePrefix>
<packageContains>javax.faces</packageContains>
@@ -159,6 +152,12 @@
</profile>
</profiles>
<dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-build</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
Modified: myfaces/core/branches/jsf12/build/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/pom.xml?view=diff&rev=542246&r1=542245&r2=542246
==============================================================================
--- myfaces/core/branches/jsf12/build/pom.xml (original)
+++ myfaces/core/branches/jsf12/build/pom.xml Mon May 28 08:14:54 2007
@@ -40,7 +40,7 @@
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-faces-plugin</artifactId>
- <version>1.2-07-apr-SNAPSHOT</version>
+ <version>1.2-07-may-SNAPSHOT</version>
<configuration>
<excludes>
<exclude>**/includes/**</exclude>
Modified: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml?view=diff&rev=542246&r1=542245&r2=542246
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml (original)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/Component.xml Mon May 28 08:14:54 2007
@@ -20,6 +20,9 @@
<component>
<component-type>javax.faces.Component</component-type>
<component-class>javax.faces.component.UIComponent</component-class>
+ <component-extension>
+ <mfp:component-class-modifier>abstract</mfp:component-class-modifier>
+ </component-extension>
<!-- id, binding, rendered-->
<xi:include href="../../includes/ui/_ComponentProperties.xml" xpointer="/faces-config/component/*"/>
Modified: myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/ComponentBase.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/ComponentBase.xml?view=diff&rev=542246&r1=542245&r2=542246
==============================================================================
--- myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/ComponentBase.xml (original)
+++ myfaces/core/branches/jsf12/build/src/main/resources/META-INF/maven-faces-plugin/components/javax/faces/ComponentBase.xml Mon May 28 08:14:54 2007
@@ -24,6 +24,7 @@
<component-extension>
<mfp:component-supertype>javax.faces.Component</mfp:component-supertype>
<mfp:tag-class>javax.faces.webapp.UIComponentELTag</mfp:tag-class>
+ <mfp:component-class-modifier>abstract</mfp:component-class-modifier>
</component-extension>
</component>
</faces-config>
Modified: myfaces/core/branches/jsf12/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/pom.xml?view=diff&rev=542246&r1=542245&r2=542246
==============================================================================
--- myfaces/core/branches/jsf12/impl/pom.xml (original)
+++ myfaces/core/branches/jsf12/impl/pom.xml Mon May 28 08:14:54 2007
@@ -17,13 +17,6 @@
<url>http://svn.apache.org/repos/asf/myfaces/core/branches/jsf12/impl</url>
</scm>
<build>
- <extensions>
- <extension>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-build</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </extension>
- </extensions>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -45,19 +38,19 @@
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-faces-plugin</artifactId>
- <version>1.2-07-apr-SNAPSHOT</version>
+ <version>1.2-07-may-SNAPSHOT</version>
<configuration>
<taglibs>
- <f>http://java.sun.com/jsf/core</f>
<h>http://java.sun.com/jsf/html</h>
</taglibs>
<targetPath>META-INF/standard-faces-config.xml</targetPath>
<packageContains>org.apache</packageContains>
+ <converterPackageContains>javax.faces</converterPackageContains>
+ <validatorPackageContains>javax.faces</validatorPackageContains>
<skipApiOrBaseClasses>false</skipApiOrBaseClasses>
<jsfVersion>1.2</jsfVersion>
<force>true</force>
<templateSourceDirectory>src/main/java-templates</templateSourceDirectory>
- <skipApiOrBaseClasses>false</skipApiOrBaseClasses>
<disableIdExpressions>true</disableIdExpressions>
</configuration>
<executions>
@@ -68,13 +61,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.12</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -233,6 +219,12 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-build</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<!-- this dependency will be packed together with the main artifact of this pom -->