Minor change to look for xml files from JAR. Added assembly for console bot.

Author: agkphysics

JavaBot/dependency-reduced-pom.xml

@@ -4,14 +4,21 @@
   <groupId>agk</groupId>
   <artifactId>chatbot</artifactId>
   <name>CBR Chat Bot</name>
-  <version>2.3.1</version>
+  <version>2.3.5</version>
   <description>An interactive chat bot using case based reasoning.
 
 This web chat bot uses CBR techniques to have an English conversation with a user.
 It is a summer project I worked on while studying at the University of Auckland, over the 2016-2017 holidays.</description>
   <url>https://github.com/agkphysics/ChatBot</url>
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.0.2</version>
+        <configuration>
+          <excludes>xmlconv/**</excludes>
+        </configuration>
+      </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
         <version>3.0.2</version>
@@ -33,13 +40,6 @@ It is a summer project I worked on while studying at the University of Auckland,
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>3.0.2</version>
-        <configuration>
-          <excludes>xmlconv/**</excludes>
-        </configuration>
-      </plugin>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
         <version>3.0.0</version>
@@ -85,6 +85,7 @@ It is a summer project I worked on while studying at the University of Auckland,
             <configuration>
               <outputDirectory>${project.build.directory}/depsrc</outputDirectory>
               <classifier>sources</classifier>
+              <excludeTransitive>true</excludeTransitive>
             </configuration>
           </execution>
         </executions>
@@ -117,8 +118,9 @@ It is a summer project I worked on while studying at the University of Auckland,
           <descriptors>
             <descriptor>src/assembly/src.xml</descriptor>
             <descriptor>src/assembly/webapp.xml</descriptor>
+            <descriptor>src/assembly/console.xml</descriptor>
           </descriptors>
-          <tarLongFileMode>posix</tarLongFileMode>
+          <tarLongFileMode>gnu</tarLongFileMode>
         </configuration>
       </plugin>
     </plugins>

JavaBot/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>agk</groupId>
     <artifactId>chatbot</artifactId>
-    <version>2.3.1</version>
+    <version>2.3.5</version>
     <packaging>jar</packaging>
 
     <name>CBR Chat Bot</name>
@@ -222,8 +222,9 @@ It is a summer project I worked on while studying at the University of Auckland,
                     <descriptors>
                         <descriptor>src/assembly/src.xml</descriptor>
                         <descriptor>src/assembly/webapp.xml</descriptor>
+                        <descriptor>src/assembly/console.xml</descriptor>
                     </descriptors>
-                    <tarLongFileMode>posix</tarLongFileMode>
+                    <tarLongFileMode>gnu</tarLongFileMode>
                 </configuration>
                 <executions>
                     <execution>

JavaBot/src/assembly/console.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+    <id>console</id>
+    
+    <formats>
+        <format>tar.bz2</format>
+    </formats>
+    
+    <fileSets>
+        <fileSet>
+            <directory>${project.build.directory}</directory>
+            <outputDirectory>.</outputDirectory>
+            <includes>
+                <include>xmlconv/</include>
+                <include>${project.build.finalName}.jar</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>

JavaBot/src/assembly/webapp.xml

@@ -3,7 +3,6 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
     <id>webapp</id>
-    <baseDirectory>${project.build.finalName}-webapp</baseDirectory>
 
     <formats>
         <format>tar.bz2</format>

JavaBot/src/main/java/agk/chatbot/ChatBot.java

@@ -155,7 +155,7 @@ public ChatBot(Path p) throws FileNotFoundException {
         if (p != null && Files.exists(p)) {
             corpusPath = p;
         } else {
-            String[] locations = { "xmlconv", "lib/xmlconv", "xml", "xmlcorpus" };
+            String[] locations = { "xmlconv/", "lib/xmlconv/", "xml/", "xmlcorpus/" };
             for (String loc : locations) {
                 URL xmlURL = ChatBot.class.getClassLoader().getResource(loc);
                 if (xmlURL != null) {
@@ -169,6 +169,9 @@ public ChatBot(Path p) throws FileNotFoundException {
                     } catch (URISyntaxException e) {
                         e.printStackTrace();
                     }
+                } else if (Files.exists(Paths.get(loc))) {
+                    corpusPath = Paths.get(loc);
+                    break;
                 }
             }
             if (corpusPath == null) throw new FileNotFoundException("No valid corpus path given or found.");