Compiling against a stub version of JDIC.

Simplifies build process, and anyway binary download was broken with java.net conversion. svn path=/trunk/; revision=84

Author: jglick

javahelp_nbproject/build.xml

@@ -35,17 +35,11 @@ have any questions.
  <propertyname="jsp-jar"value="${basedir}/lib/jsp-api.jar"/>
  <availableproperty="jsp-jar-present"file="${jsp-jar}"/>
 
- <propertyname="jdic-jar"value="${basedir}/lib/jdic.jar"/>
- <availableproperty="jdic-jar-present"file="${jdic-jar}"/>
-
  <propertyname="tomcat-zip"value="${java.io.tmpdir}/apache-tomcat-5.5.20.zip"/>
  <availableproperty="tomcat-zip-present"file="${tomcat-zip}"/>
 
- <propertyname="jdic-zip"value="${java.io.tmpdir}/jdic-0.8.4.1-bin-windows.zip"/>
- <availableproperty="jdic-zip-present"file="${jdic-zip}"/>
-
 <targetname="-pre-init"
-depends="unpack-servlet-jar,unpack-jsp-jar,unpack-jdic-jar"/>
+depends="unpack-servlet-jar,unpack-jsp-jar"/>
 
 <targetname="release"description="Build the full JavaHelp JARs"
 depends="build-jsearch-jars,copy-jsearch-jars,create-javahelp-jars"/>
@@ -105,23 +99,6 @@ have any questions.
 dest="${tomcat-zip}"/>
  </target>
 
-<targetname="unpack-jdic-jar"description="Download JDIC Jar"unless="jdic-jar-present"
-depends="download-jdic-zip">
- <unzipsrc="${jdic-zip}"dest="${java.io.tmpdir}"/>
- <copyfailonerror="true"file="${java.io.tmpdir}/jdic-0.8.4.1-bin-windows/jdic.jar"
-tofile="${jdic-jar}"/>
- </target>
-
-<targetname="download-jdic-zip"unless="jdic-zip-present">
- <echo>
-Downloading JDIC. If you get an error like 'Server redirected too many times' download it manually from
-https://jdic.dev.java.net/servlets/ProjectDocumentView?documentID=5715&amp;showInfo=true 
-Then copy the zip file to ${jdic-zip} and re-build
- </echo>
- <getsrc="https://jdic.dev.java.net/files/documents/880/5715/jdic-0.8.4.1-bin-windows.zip"
-dest="${jdic-zip}"/>
- </target>
-
 <targetname="build-jsearch-jars">
  <antinheritall="false"inheritrefs="false"
 antfile="${basedir}/../JSearchIndexer_nbproject/build.xml"target="jar"/>

javahelp_nbproject/lib/jdic-stub.jar

@@ -43,7 +43,7 @@ dist.jar=${dist.dir}/jh-client.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.jdic.jar=lib/jdic.jar
+file.reference.jdic.jar=lib/jdic-stub.jar
 file.reference.jsp-api.jar=lib/jsp-api.jar
 file.reference.servlet-api.jar=lib/servlet-api.jar
 file.reference.src-impl=../jhMaster/JavaHelp/src/impl

javahelp_nbproject/nbproject/project.properties

@@ -41,7 +41,7 @@ BINDIR=../javahelp/bin
 PKGDIR=javax/help
 PKGDIRIMPL=com/sun/java/help
 EXTLIBDIR=../../../javahelp_nbproject/lib
-EXTLIBS=$(EXTLIBDIR)/jdic.jar:$(EXTLIBDIR)/jsp-api.jar:$(EXTLIBDIR)/servlet-api.jar
+EXTLIBS=$(EXTLIBDIR)/jdic-stub.jar:$(EXTLIBDIR)/jsp-api.jar:$(EXTLIBDIR)/servlet-api.jar
 
 ifeq ($(JSEARCHHOME),)
 JSEARCHHOME=../../JSearch

jhMaster/JavaHelp/build/GNUmakefile

@@ -30,7 +30,7 @@ <h3><b>Native Browser Support</b></h3>
  alternate content viewer uses the Java Desktop Integrated Component 
  (JDIC) browser component <tt>BasicNativeContentViewerUI</tt>
  to render content by using the native browser. The use of <tt>BasicNativeContentViewerUI</tt>
- requires that the JDIC libraries be installed. See <ahref="http://jdic.dev.java.net">http://jdic.dev.java.net</a>
+ requires that the JDIC libraries be installed. See <ahref="http://java.net/projects/jdic/">http://java.net/projects/jdic/</a>
  for details on how to integrate the JDIC components into your 
  application.</p>
 <p>In your applications, you use this browser by adding the following