Merge pull request #49 from secure-software-engineering/fix/update-doc-exporter-doclet

Change xml-doclet package name and artifact ID

Author: oshando

doc-xml-exporter-doclet/pom.xml

@@ -8,9 +8,9 @@
     <description>Javadoc NLP Corpus Generation Doclet</description>
     <url>https://www.semanticsoftware.info/javadoclet</url>
 
-    <groupId>info.semanticsoftware</groupId>
-    <artifactId>ssldoclet</artifactId>
-    <version>1.2</version>
+    <groupId>de.fraunhofer.iem.doclet</groupId>
+    <artifactId>xml-doclet</artifactId>
+    <version>1.3</version>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
@@ -33,19 +33,6 @@
     </profiles>
 
     <dependencies>
-
-        <!--dependency>
-            <groupId>javadoc</groupId>
-            <artifactId>javadoc</artifactId>
-            <version>1.3</version>
-        </dependency-->
-        <!--dependency>
-            <groupId>jdk.tools</groupId>
-            <artifactId>jdk.tools</artifactId>
-            <version>1.8</version>
-            <scope>system</scope>
-            <systemPath>${java.home}/../lib/tools.jar</systemPath>
-        </dependency-->
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>

…o/semanticsoftware/doclet/SSLDoclet.java …fraunhofer/iem/doclet/xml/XMLDoclet.javadoc-xml-exporter-doclet/src/main/java/info/semanticsoftware/doclet/SSLDoclet.java renamed to doc-xml-exporter-doclet/src/main/java/de/fraunhofer/iem/doclet/xml/XMLDoclet.java doc-xml-exporter-doclet/src/main/java/info/semanticsoftware/doclet/SSLDoclet.java renamed to doc-xml-exporter-doclet/src/main/java/de/fraunhofer/iem/doclet/xml/XMLDoclet.java

@@ -20,12 +20,12 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package info.semanticsoftware.doclet;
+package de.fraunhofer.iem.doclet.xml;
 
 import com.sun.source.doctree.DocCommentTree;
 import com.sun.source.util.DocTrees;
 import com.sun.source.util.TreePath;
-import info.semanticsoftware.doclet.xml.XMLSerializer;
+import de.fraunhofer.iem.doclet.xml.serializer.XMLSerializer;
 import jdk.javadoc.doclet.Doclet;
 import jdk.javadoc.doclet.DocletEnvironment;
 import jdk.javadoc.doclet.Reporter;
@@ -48,7 +48,7 @@
  * @author Ninus
  * @version 1.2
  */
-public class SSLDoclet implements Doclet {
+public class XMLDoclet implements Doclet {
 
     private static final boolean OK = true;
     private String sourcePath;
@@ -58,7 +58,7 @@ public class SSLDoclet implements Doclet {
     static DocTrees docTrees;
     static DocletEnvironment environment;
 
-    final private Logger log = Logger.getLogger(SSLDoclet.class.getName());
+    final private Logger log = Logger.getLogger(XMLDoclet.class.getName());
 
     abstract class Option implements Doclet.Option {
         private final String name;

…emanticsoftware/doclet/xml/SSLDoclet.xsd …/iem/doclet/xml/serializer/SSLDoclet.xsddoc-xml-exporter-doclet/src/main/java/info/semanticsoftware/doclet/xml/SSLDoclet.xsd renamed to doc-xml-exporter-doclet/src/main/java/de/fraunhofer/iem/doclet/xml/serializer/SSLDoclet.xsd doc-xml-exporter-doclet/src/main/java/info/semanticsoftware/doclet/xml/SSLDoclet.xsd renamed to doc-xml-exporter-doclet/src/main/java/de/fraunhofer/iem/doclet/xml/serializer/SSLDoclet.xsd

@@ -20,7 +20,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-package info.semanticsoftware.doclet.xml;
+package de.fraunhofer.iem.doclet.xml.serializer;
 
 import org.jsoup.Jsoup;
 import org.w3c.dom.DOMException;

…icsoftware/doclet/xml/XMLSerializer.java …doclet/xml/serializer/XMLSerializer.javadoc-xml-exporter-doclet/src/main/java/info/semanticsoftware/doclet/xml/XMLSerializer.java renamed to doc-xml-exporter-doclet/src/main/java/de/fraunhofer/iem/doclet/xml/serializer/XMLSerializer.java doc-xml-exporter-doclet/src/main/java/info/semanticsoftware/doclet/xml/XMLSerializer.java renamed to doc-xml-exporter-doclet/src/main/java/de/fraunhofer/iem/doclet/xml/serializer/XMLSerializer.java

@@ -205,6 +205,12 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>de.fraunhofer.iem.doclet</groupId>
+            <artifactId>xml-doclet</artifactId>
+            <version>1.3</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <distributionManagement>

swan-pipeline/pom.xml

@@ -10,7 +10,7 @@
  */
 public class DocletExecutor {
 
-    public static final String SSL_DOCLET = "info.semanticsoftware.doclet.SSLDoclet";
+    public static final String SSL_DOCLET = "de.fraunhofer.iem.doclet.xml.XMLDoclet";
     public static final String COVERAGE_DOCLET = "de.fraunhofer.iem.coveragedoclet.CoverageDoclet";
     public static final String STANDARD_DOCLET = "com.sun.tools.doclets.standard.Standard";
 
@@ -64,7 +64,7 @@ public void runDoclet(String sourcePath, String packages) {
     private String getDocletPath(String doclet) {
         switch (doclet) {
             case SSL_DOCLET:
-                return "swan-javadoc-exporter/target/classes";
+                return "../doc-xml-exporter-doclet/target/classes";
             case COVERAGE_DOCLET:
                 return "../doc-coverage-doclet/target/classes/";
             case STANDARD_DOCLET: