adding ability to skip java doc generation, for local builds
diff --git a/docs/org.eclipse.jst.doc.isv/javadoc.xml b/docs/org.eclipse.jst.doc.isv/javadoc.xml
index 81cb75d..1ddff47 100644
--- a/docs/org.eclipse.jst.doc.isv/javadoc.xml
+++ b/docs/org.eclipse.jst.doc.isv/javadoc.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <project
-	  name="javadoc"
+    name="javadoc"
     default="main"
     basedir=".">
 
-  <!-- = = = standard properties pattern = = = -->
-  <!-- 
-      First get environment variables
-      Note to be cross-platform, "environment variables" are only appropriate for 
-      some variables, e.g. ones we set, since properties are case sensitive, even if 
-      the environment variables on your operating system are not, e.g. it will 
-      be ${env.Path} not ${env.PATH} on Windows -->
-  <property environment="env" />
+    <!-- = = = standard properties pattern = = = -->
+    <!-- 
+        First get environment variables
+        Note to be cross-platform, "environment variables" are only appropriate for 
+        some variables, e.g. ones we set, since properties are case sensitive, even if 
+        the environment variables on your operating system are not, e.g. it will 
+        be ${env.Path} not ${env.PATH} on Windows -->
+    <property environment="env" />
 
-  <!-- 
-      Let users override standard properties, if desired.
-      If this directory/files does not exist, then it will be ignored, 
-      and defaults used.
-  -->
+    <!-- 
+        Let users override standard properties, if desired.
+        If this directory/files does not exist, then it will be ignored, 
+        and defaults used.
+    -->
     <property
-      file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
-  
+        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+
 
 
     <property file="javadoc.properties" />
@@ -45,11 +45,13 @@
             excludes="**/build/*,**/@dot/**,**/bin**" />
     </target>
 
-    <target name="javadoc" depends="getcommandandargs" unless="skipJavaDoc">
+    <target
+        name="javadoc"
+        depends="getcommandandargs, getSkipJavaDocParam"
+        unless="doskipJavaDoc">
         <echo message="classpath: ${env.J2SE-1.5}" />
         <echo message="buildDirectory: ${buildDirectory}" />
-        <echo message="JAVADOC_COMMAND: ${JAVADOC_COMMAND}" />
-        <echo message="JAVADOC_ARGS: ${JAVADOC_ARGS}" />
+
 
         <mkdir dir="${outputDir}/reference/api/overview" />
 
@@ -62,7 +64,6 @@
                 includes="*/javadoc-images/*.jpg" />
         </copy>
         <javadoc
-            executable="${JAVADOC_COMMAND}"
             access="public"
             author="false"
             destdir="${outputDir}/reference/api"
@@ -82,7 +83,6 @@
             breakiterator="yes"
             verbose="false"
             failonerror="false">
-            <arg line="${JAVADOC_ARGS}"/>
             <classpath>
                 <pathelement path="${env.J2SE-1.5}" />
                 <fileset dir="${buildDirectory}/../eclipse/plugins">
@@ -133,25 +133,45 @@
                 value="yes" />
         </xslt>
     </target>
-	<target name="getcommandandargs" depends="assignEnv">
-		<!-- three options, in order
-		    1. passed into us as an ant parameter already
-		    1. set in environment (assume for now if one is set in env., they both are)
-		    3. we'll come up with reasonable default 
-		 -->
-    <!-- if not otherwise set above (in assignEnv), or passed in, assign some reasonable default, especially 
-    to work on production build machine -->
-    <property
-        name="JAVADOC_COMMAND"
-        value="${env.JAVA_5_HOME}/bin/javadoc" />
-    <property
-      name="JAVADOC_ARGS"
-      value="-J-Xms256m -J-Xmx1024m" />
+    <target
+        name="getcommandandargs"
+        depends="assignEnv">
+        <!-- three options, in order
+            1. passed into us as an ant parameter already
+            1. set in environment (assume for now if one is set in env., they both are)
+            3. we'll come up with reasonable default 
+        -->
+        <!-- if not otherwise set above (in assignEnv), or passed in, assign some reasonable default, especially 
+            to work on production build machine -->
+        <property
+            name="JAVADOC_COMMAND"
+            value="${env.JAVA_5_HOME}/bin/javadoc" />
+        <property
+            name="JAVADOC_ARGS"
+            value="-J-Xms256m -J-Xmx1024m" />
 
-	</target>
-	
-	 <target name="assignEnv" if="env.JAVADOC_COMMAND">
-	  <property name="JAVADOC_COMMAND" value="$(env.JAVADOC_COMMAND}" />
-    <property name="JAVADOC_ARGS" value="$(env.JAVADOC_ARGS}" />
-	 </target>
+    </target>
+
+    <target
+        name="assignEnv"
+        if="env.JAVADOC_COMMAND">
+        <property
+            name="JAVADOC_COMMAND"
+            value="$(env.JAVADOC_COMMAND}" />
+        <property
+            name="JAVADOC_ARGS"
+            value="$(env.JAVADOC_ARGS}" />
+    </target>
+    <target
+        name="getSkipJavaDocParam"
+        if="skipJavaDoc">
+        <echo message="skipJavaDoc: ${skipJavaDoc}" />
+        <condition property="doskipJavaDoc">
+            <equals
+                arg1="${skipJavaDoc}"
+                arg2="true"
+                trim="true"
+                casesensitive="false" />
+        </condition>
+    </target>
 </project>
\ No newline at end of file