Author: craigmcc
Date: Sat Apr 9 11:54:36 2005
New Revision: 160706
URL: http://svn.apache.org/viewcvs?view=rev&rev=160706
Log:
Update the Spring Framework dependency to 1.2-RC1 (since that is what is
required by the preview of Spring Web Flow). Ensure that everything
still works before commencing experiments with SWF.
Modified:
struts/shale/trunk/core-library/build.xml
struts/shale/trunk/use-cases/build.xml
Modified: struts/shale/trunk/core-library/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/build.xml?view=diff&r1=160705&r2=160706
==============================================================================
--- struts/shale/trunk/core-library/build.xml (original)
+++ struts/shale/trunk/core-library/build.xml Sat Apr 9 11:54:36 2005
@@ -41,7 +41,7 @@
<property name="logging.home" value="/usr/local/commons-logging-1.0.4"/>
<property name="server.home" value="/usr/local/jakarta-tomcat-5.0.28"/>
<property name="shale-test.home"
value="${basedir}/../struts-shale-test/dist"/>
- <property name="spring.home"
value="/usr/local/spring-framework-1.1.5/dist"/>
+ <property name="spring.home"
value="/usr/local/spring-framework-1.2-rc1"/>
<!-- Dependency library defaults -->
<property name="commons-beanutils.jar"
@@ -66,10 +66,12 @@
<property name="junit.jar" value="${junit.home}/junit.jar"/>
<property name="servlet-api.jar"
value="${server.home}/common/lib/servlet-api.jar"/>
<property name="shale-test.jar"
value="${shale-test.home}/lib/shale-test.jar"/>
+ <property name="spring-beans.jar"
value="${spring.home}/dist/spring-beans.jar"/>
<property name="spring-context.jar"
- value="${spring.home}/spring-context.jar"/>
- <property name="spring-core.jar" value="${spring.home}/spring-core.jar"/>
- <property name="spring-web.jar" value="${spring.home}/spring-web.jar"/>
+
value="${spring.home}/dist/spring-context.jar"/>
+ <property name="spring-core.jar"
value="${spring.home}/dist/spring-core.jar"/>
+ <property name="spring-web.jar"
value="${spring.home}/dist/spring-web.jar"/>
+
<!-- Build Defaults -->
<property name="build.home" value="${basedir}/target"/>
@@ -106,6 +108,7 @@
<pathelement location="${jsf-api.jar}"/>
<pathelement location="${jsp-api.jar}"/>
<pathelement location="${servlet-api.jar}"/>
+ <pathelement location="${spring-beans.jar}"/>
<pathelement location="${spring-context.jar}"/>
<pathelement location="${spring-core.jar}"/>
<pathelement location="${spring-web.jar}"/>
@@ -130,6 +133,7 @@
<pathelement location="${junit.jar}"/>
<pathelement location="${servlet-api.jar}"/>
<pathelement location="${shale-test.jar}"/>
+ <pathelement location="${spring-beans.jar}"/>
<pathelement location="${spring-context.jar}"/>
<pathelement location="${spring-core.jar}"/>
<pathelement location="${spring-web.jar}"/>
Modified: struts/shale/trunk/use-cases/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/build.xml?view=diff&r1=160705&r2=160706
==============================================================================
--- struts/shale/trunk/use-cases/build.xml (original)
+++ struts/shale/trunk/use-cases/build.xml Sat Apr 9 11:54:36 2005
@@ -40,7 +40,7 @@
<property name="jstl.home"
value="/usr/local/jakarta-taglibs-standard-1.1.2"/>
<property name="junit.home" value="/usr/local/junit-3.8.1"/>
<property name="server.home" value="/usr/local/jakarta-tomcat-5.0.28"/>
- <property name="spring.home" value="/usr/local/spring-framework-1.1.5"/>
+ <property name="spring.home"
value="/usr/local/spring-framework-1.2-rc1"/>
<!-- Dependency library defaults -->
@@ -63,20 +63,13 @@
<property name="shale.jar"
value="${basedir}/../core-library/target/lib/shale.jar"/>
<property name="shale-spring.jar"
value="${basedir}/../core-library/target/lib/shale-spring.jar"/>
<property name="shale-test.jar"
value="${basedir}/../test-framework/target/lib/shale-test.jar"/>
+ <property name="spring-beans.jar"
value="${spring.home}/dist/spring-beans.jar"/>
<property name="spring-context.jar"
value="${spring.home}/dist/spring-context.jar"/>
<property name="spring-core.jar"
value="${spring.home}/dist/spring-core.jar"/>
<property name="spring-web.jar"
value="${spring.home}/dist/spring-web.jar"/>
<property name="standard.jar" value="${jstl.home}/lib/standard.jar"/>
- <!-- Conditional Processing Flags -->
- <available property="jsfri.present"
- classname="com.sun.faces.RIConstants"
- classpath="${jsf-impl.jar}"/>
- <available property="myfaces.present"
-
classname="org.apache.myfaces.config.MyfacesConfig"
- classpath="${jsf-impl.jar}"/>
-
<!-- Build Defaults -->
<property name="build.home" value="${basedir}/target"/>
<property name="dist.home" value="${basedir}/dist"/>
@@ -92,6 +85,23 @@
<property name="compile.optimize" value="true"/>
+ <!-- Custom Tomcat Integration -->
+ <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask"/>
+ <taskdef name="install" classname="org.apache.catalina.ant.InstallTask"/>
+ <taskdef name="list" classname="org.apache.catalina.ant.ListTask"/>
+ <taskdef name="reload" classname="org.apache.catalina.ant.ReloadTask"/>
+ <taskdef name="remove" classname="org.apache.catalina.ant.RemoveTask"/>
+ <taskdef name="undeploy" classname="org.apache.catalina.ant.UndeployTask"/>
+ <property name="password" value="tomcat"/>
+ <property name="url" value="http://localhost:8080/manager"/>
+ <property name="username" value="tomcat"/>
+
+
+ <!-- Filter Settings -->
+ <property name="webapp.state.saving" value="server"/>
+ <property name="webapp.url"
value="http://localhost:8080/${context.path}"/>
+
+
<!-- Compile Classpath -->
<path id="compile.classpath">
<pathelement location="${commons-beanutils.jar}"/>
@@ -104,6 +114,10 @@
<pathelement location="${jstl.jar}"/>
<pathelement location="${servlet-api.jar}"/>
<pathelement location="${shale.jar}"/>
+ <pathelement location="${spring-beans.jar}"/>
+ <pathelement location="${spring-context.jar}"/>
+ <pathelement location="${spring-core.jar}"/>
+ <pathelement location="${spring-web.jar}"/>
<pathelement location="${build.home}/${context.path}/WEB-INF/classes"/>
</path>
@@ -122,6 +136,10 @@
<pathelement location="${servlet-api.jar}"/>
<pathelement location="${shale.jar}"/>
<pathelement location="${shale-test.jar}"/>
+ <pathelement location="${spring-beans.jar}"/>
+ <pathelement location="${spring-context.jar}"/>
+ <pathelement location="${spring-core.jar}"/>
+ <pathelement location="${spring-web.jar}"/>
<pathelement location="${build.home}/${context.path}/WEB-INF/classes"/>
<pathelement location="${build.home}/test-classes"/>
</path>
@@ -136,21 +154,23 @@
</path>
- <!-- Custom Tomcat Integration -->
- <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask"/>
- <taskdef name="install" classname="org.apache.catalina.ant.InstallTask"/>
- <taskdef name="list" classname="org.apache.catalina.ant.ListTask"/>
- <taskdef name="reload" classname="org.apache.catalina.ant.ReloadTask"/>
- <taskdef name="remove" classname="org.apache.catalina.ant.RemoveTask"/>
- <taskdef name="undeploy" classname="org.apache.catalina.ant.UndeployTask"/>
- <property name="password" value="tomcat"/>
- <property name="url" value="http://localhost:8080/manager"/>
- <property name="username" value="tomcat"/>
-
-
- <!-- Filter Settings -->
- <property name="webapp.state.saving" value="server"/>
- <property name="webapp.url"
value="http://localhost:8080/${context.path}"/>
+ <!-- Conditional Processing Flags -->
+ <available property="jsfri.present"
+ classname="com.sun.faces.RIConstants"
+ classpath="${jsf-impl.jar}"/>
+ <available property="myfaces.present"
+
classname="org.apache.myfaces.config.MyfacesConfig"
+ classpath="${jsf-impl.jar}"/>
+ <condition property="spring.present">
+ <and>
+ <available classname="org.springframework.core.Constants"
+ classpathref="compile.classpath"/>
+ <available
classname="org.springframework.context.ApplicationContext"
+ classpathref="compile.classpath"/>
+ <available
classname="org.springframework.web.jsf.DelegatingVariableResolver"
+ classpathref="compile.classpath"/>
+ </and>
+ </condition>
<!-- ==================== Maintenance Targets ============================
-->
@@ -174,8 +194,10 @@
<echo message="jsf-api.jar = ${jsf-api.jar}"/>
<echo message="jsf-impl.jar = ${jsf-impl.jar}"/>
<echo message="shale.jar = ${shale.jar}"/>
+ <echo message="spring-core.jar = ${spring-core.jar}"/>
<echo message="jsfri.present = ${jsfri.present}"/>
- <echo message="myfaces.present= ${myfaces.present}"/>
+ <echo message="myfaces.present = ${myfaces.present}"/>
+ <echo message="spring.present = ${spring.present}"/>
</target>
@@ -215,6 +237,8 @@
file="${shale.jar}"/>
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
file="${shale-spring.jar}"/>
+ <copy todir="${build.home}/${context.path}/WEB-INF/lib"
+ file="${spring-beans.jar}"/>
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
file="${spring-context.jar}"/>
<copy todir="${build.home}/${context.path}/WEB-INF/lib"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
