Merge pull request #7 from rmraya/modular-java

Modular java
rmraya · Nov 24, 2022 · 6fa4e6b · 6fa4e6b
2 parents 137b444 + 28213a0
commit 6fa4e6b
Show file tree

Hide file tree

Showing 153 changed files with 5,030 additions and 8,179 deletions.
diff --git a/.classpath b/.classpath
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="jars/dtd.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="jars/json.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="jars/jsoup.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="jars/mapdb.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="jars/openxliff.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="jars/swordfish.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="jars/swt.jar">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="jars/h2-1.4.200.jar"/>
+	<classpathentry kind="output" path="out"/>
+</classpath>
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,15 @@
 .DS_Store
+jars/fluenta.jar
+jars/swt.jar
+out
 bin
-lib/fluenta.jar
-.vscode
+conf
+include
+legal
+lib
+release
+docs/out
+dist
+.vscode/launch.json
+.vscode/settings.json
+.scannerwork
diff --git a/.project b/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>FluentaPRO</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1665402055362</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/README.md b/README.md
@@ -28,31 +28,26 @@ The version of Fluenta included in the official installers from [Fluenta's Home
 Subscription version includes unlimited email support at [email protected]
 
 ### Differences sumary
+
 Differences | Source Code | Subscription Based
--|----------- | -------------
+-|:----------:|:-------------:
 Ready To Use Installers| No | Yes
 Notarized macOS launcher| No | Yes
 Signed launcher and installer for Windows | No | Yes
 Restricted Features | None | None
-Technical Support |  Peer support at  [Groups.io](https://groups.io/g/maxprograms/)| - Direct email at [email protected]  <br> - Peer support at [Groups.io](https://groups.io/g/maxprograms/)
-
+Technical Support |  Peer support at  [Groups.io](https://groups.io/g/maxprograms/)| - Direct email at [email protected] <br> - Peer support at [Groups.io](https://groups.io/g/maxprograms/)
 
 ## Installers
-Ready to use installers are available at https://www.maxprograms.com/products/fluenta.html
 
-## Building Yourself
-You need JAVA 17 and [Apache Ant 1.10.12](https://ant.apache.org) or newer
+Ready to use installers are available at <https://www.maxprograms.com/products/fluenta.html>
 
- - Checkout this repository
- - Point your JAVA_HOME variabe to JDK 17
- - Run `ant ` to compile the source code
+## Building Yourself
 
-### Steps for building
+You need JAVA 17 and [Apache Ant 1.10.12](https://ant.apache.org) or newer
 
-``` bash
-  git clone https://github.com/rmraya/Fluenta.git
-  cd Fluenta
-  ant 
-```
+- Checkout this repository
+- Point your JAVA_HOME variable to JDK 17
+- Copy the appropriate version of `swt.jar` from `SWT` folder to `jars` folder
+- Run `ant` to compile the source code
 
-Use the `.bat` or `.sh` launchers included in the project to run Fluenta.
+Use  `fluenta.bat`, `fluenta_mac.sh` of `fluenta_linux.sh` to run Fluenta.
diff --git a/SWT/aarch64/swt.jar b/SWT/aarch64/swt.jar
diff --git a/lib/gtk64/swt.jar → SWT/gtk64/swt.jar b/lib/gtk64/swt.jar → SWT/gtk64/swt.jar
diff --git a/lib/mac64/swt.jar → SWT/mac64/swt.jar b/lib/mac64/swt.jar → SWT/mac64/swt.jar
diff --git a/lib/win64/swt.jar → SWT/win64/swt.jar b/lib/win64/swt.jar → SWT/win64/swt.jar
diff --git a/build.xml b/build.xml
@@ -1,32 +1,105 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="compile" name="Fluenta">
-    <property name="target" value="11"/>
-    <property name="source" value="11"/>
-    <property name="build.compiler" value="javac10+"/>
+<project basedir="." default="dist" name="Fluenta">
+    <property name="target" value="17" />
+    <property name="source" value="17" />
+    <property name="build.compiler" value="javac10+" />
     <path id="Fluenta.classpath">
-        <pathelement location="lib/dtd.jar"/>
-        <pathelement location="lib/h2-1.4.200.jar"/>
-        <pathelement location="lib/json.jar"/>
-        <pathelement location="lib/jsoup.jar"/>
-        <pathelement location="lib/mapdb.jar"/>
-        <pathelement location="lib/openxliff.jar"/>
-        <pathelement location="lib/mac64/swt.jar"/>
+        <pathelement location="jars/dtd.jar" />
+        <pathelement location="jars/h2-1.4.200.jar" />
+        <pathelement location="jars/json.jar" />
+        <pathelement location="jars/jsoup.jar" />
+        <pathelement location="jars/mapdb.jar" />
+        <pathelement location="jars/openxliff.jar" />
+        <pathelement location="jars/swordfish.jar" />
+        <pathelement location="jars/swt.jar" />
     </path>
+    <condition property="isWindows">
+        <os family="windows" />
+    </condition>
     <target name="init">
-        <mkdir dir="bin"/>
-        <copy includeemptydirs="false" todir="bin">
+        <mkdir dir="out" />
+        <copy includeemptydirs="false" todir="out">
             <fileset dir="src">
-                <exclude name="**/*.java"/>
+                <exclude name="**/*.java" />
+                <exclude name="**/*.xcf" />
             </fileset>
         </copy>
     </target>
     <target name="clean">
-        <delete dir="bin"/>
+        <delete dir="out" />
+        <delete dir="bin" />
+        <delete dir="conf" />
+        <delete dir="include" />
+        <delete dir="legal" />
+        <delete dir="lib" />
     </target>
     <target name="compile" depends="clean,init">
         <description>Build jar file</description>
-        <delete file="lib/fluenta.jar"/>
-        <javac srcdir="src" destdir="bin" classpathref="Fluenta.classpath" modulepathref="Fluenta.classpath" includeAntRuntime="false"/>
-        <jar destfile="lib/fluenta.jar" basedir="bin"/>
+        <delete file="jars/fluenta.jar" failonerror="false" />
+        <javac srcdir="src" destdir="out" classpathref="Fluenta.classpath" modulepathref="Fluenta.classpath" includeAntRuntime="false" />
+        <jar destfile="jars/fluenta.jar" basedir="out" />
     </target>
-</project>
+    <target name="distclean">
+        <delete dir="dist" failonerror="false" />
+        <delete dir="bin" failonerror="false" />
+        <delete dir="conf" failonerror="false" />
+        <delete dir="include" failonerror="false" />
+        <delete dir="legal" failonerror="false" />
+        <delete dir="lib" failonerror="false" />
+        <delete file="release" />
+    </target>
+    <target name="copyWindows" if="isWindows">
+        <description>Move java binaries to work folder</description>
+        <move todir=".\bin">
+            <fileset dir="dist\bin" />
+        </move>
+        <move todir=".\conf">
+            <fileset dir="dist\conf" />
+        </move>
+        <move todir=".\include">
+            <fileset dir="dist\include" />
+        </move>
+        <move todir=".\legal">
+            <fileset dir="dist\legal" />
+        </move>
+        <move todir=".\lib">
+            <fileset dir="dist\lib" />
+        </move>
+        <move file="dist\release" todir="." />
+        <delete dir="dist" failonerror="true" />
+        <delete file=".\jars\fluenta.jar" />
+        <copy file=".\jars\h2-1.4.200.jar" todir="lib" />
+    </target>
+    <target name="copyUnix" unless="isWindows">
+        <description>Move java binaries to work folder</description>
+        <move todir="./bin">
+            <fileset dir="dist/bin" />
+        </move>
+        <move todir="./conf">
+            <fileset dir="dist/conf" />
+        </move>
+        <move todir="./include">
+            <fileset dir="dist/include" />
+        </move>
+        <move todir="./legal">
+            <fileset dir="dist/legal" />
+        </move>
+        <move todir="./lib">
+            <fileset dir="dist/lib" />
+        </move>
+        <move file="dist/release" todir="." />
+        <delete dir="dist" failonerror="false" />
+        <delete file="jars/fluenta.jar" />
+        <copy file="jars/h2-1.4.200.jar" todir="lib" />
+    </target>
+    <target name="link" depends="distclean,compile">
+        <description>Build Java binaries</description>
+        <link destDir="dist" modulepath="jars:${java.home}/jmods">
+            <module name="fluenta" />
+        </link>
+        <delete file="dist/lib/jrt-fs.jar" />
+    </target>
+    <target name="dist" depends="link,copyWindows,copyUnix">
+        <description>Prepare distribution</description>
+    </target>
+</project>
diff --git a/catalog/catalog.xml b/catalog/catalog.xml
@@ -135,6 +135,7 @@
 	<nextCatalog catalog="dita1.3/catalog.xml" />
 	<nextCatalog catalog="dita1.2/catalog-dita.xml" />
 	<nextCatalog catalog="dita1.2/catalog-dita-xsd.xml" />
+	<nextCatalog catalog="dita-lwdita/catalog-dita.xml" />
 
 	<!-- 
 	<nextCatalog catalog="dita1.1/catalog-dita.xml"/> 	

diff --git a/catalog/dita-lwdita/catalog-dita.xml b/catalog/dita-lwdita/catalog-dita.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" ?>
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
+         prefer="public">
+
+  <public publicId="-//OASIS//DTD LIGHTWEIGHT DITA Topic//EN" uri="dtd/lw-topic.dtd"/>
+  <public publicId="-//OASIS//DTD LIGHTWEIGHT DITA Map//EN" uri="dtd/lw-map.dtd"/>
+
+  <public publicId="-//OASIS//ELEMENTS LIGHTWEIGHT DITA Topic//EN" uri="dtd/lw-topic.mod"/>
+  <public publicId="-//OASIS//ELEMENTS LIGHTWEIGHT DITA Map//EN" uri="dtd/lw-map.mod"/>
+
+  <public publicId="-//OASIS//ELEMENTS LIGHTWEIGHT DITA Highlight Domain//EN" uri="dtd/lw-highlightDomain.mod"/>
+
+  <!-- The following values are deprecated, kept only for compatibility with the previous version -->
+
+  <public publicId="-//OASIS//DTD XDITA Topic//EN" uri="dtd/lw-topic.dtd"/>
+  <public publicId="-//OASIS//DTD XDITA Map//EN" uri="dtd/lw-map.dtd"/>
+
+  <public publicId="-//OASIS//ELEMENTS XDITA Topic//EN" uri="dtd/lw-topic.mod"/>
+  <public publicId="-//OASIS//ELEMENTS XDITA Map//EN" uri="dtd/lw-map.mod"/>
+
+  <!-- <public publicId="-//OASIS//ELEMENTS XDITA Highlight Domain//EN" uri="dtd/highlightDomain.mod"/> -->
+
+  <public publicId="-//OASIS//DTD LW DITA Topic//EN" uri="dtd/lw-topic.dtd"/>
+  <public publicId="-//OASIS//DTD LW DITA Map//EN" uri="dtd/lw-map.dtd"/>
+
+  <public publicId="-//OASIS//ELEMENTS LW DITA Topic//EN" uri="dtd/lw-topic.mod"/>
+  <public publicId="-//OASIS//ELEMENTS LW DITA Map//EN" uri="dtd/lw-map.mod"/>
+
+  <public publicId="-//OASIS//ELEMENTS LW DITA Highlight Domain//EN" uri="dtd/lw-highlightDomain.mod"/>
+
+</catalog>
diff --git a/catalog/dita-lwdita/dtd/license.txt b/catalog/dita-lwdita/dtd/license.txt
@@ -0,0 +1,2 @@
+Copyright © OASIS Open 2018. All Rights Reserved.
+Distributed under the terms of the OASIS IPR Policy, [http://www.oasis-open.org/policies-guidelines/ipr], AS-IS, WITHOUT ANY IMPLIED OR EXPRESS WARRANTY; there is no warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE or NONINFRINGEMENT of the rights of others.
diff --git a/catalog/dita-lwdita/dtd/lw-highlightDomain.mod b/catalog/dita-lwdita/dtd/lw-highlightDomain.mod
@@ -0,0 +1,79 @@
+<!-- ============================================================= -->
+<!--                    HEADER                                     -->
+<!-- ============================================================= -->
+<!--  MODULE:    Lightweight DITA Highlighting Domain              -->
+<!--  VERSION:   1.0                                               -->
+<!--  DATE:      XXX                                               -->
+<!--                                                               -->
+<!-- ============================================================= -->
+
+<!-- ============================================================= -->
+<!--                    PUBLIC DOCUMENT TYPE DEFINITION            -->
+<!--                    TYPICAL INVOCATION                         -->
+<!--                                                               -->
+<!--  Refer to this file by the following public identifier or an
+      appropriate system identifier:
+PUBLIC "-//OASIS//ELEMENTS LIGHTWEIGHT DITA Highlight Domain//EN"
+      Delivered as file "lw-highlightDomain.mod"                      -->
+
+<!-- ============================================================= -->
+<!-- SYSTEM:     Lightweight DITA                                  -->
+<!--                                                               -->
+<!-- PURPOSE:    Declaring the elements and specialization         -->
+<!--             attributes for the LwDITA highlighting domain     -->
+<!--                                                               -->
+<!-- ORIGINAL CREATION DATE:                                       -->
+<!--             XXXX                                              -->
+<!--                                                               -->
+<!--             (C) OASIS                                         -->
+<!--             All Rights Reserved.                              -->
+<!--                                                               -->
+<!--  UPDATES:                                                     -->
+<!--    25 Nov 2014 KJE: Upload files to DITA TC SVN repo          -->
+<!--    16 May 2016  MG: Upload files to GitHub repo               -->
+<!--    11 Jun 2017 KJE: Added headers and update logs             -->
+<!--    14 Jun 2017 RDA: Added @outputclass                        -->
+<!--    25 Jul 2017  CE: Changed public identifier to LIGHTWEIGHT  -->
+<!--                     DITA                                      -->
+<!--     1 Mar 2018  CE: Renamed file to lw-highlightDomain.mod    -->
+<!-- ============================================================= -->
+
+<!--                    LONG NAME: Bold content  -->
+<!ELEMENT b             (%all-inline;)*        >
+<!ATTLIST b
+             %localization;
+             %variable-content;
+             outputclass  CDATA          #IMPLIED
+             class CDATA "+ topic/ph hi-d/b ">
+
+<!--                    LONG NAME: Italic content  -->
+<!ELEMENT i             (%all-inline;)*        >
+<!ATTLIST i
+             %localization;
+             %variable-content;
+             outputclass  CDATA          #IMPLIED
+             class CDATA "+ topic/ph hi-d/i ">
+
+<!--                    LONG NAME: Underlined content  -->
+<!ELEMENT u             (%all-inline;)*        >
+<!ATTLIST u
+             %localization;
+             %variable-content;
+             outputclass  CDATA          #IMPLIED
+             class CDATA "+ topic/ph hi-d/u ">
+
+<!--                    LONG NAME: Superscript content  -->
+<!ELEMENT sup             (%all-inline;)*        >
+<!ATTLIST sup
+             %localization;
+             %variable-content;
+             outputclass  CDATA          #IMPLIED
+             class CDATA "+ topic/ph hi-d/sup ">
+
+<!--                    LONG NAME: Subscript content  -->
+<!ELEMENT sub             (%all-inline;)*        >
+<!ATTLIST sub
+             %localization;
+             %variable-content;
+             outputclass  CDATA          #IMPLIED
+             class CDATA "+ topic/ph hi-d/sub ">
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Copyright © OASIS Open 2018. All Rights Reserved.
		Distributed under the terms of the OASIS IPR Policy, [http://www.oasis-open.org/policies-guidelines/ipr], AS-IS, WITHOUT ANY IMPLIED OR EXPRESS WARRANTY; there is no warranty of MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE or NONINFRINGEMENT of the rights of others.