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/11 17:30:33 UTC
svn commit: r413463 - in /myfaces: maven/trunk/ tomahawk/trunk/sandbox/core/
tomahawk/trunk/sandbox/examples/
tomahawk/trunk/sandbox/examples/src/main/resources/org/apache/myfaces/examples/resource/
tomahawk/trunk/sandbox/examples/src/main/webapp/
Author: baranda
Date: Sun Jun 11 08:30:33 2006
New Revision: 413463
URL: http://svn.apache.org/viewvc?rev=413463&view=rev
Log:
Updated sandbox examples build to be able to build the war file with MyFaces or JSF-RI. Adapted the nightly build script so the sources bundle for the sandbox always contains myfaces. Updated sandbox core pom to use the 1.1.4-SNAPSHOTS.
In the examples sandbox home page, the information about the build and the implementation used is shown.
Added:
myfaces/tomahawk/trunk/sandbox/examples/src/main/resources/org/apache/myfaces/examples/resource/build.properties (with props)
Modified:
myfaces/maven/trunk/build-world.sh
myfaces/tomahawk/trunk/sandbox/core/pom.xml
myfaces/tomahawk/trunk/sandbox/examples/pom.xml
myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/home.jsp
Modified: myfaces/maven/trunk/build-world.sh
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/build-world.sh?rev=413463&r1=413462&r2=413463&view=diff
==============================================================================
--- myfaces/maven/trunk/build-world.sh (original)
+++ myfaces/maven/trunk/build-world.sh Sun Jun 11 08:30:33 2006
@@ -79,7 +79,7 @@
mvn clean assembly:assembly org.apache.myfaces.maven:wagon-maven-plugin:deploy
cd ../..
cd sandbox
-mvn -Pgenerate-assembly clean install
+mvn -Pgenerate-assembly,myfaces clean install
cd assembly
mvn clean assembly:assembly org.apache.myfaces.maven:wagon-maven-plugin:deploy
cd ../../..
Modified: myfaces/tomahawk/trunk/sandbox/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/pom.xml?rev=413463&r1=413462&r2=413463&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/core/pom.xml Sun Jun 11 08:30:33 2006
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -90,23 +90,23 @@
<version>2.3</version>
<scope>provided</scope>
</dependency>
-
+
<!-- test dependencies -->
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4-SNAPSHOT</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.apache.struts.shale</groupId>
<artifactId>shale-test</artifactId>
<version>1.0.2</version>
- <scope>test</scope>
- </dependency>
-
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
Modified: myfaces/tomahawk/trunk/sandbox/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/pom.xml?rev=413463&r1=413462&r2=413463&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/pom.xml (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/pom.xml Sun Jun 11 08:30:33 2006
@@ -68,6 +68,127 @@
</plugins>
</build>
</profile>
+
+ <!-- By default the war examples use myfaces! :) -->
+ <profile>
+ <id>myfaces</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>1.1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>1.1.4-SNAPSHOT</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. -->
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <jsf_implementation>MyFaces</jsf_implementation>
+ </properties>
+ </profile>
+
+ <!-- To use the examples using the Sun's JSF Reference Implementation -->
+ <profile>
+ <id>jsfri</id>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.1_02</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.1_02</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.0</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <repositories>
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven 1 Repository</name>
+ <url>https://maven-repository.dev.java.net/nonav/repository</url>
+ <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 -->
+ <profile>
+ <id>jettyConfig</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty6-plugin</artifactId>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler</artifactId>
+ <version>5.5.9</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-runtime</artifactId>
+ <version>5.5.9</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>tomcat</groupId>
+ <artifactId>jasper-compiler-jdt</artifactId>
+ <version>5.5.9</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <pluginRepositories>
+ <!-- Repository to get the jetty plugin -->
+ <pluginRepository>
+ <id>mortbay-repo</id>
+ <name>mortbay-repo</name>
+ <url>http://www.mortbay.org/maven2/snapshot</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ </profile>
+
</profiles>
<dependencies>
@@ -77,31 +198,23 @@
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>1.1.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>1.1.4-SNAPSHOT</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. -->
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.1</version>
- <scope>compile</scope>
- </dependency>
</dependencies>
+
+ <build>
+ <finalName>${artifactId}</finalName>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ </build>
+
</project>
Added: myfaces/tomahawk/trunk/sandbox/examples/src/main/resources/org/apache/myfaces/examples/resource/build.properties
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/resources/org/apache/myfaces/examples/resource/build.properties?rev=413463&view=auto
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/resources/org/apache/myfaces/examples/resource/build.properties (added)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/resources/org/apache/myfaces/examples/resource/build.properties Sun Jun 11 08:30:33 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/sandbox/examples/src/main/resources/org/apache/myfaces/examples/resource/build.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tomahawk/trunk/sandbox/examples/src/main/resources/org/apache/myfaces/examples/resource/build.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/home.jsp
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/home.jsp?rev=413463&r1=413462&r2=413463&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/home.jsp (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/webapp/home.jsp Sun Jun 11 08:30:33 2006
@@ -7,7 +7,10 @@
<%@include file="inc/head.inc" %>
<body>
- <f:view>
+ <f:view>
+
+ <f:loadBundle basename="org.apache.myfaces.examples.resource.build" var="buildInfo"/>
+
<h:form>
<h:panelGrid>
@@ -15,7 +18,7 @@
<h:graphicImage id="header_logo" url="images/logo_mini.jpg" alt="" />
<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="(Version 1.1.1)"/>
+ <h:outputText style="font-size:10px;color:#FFFFFF" value=" (Sandbox Version #{buildInfo['tomahawk_version']}, using #{buildInfo ['jsf_implementation']})"/>
</f:verbatim>
</h:panelGrid>
@@ -84,8 +87,8 @@
<h:commandLink action="go_scope_shop"><f:verbatim>Scopeshop1, an extended saveState Example showing a wizard</f:verbatim></h:commandLink>
<h:outputLink value="effect.jsf" ><f:verbatim>Effect - DOJO and script.aculo.us effects</f:verbatim></h:outputLink>
<h:outputLink value="dojo/textareatestjsfonly.jsf"><f:verbatim>Integration of Dojo Toolkit</f:verbatim></h:outputLink>
- <h:outputLink value="killSession.jsf"><f:verbatim>Kill Session - refreshes state</f:verbatim></h:outputLink>
- <h:outputLink value="typedNumberConvert.jsf"><f:verbatim>automatically convert the number to the correct type</f:verbatim></h:outputLink>
+ <h:outputLink value="killSession.jsf"><f:verbatim>Kill Session - refreshes state</f:verbatim></h:outputLink>
+ <h:outputLink value="typedNumberConvert.jsf"><f:verbatim>automatically convert the number to the correct type</f:verbatim></h:outputLink>
</h:panelGrid>
<h:panelGrid style="padding-left:25px">
@@ -99,7 +102,7 @@
<h:outputLink value="conversation/index.jsf" ><f:verbatim>Conversation Tag examples</f:verbatim></h:outputLink>
</h:panelGrid>
- </h:panelGrid>
+ </h:panelGrid>
</h:form>
</f:view>