Author: dgeary
Date: Fri Aug 26 18:15:30 2005
New Revision: 240369
URL: http://svn.apache.org/viewcvs?rev=240369&view=rev
Log:
Modified buildfiles to rely on JARS in the top-level lib directory that were
downloaded by download-dependencies, copy-tiles, and copy-jsf-ri ANT tasks
Modified:
struts/shale/trunk/clay-plugin/build.xml
struts/shale/trunk/core-library/build.xml
struts/shale/trunk/test-framework/build.xml
struts/shale/trunk/use-cases/build.xml
Modified: struts/shale/trunk/clay-plugin/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/clay-plugin/build.xml?rev=240369&r1=240368&r2=240369&view=diff
==============================================================================
--- struts/shale/trunk/clay-plugin/build.xml (original)
+++ struts/shale/trunk/clay-plugin/build.xml Fri Aug 26 18:15:30 2005
@@ -49,13 +49,13 @@
<!-- Dependency library defaults -->
<property name="commons-beanutils.jar"
-
value="${jsf.home}/lib/commons-beanutils.jar"/>
+
value="${lib.dir}/commons-beanutils/commons-beanutils.jar"/>
<property name="commons-collections.jar"
-
value="${jsf.home}/lib/commons-collections.jar"/>
+
value="${lib.dir}/commons-collections/commons-collections.jar"/>
<property name="commons-digester.jar"
-
value="${jsf.home}/lib/commons-digester.jar"/>
+
value="${lib.dir}/commons-digester/commons-digester.jar"/>
<property name="commons-logging.jar"
-
value="${jsf.home}/lib/commons-logging.jar"/>
+
value="${lib.dir}/commons-logging/commons-logging.jar"/>
<property name="jsf-api.jar" value="${jsf.home}/lib/jsf-api.jar"/>
<property name="jsf-impl.jar" value="${jsf.home}/lib/jsf-impl.jar"/>
<property name="jsp-api.jar" value="${jsp-api.home}/jsp-api.jar"/>
Modified: struts/shale/trunk/core-library/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/build.xml?rev=240369&r1=240368&r2=240369&view=diff
==============================================================================
--- struts/shale/trunk/core-library/build.xml (original)
+++ struts/shale/trunk/core-library/build.xml Fri Aug 26 18:15:30 2005
@@ -61,7 +61,6 @@
value="${validator.home}/commons-validator.jar"/>
<property name="jsf-api.jar" value="${jsf.home}/lib/jsf-api.jar"/>
- <property name="jsf-impl.jar" value="${jsf.home}/lib/jsf-impl.jar"/>
<property name="jsp-api.jar" value="${jsp-api.home}/jsp-api.jar"/>
<property name="junit.jar" value="${junit.home}/junit.jar"/>
<property name="servlet-api.jar"
value="${servlet-api.home}/servlet-api.jar"/>
@@ -114,6 +113,7 @@
<pathelement location="${commons-validator.jar}"/>
<pathelement location="${jsf-api.jar}"/>
+ <pathelement location="${jsf-impl.jar}"/>
<pathelement location="${jsp-api.jar}"/>
<pathelement location="${servlet-api.jar}"/>
<pathelement location="${spring-beans.jar}"/>
Modified: struts/shale/trunk/test-framework/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/test-framework/build.xml?rev=240369&r1=240368&r2=240369&view=diff
==============================================================================
--- struts/shale/trunk/test-framework/build.xml (original)
+++ struts/shale/trunk/test-framework/build.xml Fri Aug 26 18:15:30 2005
@@ -47,19 +47,17 @@
<!-- Dependency library defaults -->
<property name="commons-beanutils.jar"
-
value="${jsf.home}/lib/commons-beanutils.jar"/>
+
value="${lib.dir}/commons-beanutils/commons-beanutils.jar"/>
<property name="commons-collections.jar"
-
value="${jsf.home}/lib/commons-collections.jar"/>
+
value="${lib.dir}/commons-collections/commons-collections.jar"/>
<property name="commons-digester.jar"
-
value="${jsf.home}/lib/commons-digester.jar"/>
+
value="${lib.dir}/commons-digester/commons-digester.jar"/>
<property name="commons-logging.jar"
value="${jsf.home}/lib/commons-logging.jar"/>
- <property name="jsf-api.jar" value="${jsf.home}/lib/jsf-api.jar"/>
- <property name="jsf-impl.jar" value="${jsf.home}/lib/jsf-impl.jar"/>
- <property name="jsp-api.jar"
value="${server.home}/common/lib/jsp-api.jar"/>
- <property name="jstl.jar" value="${jstl.home}/lib/jstl.jar"/>
- <property name="junit.jar" value="${junit.home}/junit.jar"/>
- <property name="servlet-api.jar"
value="${servlet-api.home}/servlet-api.jar"/>
+ <property name="jsp-api.jar" value="${lib.dir}/jsp-api/jsp-api.jar"/>
+ <property name="jstl.jar" value="${lib.dir}/jstl-ri/jstl-api.jar"/>
+ <property name="junit.jar" value="${lib.dir}/junit/junit.jar"/>
+ <property name="servlet-api.jar"
value="${lib.dir}/servlet-api/servlet-api.jar"/>
<property name="shale-core.jar" value="${shale.home}/lib/shale-core.jar"/>
<property name="standard.jar" value="${jstl.home}/lib/standard.jar"/>
Modified: struts/shale/trunk/use-cases/build.xml
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/use-cases/build.xml?rev=240369&r1=240368&r2=240369&view=diff
==============================================================================
--- struts/shale/trunk/use-cases/build.xml (original)
+++ struts/shale/trunk/use-cases/build.xml Fri Aug 26 18:15:30 2005
@@ -49,24 +49,22 @@
<!-- Dependency library defaults -->
<property name="commons-beanutils.jar"
-
value="${jsf.home}/lib/commons-beanutils.jar"/>
+
value="${lib.dir}/commons-beanutils/commons-beanutils.jar"/>
<property name="commons-chain.jar"
- value="${chain.home}/commons-chain.jar"/>
+
value="${lib.dir}/commons-chain/commons-chain.jar"/>
<property name="commons-collections.jar"
-
value="${jsf.home}/lib/commons-collections.jar"/>
+
value="${lib.dir}/commons-collections/commons-collections.jar"/>
<property name="commons-digester.jar"
-
value="${jsf.home}/lib/commons-digester.jar"/>
+
value="${lib.dir}/commons-digester/commons-digester.jar"/>
<property name="commons-logging.jar"
-
value="${jsf.home}/lib/commons-logging.jar"/>
+
value="${lib.dir}/commons-logging/commons-logging.jar"/>
<property name="commons-validator.jar"
-
value="${validator.home}/commons-validator.jar"/>
+
value="${lib.dir}/commons-validator/commons-validator.jar"/>
- <property name="jsf-api.jar" value="${jsf.home}/lib/jsf-api.jar"/>
- <property name="jsf-impl.jar" value="${jsf.home}/lib/jsf-impl.jar"/>
- <property name="jsp-api.jar"
value="${server.home}/common/lib/jsp-api.jar"/>
- <property name="jstl.jar" value="${jstl.home}/lib/jstl.jar"/>
- <property name="junit.jar" value="${junit.home}/junit.jar"/>
- <property name="servlet-api.jar"
value="${servlet-api.home}/servlet-api.jar"/>
+ <property name="jsp-api.jar" value="${lib.dir}/jsp-api/jsp-api.jar"/>
+ <property name="jstl.jar" value="${lib.dir}/jstl-ri/jstl-api.jar"/>
+ <property name="junit.jar" value="${lib.dir}/junit/junit.jar"/>
+ <property name="servlet-api.jar"
value="${lib.dir}/servlet-api/servlet-api.jar"/>
<property name="shale-core.jar"
value="${basedir}/../core-library/target/lib/shale-core.jar"/>
<property name="shale-clay.jar"
value="${basedir}/../clay-plugin/target/lib/shale-clay.jar"/>
<property name="shale-spring.jar"
value="${basedir}/../core-library/target/lib/shale-spring.jar"/>
@@ -75,7 +73,7 @@
<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"/>
- <property name="standard.jar" value="${jstl.home}/lib/standard.jar"/>
+ <property name="standard.jar" value="${jstl.home}/jstl-impl.jar"/>
<!-- Build Defaults -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
