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 2006/06/10 23:48:09 UTC
svn commit: r413366 - in /myfaces/tomahawk/trunk/examples: pom.xml
simple/src/main/resources/org/apache/myfaces/examples/resource/build.properties
simple/src/main/webapp/home.jsp
Author: baranda
Date: Sat Jun 10 14:48:09 2006
New Revision: 413366
URL: http://svn.apache.org/viewvc?rev=413366&view=rev
Log:
The information about the version in the home page of the simple examples will be updated automatically by maven. I have also included the implementation in use (MyFaces or JSF-RI)
Added:
myfaces/tomahawk/trunk/examples/simple/src/main/resources/org/apache/myfaces/examples/resource/build.properties (with props)
Modified:
myfaces/tomahawk/trunk/examples/pom.xml
myfaces/tomahawk/trunk/examples/simple/src/main/webapp/home.jsp
Modified: myfaces/tomahawk/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/pom.xml?rev=413366&r1=413365&r2=413366&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/pom.xml (original)
+++ myfaces/tomahawk/trunk/examples/pom.xml Sat Jun 10 14:48:09 2006
@@ -58,6 +58,10 @@
<scope>runtime</scope>
</dependency>
</dependencies>
+
+ <properties>
+ <jsf_implementation>MyFaces</jsf_implementation>
+ </properties>
</profile>
<!-- To use the examples using the Sun's JSF Reference Implementation -->
@@ -92,6 +96,10 @@
<layout>legacy</layout>
</repository>
</repositories>
+
+ <properties>
+ <jsf_implementation>JSF-RI</jsf_implementation>
+ </properties>
</profile>
<!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default -->
@@ -150,7 +158,15 @@
<build>
<finalName>${artifactId}</finalName>
- <plugins>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<executions>
@@ -162,7 +178,7 @@
</execution>
</executions>
</plugin>
- </plugins>
+ </plugins>
</build>
</project>
Added: myfaces/tomahawk/trunk/examples/simple/src/main/resources/org/apache/myfaces/examples/resource/build.properties
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/main/resources/org/apache/myfaces/examples/resource/build.properties?rev=413366&view=auto
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/resources/org/apache/myfaces/examples/resource/build.properties (added)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/resources/org/apache/myfaces/examples/resource/build.properties Sat Jun 10 14:48:09 2006
@@ -0,0 +1,4 @@
+# Do not edit this file, as it will be completed automatically
+# by maven during the build process
+tomahawk_version=${pom.version}
+jsf_implementation=${jsf_implementation}
Propchange: myfaces/tomahawk/trunk/examples/simple/src/main/resources/org/apache/myfaces/examples/resource/build.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tomahawk/trunk/examples/simple/src/main/resources/org/apache/myfaces/examples/resource/build.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tomahawk/trunk/examples/simple/src/main/webapp/home.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/examples/simple/src/main/webapp/home.jsp?rev=413366&r1=413365&r2=413366&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/examples/simple/src/main/webapp/home.jsp (original)
+++ myfaces/tomahawk/trunk/examples/simple/src/main/webapp/home.jsp Sat Jun 10 14:48:09 2006
@@ -12,12 +12,13 @@
<h:form>
<f:loadBundle basename="org.apache.myfaces.examples.resource.example_messages" var="example_messages"/>
+ <f:loadBundle basename="org.apache.myfaces.examples.resource.build" var="buildInfo"/>
<h:panelGrid id="header_group1" columns="2" styleClass="pageHeader" >
<t:graphicImage id="header_logo" url="images/logo_mini.jpg" alt="#{example_messages['alt_logo']}" />
<f:verbatim>
<h:outputText style="font-size:20px;color:#FFFFFF" escape="false" value="MyFaces - The free JavaServer™ Faces Implementation"/>
- <h:outputText style="font-size:10px;color:#FFFFFF" value="(Tomahawk Version 1.1.4-SNAPSHOT)"/>
+ <h:outputText style="font-size:10px;color:#FFFFFF" value=" (Tomahawk Version #{buildInfo['tomahawk_version']}, using #{buildInfo ['jsf_implementation']})"/>
</f:verbatim>
</h:panelGrid>