Author: snoopdave
Date: Wed Aug 1 08:16:28 2007
New Revision: 561833
URL: http://svn.apache.org/viewvc?view=rev&rev=561833
Log:
Removing Struts 1.2.4 from build
Modified:
roller/trunk/apps/weblogger/build.xml
roller/trunk/apps/weblogger/properties.xmlf
Modified: roller/trunk/apps/weblogger/build.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/build.xml?view=diff&rev=561833&r1=561832&r2=561833
==============================================================================
--- roller/trunk/apps/weblogger/build.xml (original)
+++ roller/trunk/apps/weblogger/build.xml Wed Aug 1 08:16:28 2007
@@ -48,14 +48,14 @@
property="dbscripts-exist" />
<!-- Use Java.net JUnit-AntTask to work around problem in default Ant task,
- see here for details: https://junit-anttask.dev.java.net/ -->
+ see here for details: https://junit-anttask.dev.java.net/
<taskdef name="junit2" classname="com.sun.ant.junit.JUnitTask">
<classpath>
<pathelement path="${ro.tools}/buildtime/junit-anttask.jar" />
<pathelement path="${ro.tools}/buildtime/junit-4.1.jar" />
</classpath>
</taskdef>
-
+ -->
<target name="usage" description="Print usage for key targets">
<echo>
@@ -248,7 +248,6 @@
<fileset refid="hibernate.jar" />
<fileset refid="hibernate.jars" />
<fileset refid="jpa.jars" />
- <fileset refid="struts.jars" />
<fileset refid="struts2.jars" />
<fileset refid="spring.jars" />
<fileset refid="jstl.jars" />
Modified: roller/trunk/apps/weblogger/properties.xmlf
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/properties.xmlf?view=diff&rev=561833&r1=561832&r2=561833
==============================================================================
--- roller/trunk/apps/weblogger/properties.xmlf (original)
+++ roller/trunk/apps/weblogger/properties.xmlf Wed Aug 1 08:16:28 2007
@@ -57,13 +57,9 @@
<!-- various libraries used by Roller -->
-<property name="tools.struts" value="${ro.tools}/struts-1.2.4" />
-<property name="tools.struts2" value="${ro.tools}/struts-2.0.5" />
+<property name="tools.struts2" value="${ro.tools}/struts-2.0.6" />
<property name="tools.hibernate" value="${ro.tools}/hibernate-3.1" />
<property name="tools.jpa" value="${ro.tools}/openjpa-0.9.7" />
-<!--
-<property name="tools.jpa"
value="${ro.tools}/toplink-essentials-9.1" />
--->
<property name="tools.spring" value="${ro.tools}/spring-1.2" />
<property name="tools.jstl"
value="${ro.tools}/jakarta-taglibs-standard-1.1.2" />
<property name="tools.xdoclet"
value="${ro.tools}/buildtime/xdoclet-1.2.3" />
@@ -91,10 +87,9 @@
<fileset id="base.jars" dir="${ro.tools}/lib">
<include name="commons-id-0.1-SNAPSHOT.jar"/>
- <include name="commons-betwixt-1.0-beta-1.jar" />
- <include name="commons-cache.jar" />
<include name="commons-collections-3.2.jar" />
<include name="commons-codec-1.3.jar" />
+ <include name="commons-digester-1.6.jar" />
<include name="commons-httpclient-2.0.2.jar" />
<include name="commons-logging-1.0.4.jar" />
<include name="commons-lang-2.1.jar" />
@@ -118,18 +113,7 @@
<include name="commons-httpclient*.jar"/>
</fileset>
-<fileset id="struts.jars" dir="${tools.struts}/lib">
- <include name="antlr.jar"/>
- <include name="commons-beanutils.jar"/>
- <include name="commons-digester.jar"/>
- <include name="commons-fileupload.jar"/>
- <include name="commons-validator.jar"/>
- <include name="jakarta-org.jar"/>
- <include name="struts.jar"/>
- <include name="struts-el.jar"/>
-</fileset>
-
-<fileset id="struts2.jars" dir="${ro.tools}/struts-2.0.6/lib">
+<fileset id="struts2.jars" dir="${tools.struts2}/lib">
<include name="*.jar"/>
</fileset>
@@ -202,7 +186,6 @@
<path id="presentation.path">
<path refid="base.path"/>
<fileset refid="presentation.jars"/>
- <fileset refid="struts.jars"/>
<fileset refid="struts2.jars"/>
<fileset refid="servlet.jars"/>
<fileset refid="mail.jars"/>
