Author: mrdon
Date: Sun May 7 12:03:38 2006
New Revision: 404823
URL: http://svn.apache.org/viewcvs?rev=404823&view=rev
Log:
Removing unnecessary files, moving Ant build into its own directory
Added:
incubator/webwork2/ant-build/build.properties
- copied unchanged from r400413, incubator/webwork2/build.properties
incubator/webwork2/ant-build/ivy.xml
- copied, changed from r400413, incubator/webwork2/ivy.xml
incubator/webwork2/ant-build/ivyconf.properties
- copied unchanged from r400413, incubator/webwork2/ivyconf.properties
incubator/webwork2/ant-build/ivyconf.xml
- copied, changed from r400413, incubator/webwork2/ivyconf.xml
incubator/webwork2/ant-build/osbuild.xml
- copied, changed from r400415, incubator/webwork2/osbuild.xml
Removed:
incubator/webwork2/WebWork.iml
incubator/webwork2/WebWork.ipr
incubator/webwork2/build.properties
incubator/webwork2/dojo.profile.js
incubator/webwork2/idea-setup.txt
incubator/webwork2/ivy.xml
incubator/webwork2/ivyconf.properties
incubator/webwork2/ivyconf.xml
incubator/webwork2/osbuild.xml
Modified:
incubator/webwork2/build.xml
Copied: incubator/webwork2/ant-build/ivy.xml (from r400413,
incubator/webwork2/ivy.xml)
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/ant-build/ivy.xml?p2=incubator/webwork2/ant-build/ivy.xml&p1=incubator/webwork2/ivy.xml&r1=400413&r2=404823&rev=404823&view=diff
==============================================================================
--- incubator/webwork2/ivy.xml (original)
+++ incubator/webwork2/ant-build/ivy.xml Sun May 7 12:03:38 2006
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl"
href="http://www.jayasoft.fr/org/ivyrep/ivy-doc.xsl";?>
<ivy-module version="1.0">
- <info organisation="apache" module="struts-action"
+ <info organisation="apache" module="struts-action2"
revision="2.0"
status="integration"
publication="20060323000000">
Copied: incubator/webwork2/ant-build/ivyconf.xml (from r400413,
incubator/webwork2/ivyconf.xml)
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/ant-build/ivyconf.xml?p2=incubator/webwork2/ant-build/ivyconf.xml&p1=incubator/webwork2/ivyconf.xml&r1=400413&r2=404823&rev=404823&view=diff
==============================================================================
--- incubator/webwork2/ivyconf.xml (original)
+++ incubator/webwork2/ant-build/ivyconf.xml Sun May 7 12:03:38 2006
@@ -1,5 +1,5 @@
<ivyconf>
- <properties file="ivyconf.properties"/>
+ <properties file="ant-build/ivyconf.properties"/>
<conf defaultResolver="default" checkUpToDate="true"/>
<resolvers>
<chain name="default">
@@ -27,4 +27,4 @@
</url-->
</chain>
</resolvers>
-</ivyconf>
\ No newline at end of file
+</ivyconf>
Copied: incubator/webwork2/ant-build/osbuild.xml (from r400415,
incubator/webwork2/osbuild.xml)
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/ant-build/osbuild.xml?p2=incubator/webwork2/ant-build/osbuild.xml&p1=incubator/webwork2/osbuild.xml&r1=400415&r2=404823&rev=404823&view=diff
==============================================================================
--- incubator/webwork2/osbuild.xml (original)
+++ incubator/webwork2/ant-build/osbuild.xml Sun May 7 12:03:38 2006
@@ -21,9 +21,9 @@
<property name="test.compile.version" value="1.3"/>
<dirname property="common.dir" file="${ant.file.common}"/>
- <property file="build.properties"/>
- <property file="release.properties"/>
- <property file="ivyrep.properties"/>
+ <property file="ant-build/build.properties"/>
+ <property file="ant-build/release.properties"/>
+ <property file="ant-build/ivyrep.properties"/>
<property name="lib" location="lib"/>
<property name="lib.core" value="${lib}/core"/>
Modified: incubator/webwork2/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/build.xml?rev=404823&r1=404822&r2=404823&view=diff
==============================================================================
--- incubator/webwork2/build.xml (original)
+++ incubator/webwork2/build.xml Sun May 7 12:03:38 2006
@@ -11,7 +11,7 @@
" />
<property name="optional.test.sources"
value="org/apache/struts/action2/dispatcher/ChartResultTest.java" />
- <import file="osbuild.xml"/>
+ <import file="ant-build/osbuild.xml"/>
<!-- overriding the one found in osbuild.xml to exclude xwork-tiger,
which breaks the unit tests currently -->
@@ -40,13 +40,9 @@
and compile the dependent Struts Action 2 code, run the
'compile-optional' task.
</echo>
- <taskdef name="ivy-configure"
classname="fr.jayasoft.ivy.ant.IvyConfigure" classpathref="cp"/>
- <taskdef name="ivy-resolve" classname="fr.jayasoft.ivy.ant.IvyResolve"
classpathref="cp"/>
- <taskdef name="ivy-retrieve"
classname="fr.jayasoft.ivy.ant.IvyRetrieve" classpathref="cp"/>
- <taskdef name="ivy-publish" classname="fr.jayasoft.ivy.ant.IvyPublish"
classpathref="cp"/>
- <taskdef name="ivy-report" classname="fr.jayasoft.ivy.ant.IvyReport"
classpathref="cp"/>
- <taskdef name="ivy-deliver" classname="fr.jayasoft.ivy.ant.IvyDeliver"
classpathref="cp"/>
-
+ <taskdef file="ant-build/ivy-tasks.properties" classpathref="cp" />
+ <ivy-configure file="ant-build/ivyconf.xml" />
+ <ivy-resolve file="ant-build/ivy.xml" />
<ivy-retrieve
conf="build,default,source,ajax,freemarker,velocity,fileupload,sitemesh,quickstart,xslt,portlet,spring,pico,plexus,tiger,tiles"
/>
</target>
