svn commit: r239956 - /struts/shale/trunk/core-library/build.xml

[cr...@apache.org]

Author: craigmcc
Date: Wed Aug 24 15:40:29 2005
New Revision: 239956

URL: http://svn.apache.org/viewcvs?rev=239956&view=rev
Log:
Make complication of the Spring Webflow classes conditional (on the PR4
release of Spring Webflow).

Modified:
    struts/shale/trunk/core-library/build.xml

Modified: struts/shale/trunk/core-library/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/build.xml?rev=239956&r1=239955&r2=239956&view=diff
==============================================================================
--- struts/shale/trunk/core-library/build.xml (original)
+++ struts/shale/trunk/core-library/build.xml Wed Aug 24 15:40:29 2005
@@ -71,6 +71,8 @@
                                     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"/>
+  <property name="spring-webflow.jar"
+                                    value="${spring.home}/spring-webflow.jar"/>
 
   <property name="tiles.jar"        value="${tiles.dir}/dist/lib/tiles-core.jar"/>
 
@@ -191,6 +193,9 @@
                              classpathref="compile.classpath"/>
     </and>
   </condition>
+  <available                     property="webflow.present"
+                                classname="org.springframework.webflow.Flow"
+                                classpath="${spring-webflow.jar}"/>
 
 
   <!-- ==================== Maintenance Targets ============================ -->
@@ -219,10 +224,12 @@
     <echo  message="jsp-api.jar =            ${jsp-api.jar}"/>
     <echo  message="servlet-api.jar =        ${servlet-api.jar}"/>
     <echo  message="shale-test.jar =         ${shale-test.jar}"/>
+    <echo  message="spring-webflow.jar =     ${spring-webflow.jar}"/>
     <echo  message="jsfri.present =  ${jsfri.present}"/>
     <echo  message="myfaces.present= ${myfaces.present}"/>
     <echo  message="spring.present=  ${spring.present}"/>
     <echo  message="tiles.present=   ${tiles.present}"/>
+    <echo  message="webflow.present= ${webflow.present}"/>
   </target>
 
 
@@ -271,6 +278,8 @@
                 unless="spring.present"/>
       <exclude    name="org/apache/shale/tiles/**"
                 unless="tiles.present"/>
+      <exclude    name="org/apache/shale/spring/webflow/**"
+                unless="webflow.present"/>
     </javac>
 
     <!-- Copy non-Java Sources -->
@@ -279,6 +288,10 @@
         <exclude  name="**/*.java"/>
         <exclude  name="org/apache/shale/spring/**"
                 unless="spring.present"/>
+        <exclude  name="org/apache/shale/tiles/**"
+                unless="tiles.present"/>
+        <exclude  name="org/apache/shale/spring/webflow/**"
+                unless="webflow.present"/>
       </fileset>
     </copy>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org