You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/11/22 05:19:49 UTC
svn commit: r719805 - in
/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources:
core/ core/src/main/tld/
core/src/test/java/org/myorganization/component/sayhello/
core/src/test/java/...
Author: lu4242
Date: Fri Nov 21 20:19:48 2008
New Revision: 719805
URL: http://svn.apache.org/viewvc?rev=719805&view=rev
Log:
update archetype to latest myfaces versions and correct profiles for assembly and site
Removed:
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/main/tld/
Modified:
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/pom.xml
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/converter/PhoneNumberConverterTest.java
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/validator/OddNumberValidatorTest.java
myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/pom.xml?rev=719805&r1=719804&r2=719805&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/pom.xml Fri Nov 21 20:19:48 2008
@@ -23,11 +23,10 @@
<dependencies>
<!-- compile -->
-
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>1.1.1</version>
<scope>compile</scope>
</dependency>
@@ -50,7 +49,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.2.4</version>
+ <version>1.2.5</version>
<scope>provided</scope>
</dependency>
@@ -78,20 +77,28 @@
</dependency>
<dependency>
- <groupId>org.apache.struts.shale</groupId>
+ <groupId>org.apache.shale</groupId>
<artifactId>shale-test</artifactId>
- <version>1.0.2</version>
+ <version>1.0.5</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>**/*.vm</exclude>
+ </excludes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.myfaces.buildtools</groupId>
<artifactId>myfaces-builder-plugin</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2</version>
<executions>
<execution>
<goals>
@@ -100,6 +107,7 @@
<goal>make-tags</goal>
<goal>make-validators</goal>
<goal>make-converter-tags</goal>
+ <goal>make-validator-tags</goal>
</goals>
<configuration>
<jsfVersion>1.2</jsfVersion>
@@ -117,7 +125,7 @@
<execution>
<id>maketld</id>
<configuration>
- <xmlFile>META-INF/mycomponents.tld</xmlFile>
+ <xmlFile>META-INF/${shortname}.tld</xmlFile>
<templateFile>mycomponents.tld.vm</templateFile>
<params>
<shortname>${shortname}</shortname>
@@ -130,23 +138,6 @@
<goal>make-config</goal>
</goals>
</execution>
- <execution>
- <id>makevalidatortags</id>
- <configuration>
- <xmlFile>META-INF/mycomponents.tld</xmlFile>
- <templateFile>mycomponents.tld.vm</templateFile>
- <params>
- <shortname>${shortname}</shortname>
- <uri>http://www.myorganitzation.org/${shortname}</uri>
- <displayname>Custom tag library.</displayname>
- <description>Enhanced standard JSP actions and custom MyFaces actions.</description>
- </params>
- <jsfVersion>1.2</jsfVersion>
- </configuration>
- <goals>
- <goal>make-validator-tags</goal>
- </goals>
- </execution>
</executions>
</plugin>
</plugins>
@@ -154,102 +145,37 @@
<reporting>
<plugins>
-
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>changelog-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- <reportSets>
- <reportSet>
- <id>dual-report</id>
- <configuration>
- <type>range</type>
- <range>30</range>
- </configuration>
- <reports>
- <report>changelog</report>
- <report>file-activity</report>
- <report>dev-activity</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.0-beta-3</version>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
+ <version>2.4</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- <configuration>
- <tags>TODO, FIXME, XXX, @deprecated</tags>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.1</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>surefire-report-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.4.3</version>
</plugin>
-
</plugins>
</reporting>
<profiles>
<profile>
<id>generate-site</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xslt-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>generate-tld-for-tlddoc</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <configuration>
- <xslFile>src/main/tld/misc/resolve_entities-tlddoc.xsl</xslFile>
- <srcIncludes>**/*.tld</srcIncludes>
- <srcDir>src/main/tld</srcDir>
- <destDir>target/tlddoc-site</destDir>
- </configuration>
- </execution>
- <execution>
- <id>generate-tld-for-jar</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <configuration>
- <xslFile>src/main/tld/misc/resolve_entities.xsl</xslFile>
- <srcIncludes>**/*.tld</srcIncludes>
- <srcDir>src/main/tld</srcDir>
- <destDir>target/classes/META-INF</destDir>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </build>
<reporting>
<plugins>
<plugin>
<groupId>net.sourceforge.maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
+ <version>2.3.1</version>
<configuration>
- <taglib.src.dir>${basedir}/target/tlddoc-site</taglib.src.dir>
- <tldDocDir>${basedir}/target/site/tlddoc</tldDocDir>
+ <taglib.src.dir>\${basedir}/target/classes/META-INF</taglib.src.dir>
+ <tldDocDir>\${basedir}/target/site/tlddoc</tldDocDir>
</configuration>
</plugin>
</plugins>
@@ -266,39 +192,9 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xslt-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>generate-tld-for-tlddoc</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <configuration>
- <xslFile>src/main/tld/misc/resolve_entities-tlddoc.xsl</xslFile>
- <srcIncludes>**/*.tld</srcIncludes>
- <srcDir>src/main/tld</srcDir>
- <destDir>target/tlddoc-site</destDir>
- </configuration>
- </execution>
- <execution>
- <id>generate-tld-for-jar</id>
- <goals>
- <goal>transform</goal>
- </goals>
- <configuration>
- <xslFile>src/main/tld/misc/resolve_entities.xsl</xslFile>
- <srcIncludes>**/*.tld</srcIncludes>
- <srcDir>src/main/tld</srcDir>
- <destDir>target/classes/META-INF</destDir>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.4</version>
<executions>
<execution>
<id>attach-javadoc</id>
@@ -309,9 +205,10 @@
<plugin>
<groupId>net.sourceforge.maven-taglib</groupId>
<artifactId>maven-taglib-plugin</artifactId>
+ <version>2.3.1</version>
<configuration>
- <taglib.src.dir>${basedir}/target/tlddoc-site</taglib.src.dir>
- <tldDocDir>${basedir}/target/tlddoc</tldDocDir>
+ <taglib.src.dir>\${basedir}/target/classes/META-INF</taglib.src.dir>
+ <tldDocDir>\${basedir}/target/site/tlddoc</tldDocDir>
</configuration>
<executions>
<execution>
@@ -324,5 +221,4 @@
</build>
</profile>
</profiles>
-
</project>
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java?rev=719805&r1=719804&r2=719805&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/component/sayhello/SayHelloRendererTest.java Fri Nov 21 20:19:48 2008
@@ -27,7 +27,7 @@
super(name);
}
- public void setUp()
+ public void setUp() throws Exception
{
super.setUp();
@@ -45,14 +45,14 @@
new SayHelloRenderer());
}
- public void tearDown()
+ public void tearDown() throws Exception
{
super.tearDown();
sayHello = null;
writer = null;
}
- public void testEncodeEnd() throws IOException
+ public void testEncodeEnd() throws Exception
{
sayHello.encodeEnd(facesContext);
facesContext.renderResponse();
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/converter/PhoneNumberConverterTest.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/converter/PhoneNumberConverterTest.java?rev=719805&r1=719804&r2=719805&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/converter/PhoneNumberConverterTest.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/converter/PhoneNumberConverterTest.java Fri Nov 21 20:19:48 2008
@@ -24,7 +24,7 @@
super(name);
}
- public void setUp()
+ public void setUp() throws Exception
{
super.setUp();
@@ -33,14 +33,14 @@
facesContext.setResponseWriter(writer);
}
- public void tearDown()
+ public void tearDown() throws Exception
{
super.tearDown();
phoneNumConverter = null;
writer = null;
}
- public void testNumOnly()
+ public void testNumOnly() throws Exception
{
Object obj = phoneNumConverter.getAsObject(facesContext, new HtmlInputText(), "6373824");
assertNotNull(obj);
@@ -48,7 +48,7 @@
assertEquals(phoneNum.getNumber(), "6373824");
}
- public void testAreaCodeNum()
+ public void testAreaCodeNum() throws Exception
{
Object obj = phoneNumConverter.getAsObject(facesContext, new HtmlInputText(), "09-6373824");
assertNotNull(obj);
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/validator/OddNumberValidatorTest.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/validator/OddNumberValidatorTest.java?rev=719805&r1=719804&r2=719805&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/validator/OddNumberValidatorTest.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/core/src/test/java/org/myorganization/validator/OddNumberValidatorTest.java Fri Nov 21 20:19:48 2008
@@ -26,7 +26,7 @@
super(name);
}
- public void setUp()
+ public void setUp() throws Exception
{
super.setUp();
@@ -35,14 +35,14 @@
facesContext.setResponseWriter(writer);
}
- public void tearDown()
+ public void tearDown() throws Exception
{
super.tearDown();
oddNumValidator = null;
writer = null;
}
- public void testOddNumInput()
+ public void testOddNumInput() throws Exception
{
boolean noExceptionsThrown = true;
try
@@ -56,7 +56,7 @@
assertTrue(noExceptionsThrown);
}
- public void testEvenNumInput()
+ public void testEvenNumInput() throws Exception
{
boolean noExceptionsThrown = true;
try
Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml?rev=719805&r1=719804&r2=719805&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml Fri Nov 21 20:19:48 2008
@@ -25,11 +25,11 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
+ <version>1.1.1</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>jstl</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
<scope>runtime</scope>
@@ -59,16 +59,23 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.2.4</version>
+ <version>1.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.2.4</version>
+ <version>1.2.5</version>
<!-- Sandbox examples must only have runtime dependency to myfaces-impl
so that it will be automatically added to war. But there must not be
any compile dependency on impl so that is is always possible to use
other JSF implementations. -->
+ <exclusions>
+ <exclusion>
+ <!-- Temporal fix to avoid transitive dependency to shared -->
+ <groupId>org.apache.myfaces.shared</groupId>
+ <artifactId>myfaces-shared-impl</artifactId>
+ </exclusion>
+ </exclusions>
<scope>runtime</scope>
</dependency>
</dependencies>
@@ -91,22 +98,14 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>1.1_02</version>
+ <version>1.2_03</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>1.1_02</version>
+ <version>1.2_03</version>
<scope>runtime</scope>
</dependency>
- <!--
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.0</version>
- <scope>compile</scope>
- </dependency>
- -->
</dependencies>
<repositories>
@@ -122,7 +121,6 @@
<jsf_implementation>JSF-RI</jsf_implementation>
</properties>
</profile>
-
</profiles>
<build>
@@ -144,7 +142,5 @@
<filtering>true</filtering>
</resource>
</resources>
-
</build>
-
</project>