Merge pull request #1373 from afs/ui-package

GH-1372: Deliver Fuseki UI as a jar file

Author: afs

jena-fuseki2/jena-fuseki-ui/pom.xml

@@ -93,6 +93,23 @@
                     -->
                 </executions>
             </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-jar-plugin</artifactId>
+              <configuration>
+                <classesDirectory>${project.build.directory}</classesDirectory>
+                <includes>
+                  <include>webapp/**</include>
+                </includes>
+              </configuration>
+              <executions>
+                <execution>
+                  <goals>
+                    <goal>test-jar</goal>
+                  </goals>
+                </execution>
+              </executions>
+            </plugin>
         </plugins>
     </build>
 </project>

jena-fuseki2/jena-fuseki-ui/vue.config.js

@@ -68,7 +68,7 @@ module.exports = {
   },
   // Change build paths to make them Maven compatible
   // see https://cli.vuejs.org/config/
-  outputDir: 'target/dist',
+  outputDir: 'target/webapp',
   assetsDir: 'static',
   css: {
     loaderOptions: {

jena-fuseki2/jena-fuseki-war/pom.xml

@@ -41,11 +41,13 @@
     </dependency>
 
     <!-- frontend assets (HTML, JS, CSS, images, etc.) -->
+    <!-- Currently done by unpacking in jena-fuseki-webapp
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-fuseki-ui</artifactId>
       <version>${project.version}</version>
     </dependency>
+    -->
 
     <!-- Require a logging implementation -->
     <dependency>

jena-fuseki2/jena-fuseki-webapp/pom.xml

@@ -73,11 +73,13 @@
     </dependency>
 
     <!-- frontend assets (HTML, JS, CSS, images, etc.) -->
+    <!-- Currently done by unpacking.
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-fuseki-ui</artifactId>
       <version>${project.version}</version>
     </dependency>
+    -->
 
     <!-- Logging  -->  
     <dependency>
@@ -142,17 +144,6 @@
         <filtering>false</filtering>
         <directory>src/main/webapp/</directory>
         <targetPath>${project.build.directory}/webapp/</targetPath>
-        <excludes>
-          <exclude>index.html</exclude>
-        </excludes>
-      </resource>
-      <resource>
-        <filtering>false</filtering>
-        <directory>../jena-fuseki-ui/target/dist/</directory>
-        <targetPath>${project.build.directory}/webapp/</targetPath>
-        <includes>
-          <include>**/*.*</include>
-        </includes>
       </resource>
     </resources>
 
@@ -189,6 +180,28 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack</id>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.jena</groupId>
+                  <artifactId>jena-fuseki-ui</artifactId>
+                  <version>${project.version}</version>
+                  <type>jar</type>
+                  <outputDirectory>${project.build.directory}</outputDirectory>
+                  <includes>webapp/**/*.*</includes>
+                </artifactItem> 
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+
         <configuration>
           <overWriteReleases>false</overWriteReleases>
           <overWriteIfNewer>true</overWriteIfNewer>