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/11/19 02:35:08 UTC
svn commit: r345620 - in /struts/shale/trunk: build.properties.sample
core-library/build.xml core-library/src/java/org/apache/shale/spring/webflow/
Author: craigmcc
Date: Fri Nov 18 17:34:59 2005
New Revision: 345620
URL: http://svn.apache.org/viewcvs?rev=345620&view=rev
Log:
Remove references to the temporary drafts of JSF-Spring Web Flow integration,
now that the SWF guys have nearly completed the real integration work in
that repository.
Removed:
struts/shale/trunk/core-library/src/java/org/apache/shale/spring/webflow/
Modified:
struts/shale/trunk/build.properties.sample
struts/shale/trunk/core-library/build.xml
Modified: struts/shale/trunk/build.properties.sample
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/build.properties.sample?rev=345620&r1=345619&r2=345620&view=diff
==============================================================================
--- struts/shale/trunk/build.properties.sample (original)
+++ struts/shale/trunk/build.properties.sample Fri Nov 18 17:34:59 2005
@@ -69,8 +69,3 @@
# the "findbugs" tool (http://findbugs.sourceforge/net/)
findbugs.home = /usr/local/findbugs-0.8.6
-# The location and name of the Spring WebFlow JAR file
-# REQUIRED to build core-library during WebFlow/JSF integration development
-webflow.home=/usr/local/spring-webflow-pr4
-spring-webflow.jar=${webflow.home}/spring-webflow-pr4.jar
-
Modified: struts/shale/trunk/core-library/build.xml
URL: http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/build.xml?rev=345620&r1=345619&r2=345620&view=diff
==============================================================================
--- struts/shale/trunk/core-library/build.xml (original)
+++ struts/shale/trunk/core-library/build.xml Fri Nov 18 17:34:59 2005
@@ -36,7 +36,6 @@
<!-- Dependency home directory defaults -->
<property name="shale-test.home" value="${basedir}/../test-framework/dist"/>
- <property name="webflow.home" value="/usr/local/spring-webflow-pr4"/>
<!-- Dependency library defaults -->
@@ -78,7 +77,6 @@
<pathelement location="${spring-context.jar}"/>
<pathelement location="${spring-core.jar}"/>
<pathelement location="${spring-web.jar}"/>
- <pathelement location="${spring-webflow.jar}"/>
<pathelement location="${build.home}/classes"/>
<pathelement location="${tiles.jar}"/>
</path>
@@ -99,7 +97,6 @@
<pathelement location="${spring-context.jar}"/>
<pathelement location="${spring-core.jar}"/>
<pathelement location="${spring-web.jar}"/>
- <pathelement location="${spring-webflow.jar}"/>
</path>
@@ -121,7 +118,6 @@
<pathelement location="${spring-context.jar}"/>
<pathelement location="${spring-core.jar}"/>
<pathelement location="${spring-web.jar}"/>
- <pathelement location="${spring-webflow.jar}"/>
<pathelement location="${build.home}/classes"/>
<pathelement location="${build.home}/test-classes"/>
<pathelement location="${tiles.jar}"/>
@@ -147,9 +143,6 @@
classpathref="compile.classpath"/>
</and>
</condition>
- <available property="webflow.present"
- classname="org.springframework.webflow.Flow"
- classpath="${spring-webflow.jar}"/>
<!-- ==================== Maintenance Targets ============================ -->
@@ -171,12 +164,10 @@
<echo message="jsf-api.jar = ${jsf-api.jar}"/>
<echo message="jsf-impl.jar = ${jsf-impl.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>
@@ -225,8 +216,6 @@
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 -->
@@ -237,8 +226,6 @@
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