You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@apache.org on 2005/05/30 01:23:25 UTC
svn commit: r178996 - in /struts/faces/trunk: example1-webapp/build.xml
example2-webapp/build.xml example2-webapp/src/web/loggedoff.jsp
systest1-webapp/build.xml
Author: craigmcc
Date: Sun May 29 16:23:24 2005
New Revision: 178996
URL: http://svn.apache.org/viewcvs?rev=178996&view=rev
Log:
Adapt build scripts to reflect the fact that commons-collections.jar is not
shipped with recent (i.e. 1.2.6+) versions of Struts.
Modified:
struts/faces/trunk/example1-webapp/build.xml
struts/faces/trunk/example2-webapp/build.xml
struts/faces/trunk/example2-webapp/src/web/loggedoff.jsp
struts/faces/trunk/systest1-webapp/build.xml
Modified: struts/faces/trunk/example1-webapp/build.xml
URL: http://svn.apache.org/viewcvs/struts/faces/trunk/example1-webapp/build.xml?rev=178996&r1=178995&r2=178996&view=diff
==============================================================================
--- struts/faces/trunk/example1-webapp/build.xml (original)
+++ struts/faces/trunk/example1-webapp/build.xml Sun May 29 16:23:24 2005
@@ -66,6 +66,8 @@
<!-- Conditional Processing Flags -->
+ <available property="collections.present"
+ file="${commons-collections.jar}"/>
<available property="jsfri.present"
classname="com.sun.faces.RIConstants"
classpath="${jsf-impl.jar}"/>
@@ -160,7 +162,16 @@
</target>
- <target name="static" depends="prepare">
+ <target name="static-collections" depends="prepare"
+ if="collections.present">
+
+ <copy todir="${build.home}/${context.path}/WEB-INF/lib"
+ file="${commons-collections.jar}"/>
+
+ </target>
+
+
+ <target name="static" depends="static-collections">
<!-- Copy static web resources -->
<copy todir="${build.home}/${context.path}"
@@ -180,8 +191,6 @@
file="${struts-faces.jar}"/>
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
file="${commons-beanutils.jar}"/>
- <copy todir="${build.home}/${context.path}/WEB-INF/lib"
- file="${commons-collections.jar}"/>
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
file="${commons-digester.jar}"/>
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
Modified: struts/faces/trunk/example2-webapp/build.xml
URL: http://svn.apache.org/viewcvs/struts/faces/trunk/example2-webapp/build.xml?rev=178996&r1=178995&r2=178996&view=diff
==============================================================================
--- struts/faces/trunk/example2-webapp/build.xml (original)
+++ struts/faces/trunk/example2-webapp/build.xml Sun May 29 16:23:24 2005
@@ -141,6 +141,7 @@
<echo message="build.standalone = ${build.standalone}"/>
<echo message="jsf-api.jar = ${jsf-api.jar}"/>
<echo message="jsf-impl.jar = ${jsf-impl.jar}"/>
+ <echo message="struts.home = ${struts.home}"/>
<echo message="struts.jar = ${struts.jar}"/>
<echo message="struts-faces.jar = ${struts-faces.jar}"/>
<echo message="jsfri.present = ${jsfri.present}"/>
@@ -178,22 +179,10 @@
<mkdir dir="${build.home}/${context.path}/WEB-INF/lib"/>
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
file="${struts-faces.jar}"/>
- <copy todir="${build.home}/${context.path}/WEB-INF/lib"
- file="${commons-beanutils.jar}"/>
- <copy todir="${build.home}/${context.path}/WEB-INF/lib"
- file="${commons-collections.jar}"/>
- <copy todir="${build.home}/${context.path}/WEB-INF/lib"
- file="${commons-digester.jar}"/>
- <copy todir="${build.home}/${context.path}/WEB-INF/lib"
- file="${commons-fileupload.jar}"/>
- <copy todir="${build.home}/${context.path}/WEB-INF/lib"
- file="${commons-logging.jar}"/>
- <copy todir="${build.home}/${context.path}/WEB-INF/lib"
- file="${commons-validator.jar}"/>
- <copy todir="${build.home}/${context.path}/WEB-INF/lib"
- file="${jakarta-oro.jar}"/>
- <copy todir="${build.home}/${context.path}/WEB-INF/lib"
- file="${struts.jar}"/>
+ <copy todir="${build.home}/${context.path}/WEB-INF/lib">
+ <fileset dir="${struts.home}/lib"
+ includes="*.jar"/>
+ </copy>
</target>
Modified: struts/faces/trunk/example2-webapp/src/web/loggedoff.jsp
URL: http://svn.apache.org/viewcvs/struts/faces/trunk/example2-webapp/src/web/loggedoff.jsp?rev=178996&r1=178995&r2=178996&view=diff
==============================================================================
--- struts/faces/trunk/example2-webapp/src/web/loggedoff.jsp (original)
+++ struts/faces/trunk/example2-webapp/src/web/loggedoff.jsp Sun May 29 16:23:24 2005
@@ -24,6 +24,7 @@
-->
+<%--
<h:form id="loggedoff">
<h:panelGrid columns="1">
<h:commandLink id="register"
@@ -38,3 +39,25 @@
</h:commandLink>
</h:panelGrid>
</h:form>
+--%>
+
+<h:panelGrid columns="1">
+
+ <%-- FIXME - needs "?action=Create" modifier --%>
+ <s:form action="/editRegistration">
+ <h:commandLink id="register"
+ action="#{loggedOff.register}"
+ immediate="true">
+ <s:message key="loggedoff.register"/>
+ </h:commandLink>
+ </s:form>
+
+ <s:form action="/editLogon">
+ <h:commandLink id="logon"
+ action="#{loggedOff.logon}"
+ immediate="true">
+ <s:message key="loggedoff.logon"/>
+ </h:commandLink>
+ </s:form>
+
+</h:panelGrid>
Modified: struts/faces/trunk/systest1-webapp/build.xml
URL: http://svn.apache.org/viewcvs/struts/faces/trunk/systest1-webapp/build.xml?rev=178996&r1=178995&r2=178996&view=diff
==============================================================================
--- struts/faces/trunk/systest1-webapp/build.xml (original)
+++ struts/faces/trunk/systest1-webapp/build.xml Sun May 29 16:23:24 2005
@@ -66,6 +66,8 @@
<!-- Conditional Processing Flags -->
+ <available property="collections.present"
+ file="${commons-collections.jar}"/>
<available property="jsfri.present"
classname="com.sun.faces.RIConstants"
classpath="${jsf-impl.jar}"/>
@@ -160,7 +162,16 @@
</target>
- <target name="static" depends="prepare">
+ <target name="static-collections" depends="prepare"
+ if="collections.present">
+
+ <copy todir="${build.home}/${context.path}/WEB-INF/lib"
+ file="${commons-collections.jar}"/>
+
+ </target>
+
+
+ <target name="static" depends="static-collections">
<!-- Copy static web resources -->
<copy todir="${build.home}/${context.path}"
@@ -180,8 +191,6 @@
file="${struts-faces.jar}"/>
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
file="${commons-beanutils.jar}"/>
- <copy todir="${build.home}/${context.path}/WEB-INF/lib"
- file="${commons-collections.jar}"/>
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
file="${commons-digester.jar}"/>
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org