myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bom...@apache.org
Subject svn commit: r600273 - in /myfaces/commons/trunk/myfaces-commons-validators: pom.xml src/main/conf/ src/main/maven-faces-plugin/validators/commons/Email.xml
Date Sun, 02 Dec 2007 11:23:36 GMT
Author: bommel
Date: Sun Dec  2 03:23:32 2007
New Revision: 600273

URL: http://svn.apache.org/viewvc?rev=600273&view=rev
Log:
next steps

Removed:
    myfaces/commons/trunk/myfaces-commons-validators/src/main/conf/
Modified:
    myfaces/commons/trunk/myfaces-commons-validators/pom.xml
    myfaces/commons/trunk/myfaces-commons-validators/src/main/maven-faces-plugin/validators/commons/Email.xml

Modified: myfaces/commons/trunk/myfaces-commons-validators/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/pom.xml?rev=600273&r1=600272&r2=600273&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/pom.xml (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/pom.xml Sun Dec  2 03:23:32 2007
@@ -29,6 +29,15 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <inherited>true</inherited>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+      <plugin>
         <groupId>org.apache.myfaces.trinidadbuild</groupId>
         <artifactId>maven-faces-plugin</artifactId>
         <version>1.2.6-SNAPSHOT</version>
@@ -39,12 +48,11 @@
           <packageContains>org.apache</packageContains>
           <converterPackageContains>org.apache</converterPackageContains>
           <validatorPackageContains>org.apache</validatorPackageContains>
-          <!--faceletHandlerClass>org.apache.myfaces.trinidadinternal.facelets.TrinidadComponentHandler</faceletHandlerClass-->
           <typePrefix>org.apache</typePrefix>
           <packageContains>org.apache</packageContains>
           <removeRenderers>true</removeRenderers>
           <force>true</force>
-
+          <jsfVersion>1.1</jsfVersion>
         </configuration>
         <executions>
           <execution>
@@ -62,10 +70,11 @@
             <id>generate-faces-config</id>
             <goals>
               <goal>generate-faces-config</goal>
-              <!--goal>generate-jsp-taglibs</goal>
-              <goal>generate-facelets-taglibs</goal-->
+              <goal>generate-jsp-taglibs</goal>
+              <goal>generate-facelets-taglibs</goal>
             </goals>
             <configuration>
+              <localResource>${project.build.directory}/maven-faces-plugin/main/resources/META-INF/maven-faces-plugin/faces-config.xml</localResource>
               <targetPath>META-INF/faces-config.xml</targetPath>
             </configuration>
           </execution>
@@ -78,7 +87,7 @@
             <phase>validate</phase>
             <configuration>
               <tasks>
-                <copy todir="${project.build.directory}/classes/META-INF/maven-faces-plugin/">
+                <copy todir="${project.build.directory}/maven-faces-plugin/main/resources/META-INF/maven-faces-plugin//">
                   <fileset dir="${basedir}/src/main/maven-faces-plugin/"/>
                 </copy>
               </tasks>

Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/maven-faces-plugin/validators/commons/Email.xml
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/maven-faces-plugin/validators/commons/Email.xml?rev=600273&r1=600272&r2=600273&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/maven-faces-plugin/validators/commons/Email.xml
(original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/maven-faces-plugin/validators/commons/Email.xml
Sun Dec  2 03:23:32 2007
@@ -18,7 +18,7 @@
     under the License.
 	   
 --><faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
-              xmlns:tr="http://myfaces.apache.org/trinidad"
+              xmlns:mcv="http://myfaces.apache.org/commons/validators"
               xmlns:mfp="http://myfaces.apache.org/maven-faces-plugin">
   <validator>
     <description><![CDATA[Validate that the string entered is an email.]]></description>



Mime
View raw message