Merge pull request #1 from omegat-org/topic/miurahr/import-debian-pat…

…ches import debian patches
omegat-org · Jan 28, 2023 · 47e2869 · 47e2869
2 parents 8fbc195 + 11d515d
commit 47e2869
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 288 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,24 @@
+# HTML parser (fork) for java
+
+This is fork project for OmegaT project dependency
+to guarantee providing source history.
+We dumped code from CVS until v1.6-20060610.
+
+## Changes from v1.6-20060610
+
+- Remove JDK1.4 and JDK1.5 dependency
+- Support building with Java 8 and 11.
+- Breach sourceforge links from javadoc for privacy
+
+## License
+
+htmlparser v1.5 and v1.6 is licensed under LGPL 2.1 or later.
+
+
+## Origin
+
+An origin of the project is https://htmlparser.sourceforge.net/
+CVS repository is described at http://htmlparser.cvs.sourceforge.net/htmlparser/
+
+Code here was forked from CVS repository
+http://htmlparser.cvs.sourceforge.net/htmlparser/
diff --git a/build.xml b/build.xml
@@ -157,26 +157,6 @@ Update the Web Site
     <delete file="${lib}/fit_distribution.zip"/>
   </target>
 
-  <target name="JDK_OK">
-      <condition property="JDK1.4">
-        <or>
-          <equals arg1="1.4" arg2="${ant.java.version}"/>
-          <equals arg1="1.5" arg2="${ant.java.version}"/>
-        </or>
-      </condition>
-      <condition property="JDK1.5">
-        <or>
-          <equals arg1="1.5" arg2="${ant.java.version}"/>
-        </or>
-      </condition>
-  </target>
-
-  <target name="JDK_Warning" unless="JDK_OK">
-    <echo message="***************************************************"/>
-    <echo message="*  WARNING: The detected JDK version is not 1.4!  *"/>
-    <echo message="***************************************************"/>
-  </target>
-
   <target name="init" description="initialize version properties">
     <tstamp>
       <format property="TODAY" pattern="yyyyMMdd" locale="en"/>
@@ -260,12 +240,15 @@ Update the Web Site
 
   <target name="compile" description="compile all java files">
     <mkdir dir="${classes}"/>
-    <javac srcdir="${src}" destdir="${classes}" includes="org/htmlparser/**" excludes="org/htmlparser/tests/**" debug="on" classpath="${classes}" source="1.3"/>
+    <javac srcdir="${src}" destdir="${classes}" includes="org/htmlparser/**"
+           excludes="org/htmlparser/tests/**" debug="on" classpath="${classes}"
+           source="1.7" encoding="iso-8859-1"/>
   </target>
 
   <target name="compilelexer" description="compile lexer java files">
     <mkdir dir="${classes}"/>
-    <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="{classes}" target="1.1" source="1.3">
+    <javac srcdir="${src}" destdir="${classes}" debug="on"
+           classpath="{classes}" target="1.7" source="1.7" encoding="iso-8859-1">
       <include name="org/htmlparser/lexer/*.java"/>
       <include name="org/htmlparser/nodes/*.java"/>
       <include name="org/htmlparser/Attribute.java"/>
@@ -290,7 +273,8 @@ Update the Web Site
 
   <target name="compileparser" depends="compilelexer" description="compile parser java files">
     <mkdir dir="${classes}"/>
-    <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="{classes}:${sax2.jar}" source="1.3">
+    <javac srcdir="${src}" destdir="${classes}" debug="on"
+           classpath="{classes}:${sax2.jar}" source="1.7" encoding="iso-8859-1">
       <include name="org/htmlparser/**/*.java"/>
       <exclude name="org/htmlparser/tests/**"/>
       <exclude name="org/htmlparser/lexerapplications/**/*.java"/>
@@ -367,11 +351,12 @@ Update the Web Site
   </target>
 
   <!-- Create the Thumbelina jar -->
-  <target name="thumbelina" depends="JDK_OK,jarlexer" description="create thumbelina.jar" if="JDK1.5">
+  <target name="thumbelina" depends="jarlexer" description="create thumbelina.jar">
     <!-- Create the lib directory -->
     <mkdir dir="${lib}"/>
     <mkdir dir="${classes}"/>
-    <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="${classes}:${lib}/htmllexer.jar" source="1.5">
+    <javac srcdir="${src}" destdir="${classes}" debug="on"
+           classpath="${classes}:${lib}/htmlparser.jar" source="1.7" encoding="iso-8859-1">
       <include name="org/htmlparser/lexerapplications/thumbelina/**/*.java"/>
     </javac>
     <jar jarfile="${lib}/thumbelina.jar"
@@ -386,11 +371,13 @@ Update the Web Site
   </target>
 
   <!-- Create the FilterBuilder jar -->
-  <target name="filterbuilder" depends="JDK_OK,jarparser" description="create filterbuilder.jar" if="JDK1.4">
+  <target name="filterbuilder" depends="jarparser" description="create filterbuilder.jar">
     <!-- Create the lib directory -->
     <mkdir dir="${lib}"/>
     <mkdir dir="${classes}"/>
-    <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="${classes}:${lib}/htmlparser.jar" source="1.3">
+    <javac srcdir="${src}" destdir="${classes}" debug="on"
+           classpath="${classes}:${lib}/htmlparser.jar" source="1.7"
+           encoding="iso-8859-1">
       <include name="org/htmlparser/parserapplications/filterbuilder/**/*.java"/>
     </javac>
     <jar jarfile="${lib}/filterbuilder.jar"
@@ -414,7 +401,9 @@ Update the Web Site
   <!-- Run the unit tests -->
   <target name="test" depends="jar" description="run the JUnit tests">
     <mkdir dir="${classes}"/>
-    <javac srcdir="${src}" destdir="${classes}" includes="org/htmlparser/tests/**" debug="on" source="1.3">
+    <javac srcdir="${src}" destdir="${classes}"
+           includes="org/htmlparser/tests/**" debug="on" source="1.7"
+           encoding="iso-8859-1">
       <classpath>
         <pathelement location="${classes}"/>
         <pathelement location="${junit.jar}"/>
@@ -435,17 +424,17 @@ Update the Web Site
   </target>
 
   <!-- Create the javadoc for the project -->
-  <target name="javadoc" depends="JDK_OK,JDK_Warning,init" description="create JavaDoc (API) documentation">
+  <target name="javadoc" depends="init" description="create JavaDoc (API) documentation">
     <mkdir dir="${classes}"/>
-    <javac srcdir="${resources}" includes="HtmlTaglet.java" classpath="${classes}"/>
+    <javac srcdir="${resources}"
+           classpath="${classes}" encoding="iso-8859-1"/>
     <mkdir dir="${docs}/javadoc"/>
     <property name="javadoc.doctitle" value="HTML Parser ${versionNumber}"/>
     <property name="javadoc.header" value="&lt;A HREF=&quot;http://htmlparser.sourceforge.net&quot; target=&quot;_top&quot;>HTML Parser Home Page&lt;/A>"/>
     <property name="javadoc.footer" value="&amp;copy; 2005 Derrick Oswald&lt;div align=&quot;right&quot;&gt;${TODAY_STRING}&lt;/div&gt;"/>
     <property name="javadoc.bottom" value="&lt;table width='100%'&gt;&lt;tr&gt;&lt;td&gt;HTML Parser is an open source library released under
     &lt;a HREF=&quot;http://www.opensource.org/licenses/lgpl-license.html&quot; target=&quot;_top&quot;&gt;LGPL&lt;/a&gt;.&lt;/td&gt;&lt;td align='right'&gt;
-    &lt;a HREF=&quot;http://sourceforge.net/projects/htmlparser&quot; target=&quot;_top&quot;&gt;
-    &lt;img src=&quot;http://sourceforge.net/sflogo.php?group_id=24399&amp;type=1&quot; width=&quot;88&quot; height=&quot;31&quot; border=&quot;0&quot; alt=&quot;SourceForge.net&quot;&gt;&lt;/a&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;"/>
+    &lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;"/>
     <javadoc packagenames="org.htmlparser.*"
            sourcepath="${src}"
            classpath="${classes}"
@@ -462,7 +451,6 @@ Update the Web Site
       <header>${javadoc.header}</header>
       <bottom>${javadoc.bottom}</bottom>
       <footer>${javadoc.footer}</footer>
-      <taglet name="HtmlTaglet" path="${resources}:${classes}"/>
       <group title="Main Package" packages="org.htmlparser"/>
       <group title="Example Applications" packages="org.htmlparser.parserapplications,org.htmlparser.lexerapplications.tabby,org.htmlparser.lexerapplications.thumbelina,org.htmlparser.parserapplications.filterbuilder*"/>
       <group title="Nodes" packages="org.htmlparser.nodes,org.htmlparser.tags"/>
@@ -477,23 +465,19 @@ Update the Web Site
       <link href="http://www.saxproject.org/apidoc/"/>
     </javadoc>
     <copy file="${resources}/inherit.gif" tofile="${docs}/javadoc/resources/inherit.gif" overwrite="true"/>
-    <delete file="${resources}/HtmlTaglet.class"/>
   </target>
 
     <!-- Create the javadoc for the project -->
-  <target name="checkjavadoc" depends="JDK_OK,JDK_Warning,init" description="create JavaDoc (API) documentation">
+  <target name="checkjavadoc" depends="init" description="create JavaDoc (API) documentation">
     <mkdir dir="${classes}"/>
-    <javac srcdir="${resources}" includes="HtmlTaglet.java" classpath="${classes}"/>
+    <javac srcdir="${resources}"
+           classpath="${classes}" encoding="iso-8859-1"/>
     <mkdir dir="${docs}/checkjavadoc"/>
     <property name="javadoc.doctitle" value="HTML Parser ${versionNumber}"/>
-    <property name="javadoc.header" value="&lt;A HREF=&quot;http://htmlparser.sourceforge.net&quot; target=&quot;_top&quot;>HTML Parser Home Page&lt;/A>"/>
+    <property name="javadoc.header" value=""/>
     <property name="javadoc.footer" value="&amp;copy; 2005 Derrick Oswald&lt;div align=&quot;right&quot;&gt;${TODAY_STRING}&lt;/div&gt;"/>
-    <property name="javadoc.bottom" value="&lt;table width='100%'&gt;&lt;tr&gt;&lt;td&gt;HTML Parser is an open source library released under
-    &lt;a HREF=&quot;http://www.opensource.org/licenses/lgpl-license.html&quot; target=&quot;_top&quot;&gt;LGPL&lt;/a&gt;.&lt;/td&gt;&lt;td align='right'&gt;
-    &lt;a HREF=&quot;http://sourceforge.net/projects/htmlparser&quot; target=&quot;_top&quot;&gt;
-    &lt;img src=&quot;http://sourceforge.net/sflogo.php?group_id=24399&amp;type=1&quot; width=&quot;88&quot; height=&quot;31&quot; border=&quot;0&quot; alt=&quot;SourceForge.net&quot;&gt;&lt;/a&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;"/>
-    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
-           docletpath="/home/derrick/htmlparser_cvs/htmlparser/doccheck1.2b2/doccheck.jar"
+    <property name="javadoc.bottom" value=""/>
+    <javadoc
            packagenames="org.htmlparser.*"
            sourcepath="${src}"
            classpath="${classes}"
@@ -505,7 +489,6 @@ Update the Web Site
            overview="${src}/doc-files/overview.html">
     </javadoc>
     <copy file="${resources}/inherit.gif" tofile="${docs}/javadoc/resources/inherit.gif" overwrite="true"/>
-    <delete file="${resources}/HtmlTaglet.class"/>
   </target>
 
   <target name="release" depends="jar,thumbelina,filterbuilder,javadoc" description="prepare the release files">

diff --git a/docs/mailinglists.html b/docs/mailinglists.html
@@ -15,7 +15,7 @@ <h2>HTML Parser Mailing Lists</h2>
     Join this list if you are interested in new releases of HTML Parser.
     Notifications of releases will be put on this list.<br>
     Monitoring of intermediate releases is also possible by clicking on the
-    <img src="http://images.sourceforge.net/images/ic/mail16d.png" alt="envelope icon">
+    <img src="" alt="envelope icon">
     in the <em>Notes / Monitor</em> column of the <em>Latest File Releases</em>
     list on the <a href="http://sourceforge.net/projects/htmlparser" target="_parent">project page</a>.
   <p><a href="http://lists.sourceforge.net/lists/listinfo/htmlparser-user">

diff --git a/docs/main.html b/docs/main.html
@@ -112,7 +112,7 @@ <h2><a name=transformation>Transformation</a></h2>
     <a href="http://www.opensource.org/licenses/lgpl-license.html">LGPL license</a>.
   <div align="right">
       <a href="http://sourceforge.net/projects/htmlparser" target="_parent">
-          <img src="http://sourceforge.net/sflogo.php?group_id=24399&type=1" width="88" height="31" border="0" alt="SourceForge.net">
+          <img src="" width="88" height="31" border="0" alt="SourceForge.net">
       </a>
   </div>
 </body>