Anonymous avatar Anonymous committed 72f95bc

Rename artifacts from ant build to match maven artifact names
o removed clover from ant build
o fixed maven repo copy task
o added pom.xml to bin jar
o commented showcase from assembly
o another javadoc fix

Issue Number: XW-448

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@1257 e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (5)

         <copy file="${src}/etc/LICENSE.txt" todir="${dist}"/>
     </target>
 
-    <target name="test" depends="junit-check, clover-check, compile, test-compile" description="run tests"
+    <target name="test" depends="junit-check, compile, test-compile" description="run tests"
             unless="skip.tests">
         <run-junit />
     </target>
 
     <target name="mavenrep" depends="jar">
         <!-- xwork -->
-        <copy file="pom.xml" tofile="/opt/repository/ibiblio.org/opensymphony/poms/${name}-${version}-SNAPSHOT.pom"/>
-        <copy file="${build}/${name}-${version}.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-${version}-SNAPSHOT.jar"/>
-        <copy file="${build}/${name}-${version}-sources.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-${version}-SNAPSHOT-sources.jar"/>
-        <copy file="${build}/${name}-${version}-javadoc.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-${version}-SNAPSHOT-javadoc.jar"/>
+        <copy file="pom.xml" tofile="/opt/repository/ibiblio.org/opensymphony/poms/${name}-${version}-SNAPSHOT.pom" overwrite="true"/>
+        <copy file="${build}/${name}-${version}.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-${version}-SNAPSHOT.jar" overwrite="true"/>
+        <copy file="${build}/${name}-${version}-sources.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-${version}-SNAPSHOT-sources.jar" overwrite="true"/>
+        <copy file="${build}/${name}-${version}-javadoc.jar" tofile="/opt/repository/ibiblio.org/opensymphony/jars/${name}-${version}-SNAPSHOT-javadoc.jar" overwrite="true"/>
     </target>
 
 </project>
     <property name="build.test" value="${build}/test"/>
     <property name="build.java-test" value="${build}/java-test"/>
     <property name="build.java" value="${build}/java"/>
-    <property name="build.clover" value="${build}/clover"/>
     <property name="dist" location="dist"/>
 
     <property name="docs" location="docs"/>
     </path>
 
     <available property="junit.available" classname="junit.framework.TestCase"/>
-    <available property="clover.available" classname="org.apache.tools.ant.taskdefs.CloverCompilerAdapter"/>
 
     <target name="init" depends="init-anthill, init-standalone">
         <tstamp/>
         <fail message="Cannot run test cases. Please copy lib/build/junit.jar to ${ant.home}/lib"/>
     </target>
 
-    <target name="clover-check" depends="init" unless="clover.available">
-        <fail message="Cannot run coverage tests. Please copy lib/build/clover.jar and lib/build/clover.license (if it exists) to ${ant.home}/lib"/>
-    </target>
-
     <target name="clean">
         <delete dir="${build}"/>
         <delete dir="${dist}"/>
 
     <target name="jar" depends="compile" description="build the project jar file">
         <mkdir dir="${build}"/>
+        <mkdir dir="${build.java}/maven/com/opensymphony/xwork" />
+        <copy file="pom.xml" todir="${build.java}/maven/com/opensymphony/xwork" />
 
         <jar basedir="${build.java}" excludes="${jar.excludes}" jarfile="${build}/${name}-${version}.jar">
             <manifest>
         <compile srcdir="${src.test}" destdir="${build.test}" classpath="${build.java}"
                  source="${test.compile.version}" target="${test.compile.version}"/>
 
-        <taskdef resource="clovertasks"/>
         <taskdef name="junit" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/>
-
-        <mkdir dir="${build.clover}"/>
-        <clover-setup initString="${build.clover}/coverage.db">
-            <statementContext name="logIsDebugEnabled"
-                              regexp="[\s]*if[\s]*\([\s]*(log|_log|LOG|_LOG)\.isDebugEnabled.*"/>
-            <statementContext name="logDebug" regexp="[\s]*(log|_log|LOG|_LOG)\.debug[\s]*\(.*"/>
-            <files>
-                <exclude name="${src.test}/**/*.java"/>
-            </files>
-        </clover-setup>
-
         <compile srcdir="${src.java}" destdir="${build.java-test}"/>
     </target>
 
-    <target name="test" depends="junit-check, clover-check, compile, test-compile" description="run tests"
+    <target name="test" depends="junit-check, compile, test-compile" description="run tests"
             unless="skip.tests">
         <run-junit/>
     </target>
         </copy>
     </target>
 
-    <target name="reports" depends="junit.report, clover.report, javadocs"
+    <target name="reports" depends="junit.report, javadocs"
             description="generate javadocs and junit and coverage reports"/>
 
     <target name="docs" depends="reports, docs.impl"/>
 
-    <target name="clover.report" depends="test" description="generate coverage reports" unless="skip.tests">
-        <clover-report>
-            <current outfile="${dist.docs}/clover">
-                <format type="html" filter="logDebug,logIsDebugEnabled"/>
-            </current>
-        </clover-report>
-        <clover-log filter="logDebug,logIsDebugEnabled"/>
-    </target>
-
-    <target name="clover.historical" depends="clover.report" description="generate coverage historical reports"
-            unless="skip.tests">
-        <clover-historypoint historyDir="${build.clover}"/>
-
-        <clover-report>
-            <historical outfile="${dist.docs}/clover" historyDir="${build.clover}">
-                <format type="html" filter="logDebug,logIsDebugEnabled"/>
-            </historical>
-        </clover-report>
-        <clover-log filter="logDebug,logIsDebugEnabled"/>
-    </target>
-
     <target name="junit.report" depends="test" description="generate junit reports" unless="skip.tests">
         <junitreport todir="${dist.docs}/junit">
             <fileset dir="${dist.docs}/junit">
 
         <zip zipfile="${build}/${name}-${version}.zip">
             <zipfileset prefix="${name}-${version}" dir="${dist}">
-                <exclude name="docs/clover/**/*"/>
                 <exclude name="docs/junit/**/*"/>
             </zipfileset>
         </zip>

src/assembly/all.xml

             <outputDirectory></outputDirectory>
             <includes>
                 <include>pom*</include>
-                <!--include>osbuild*</include>
-                <include>build*</include>
-                <include>ivy*</include-->
             </includes>
+            <excludes>
+                <exclude>null</exclude>
+                <exclude>dist</exclude>
+                <exclude>build</exclude>
+            </excludes>
         </fileSet>
         <fileSet>
             <directory>src/etc</directory>
             </includes>
         </fileSet>
 
-        <fileSet>
+        <!--fileSet>
             <directory>showcase</directory>
             <outputDirectory>showcase</outputDirectory>
             <includes>
                 <include>pom.xml</include>
                 <include>src/</include>
             </includes>
-        </fileSet>
+        </fileSet-->
 
         <!-- Include the generated jars in archive root -->
         <fileSet>

src/assembly/src.xml

             <outputDirectory></outputDirectory>
             <includes>
                 <include>pom*</include>
-                <!--include>osbuild*</include>
-                <include>build*</include>
-                <include>ivy*</include-->
             </includes>
+            <excludes>
+                <exclude>null</exclude>
+                <exclude>dist</exclude>
+                <exclude>build</exclude>
+            </excludes>
         </fileSet>
 
         <fileSet>
             </includes>
         </fileSet>
 
-        <fileSet>
+        <!--fileSet>
             <directory>showcase</directory>
             <outputDirectory>showcase</outputDirectory>
             <includes>
                 <include>pom.xml</include>
                 <include>src/</include>
             </includes>
-        </fileSet>
+        </fileSet-->
 
     </fileSets>
 </assembly>

src/java/com/opensymphony/xwork2/validator/Validator.java

  * interface which ActionSupport already does).</p>
  * 
  * <p>
- * A plain Validator (non FieldValidator) that gets short-circuited will 
+ * A plain Validator (non FieldValidator) that gets short-circuited will
  * completely break out of the validation stack� no other validators will be 
  * evaluated and plain validator takes precedence over field validator meaning 
  * that they get evaluated in the order they are defined before field validator 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.