svn commit: r1695852 - in /commons/proper/validator/trunk: build-javascript.xml build.xml pom.xml src/main/assembly/src.xml src/site/xdoc/tasks.xml

[se...@apache.org]

Author: sebb
Date: Fri Aug 14 09:32:05 2015
New Revision: 1695852

URL: http://svn.apache.org/r1695852
Log:
VALIDATOR-371 Drop the Javascript code entirely
Drop the Javascript build as well

Removed:
    commons/proper/validator/trunk/build-javascript.xml
Modified:
    commons/proper/validator/trunk/build.xml
    commons/proper/validator/trunk/pom.xml
    commons/proper/validator/trunk/src/main/assembly/src.xml
    commons/proper/validator/trunk/src/site/xdoc/tasks.xml

Modified: commons/proper/validator/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/build.xml?rev=1695852&r1=1695851&r2=1695852&view=diff
==============================================================================
--- commons/proper/validator/trunk/build.xml (original)
+++ commons/proper/validator/trunk/build.xml Fri Aug 14 09:32:05 2015
@@ -84,9 +84,6 @@
   <!-- The base directory for component sources -->
   <property name="source.home"             value="src/main/java"/>
 
-  <!-- The base directory for javascript sources -->
-  <property name="javascript.home"             value="src/javascript"/>
-
   <!-- The base directory for unit test sources -->
   <property name="test.home"               value="src/test"/>
 
@@ -222,10 +219,6 @@
     <copy    todir="${build.home}/classes">
       <fileset dir="${resources.home}" includes="**/*.dtd,**/*.xml"/>
     </copy>
-    <copy    todir="${build.home}/classes/">
-      <fileset dir="${javascript.home}"
-          includes="**/*.js"/>
-    </copy>
   </target>
 
 
@@ -246,34 +239,9 @@
     <mkdir      dir="${dist.home}"/>
     <mkdir      dir="${dist.home}/docs"/>
     <mkdir      dir="${dist.home}/docs/apidocs"/>
-    <mkdir      dir="${dist.home}/docs/javascript"/>
-    <mkdir      dir="${dist.home}/docs/javascript/org/apache/commons/validator/javascript/doc-files"/>
   </target>  
 
-  <target name="javadoc.js" depends="javadoc.js.unix,javadoc.js.windows"
-   description="Create Javascript Javadoc documentation">
-
-    <copy todir="${dist.home}/docs/javascript/org/apache/commons/validator/javascript/doc-files">
-      <fileset dir="${javascript.home}/org/apache/commons/validator/javascript/doc-files" includes="*.gif"/>
-    </copy>
-
-  </target>
-
-  <target name="javadoc.js.unix" depends="javadoc.init" if="jsdoc.found"
-   description="Create Javascript Javadoc documentation">
-    <exec  executable="bash" failifexecutionfails="false">
-         <arg line="-c 'etc/jsdoc.sh ${jsdoc.home} ${javascript.home} ${dist.home}/docs/javascript' "/>
-    </exec>
-  </target>
-
-  <target name="javadoc.js.windows" depends="javadoc.init" if="jsdoc.found"
-   description="Windows Create Javascript Javadoc documentation">
-    <exec  executable="etc/jsdoc.bat" failifexecutionfails="false">
-         <arg line="${jsdoc.home} ${javascript.home} ${dist.home}/docs/javascript"/>
-    </exec>
-  </target>
-
-  <target name="javadoc" depends="compile, javadoc.js"
+  <target name="javadoc" depends="compile"
    description="Create component Javadoc documentation">
     <!--javadoc sourcepath="${source.home}"
                 destdir="${dist.home}/docs/apidocs"
@@ -304,13 +272,6 @@
    description="Create binary distribution">
     <mkdir      dir="${dist.home}"/>
 
-    <ant antfile="build-javascript.xml" target="compress">
-        <property name="source.dir" value="${javascript.home}"/>
-        <property name="dist.dir"   value="${dist.home}"/>
-        <property name="build.dir"  value="${build.home}"/>
-        <property name="final.name" value="commons-${component.name}-${component.version}"/>
-    </ant>
-
     <copy      file="LICENSE.txt"
               todir="${dist.home}"/>
     <copy      file="NOTICE.txt"

Modified: commons/proper/validator/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/pom.xml?rev=1695852&r1=1695851&r2=1695852&view=diff
==============================================================================
--- commons/proper/validator/trunk/pom.xml (original)
+++ commons/proper/validator/trunk/pom.xml Fri Aug 14 09:32:05 2015
@@ -171,36 +171,9 @@
       <resource>
         <directory>${basedir}/src/main/resources</directory>
       </resource>
-      <resource>
-        <directory>${basedir}/src/javascript</directory>
-        <includes>
-          <include>**/*.js</include>
-        </includes>
-      </resource>
     </resources>
     <plugins>
       <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>javascript.compress</id>
-            <phase>prepare-package</phase>
-            <configuration>
-              <tasks>
-                <ant antfile="build-javascript.xml" target="compress">
-                  <property name="build.dir" value="${project.build.directory}" />
-                  <property name="output.dir" value="${project.build.outputDirectory}" />
-                  <property name="final.name" value="${project.build.finalName}" />
-                </ant>
-               </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <configuration>
           <descriptors>

Modified: commons/proper/validator/trunk/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/assembly/src.xml?rev=1695852&r1=1695851&r2=1695852&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/main/assembly/src.xml (original)
+++ commons/proper/validator/trunk/src/main/assembly/src.xml Fri Aug 14 09:32:05 2015
@@ -26,7 +26,6 @@
             <includes>
                 <include>build.properties.sample</include>
                 <include>build.xml</include>
-                <include>build-javascript.xml</include>
                 <include>checkstyle.xml</include>
                 <include>LICENSE.txt</include>
                 <include>license-header.txt</include>

Modified: commons/proper/validator/trunk/src/site/xdoc/tasks.xml
URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/site/xdoc/tasks.xml?rev=1695852&r1=1695851&r2=1695852&view=diff
==============================================================================
--- commons/proper/validator/trunk/src/site/xdoc/tasks.xml (original)
+++ commons/proper/validator/trunk/src/site/xdoc/tasks.xml Fri Aug 14 09:32:05 2015
@@ -32,12 +32,6 @@
 
       <ul>
         <li>
-            Integrate the creation of javascript javadocs into the maven build. What will need to happen
-            is something similar to the exec task in the ant build.xml. Then to put a Maven template around
-            the javadoc it and the legacy 1.0.2 javadoc will need to be copied to a temporary directory then the
-            html2xdoc task will need to be run against that temporary directory.
-        </li>
-        <li>
           Change the validation.xml file semantics to match a more general "bean" validation usage.
           Currently, the &lt;form-validation&gt;, &lt;formset&gt;, &lt;form&gt;, and &lt;field&gt; elements
           require a form-centric view of validations.  Changing these to &lt;bean-validation&gt; or &lt;validator-config&gt;,