Remove MVC ui support.

docker-compose.yml

@@ -1,17 +1,17 @@
 version: '3'
+
 services:
   wise-api:
+    container_name: wise-api
+    image: wise-api:latest
     build:
       context: ./wise-api
       dockerfile: Dockerfile
     ports:
       - "8080:8080"
-#    environment:
+  wise-ui:
-#      SPRING_DATASOURCE_URL: jdbc:mysql://mysql:3306/product
+    container_name: wise-ui
-#      SPRING_DATASOURCE_USERNAME: product_user
+    image: wise-ui:latest
-#      SPRING_DATASOURCE_PASSWORD: product_user_password
-
-  react-app:
     build:
       context: ./wise-ui
       dockerfile: Dockerfile

pom.xml

@@ -1,154 +0,0 @@
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                      http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <properties>
-        <com.wisemapping.version>5.1.0-SNAPSHOT</com.wisemapping.version>
-        <superpom.dir>${project.basedir}/wise-webapps</superpom.dir>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
-    <scm>
-        <developerConnection>scm:git:git@bitbucket.org:wisemapping/wisemapping-open-source.git</developerConnection>
-    </scm>
-
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wisemapping</groupId>
-    <artifactId>wisemapping</artifactId>
-    <name>WiseMapping Project</name>
-    <version>5.1.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <licenses>
-        <license>
-            <name>WiseMapping Public License Version 1.0</name>
-            <url>http://www.wisemapping.org/wisemapping-public-license-version-1-0-wpl</url>
-            <comments>A business-friendly OSS license</comments>
-        </license>
-    </licenses>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>maven2-repository.dev.java.net</id>
-            <name>Java.net Maven 2 Repository</name>
-            <url>http://download.java.net/maven/2/</url>
-            <layout>default</layout>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <organization>
-        <name>WiseMapping</name>
-        <url>http://www.wisemapping.org/</url>
-    </organization>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.11.0</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.12</version>
-                </plugin>
-                <plugin>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <version>3.0.0</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.3.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>3.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-project-info-reports-plugin</artifactId>
-                    <version>2.4</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.10</version>
-                </plugin>
-                <plugin>
-                    <groupId>net.alchim31.maven</groupId>
-                    <artifactId>yuicompressor-maven-plugin</artifactId>
-                    <version>1.1</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.7</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>native2ascii-maven-plugin</artifactId>
-                    <version>1.0-beta-1</version>
-                </plugin>
-                <plugin>
-                    <groupId>com.github.searls</groupId>
-                    <artifactId>jasmine-maven-plugin</artifactId>
-                    <version>1.3.1.5</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2.2</version>
-                <configuration>
-                    <descriptors>
-                        <descriptor>distribution/assembly/standalone-editor.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <distributionManagement>
-        <site>
-            <id>www.wisemapping.org</id>
-            <url>scp://www.wisemapping.org/docs/project/</url>
-        </site>
-    </distributionManagement>
-
-    <!-- Module Dependencies -->
-    <modules>
-        <module>wise-ui</module>
-        <module>wise-webapp</module>
-    </modules>
-
-
-</project>
-

wise-api/pom.xml

@@ -5,7 +5,7 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>3.2.1</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <relativePath/>
     </parent>
 
     <groupId>org.wisemapping</groupId>
@@ -19,18 +19,9 @@
         <com.wisemapping.version>5.1.0-SNAPSHOT</com.wisemapping.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <org.springframework.version>6.0.11</org.springframework.version>
-        <org.springframework.addons>6.1.2</org.springframework.addons>
-        <spring-security-taglibs.version>6.0.2</spring-security-taglibs.version>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.wisemapping</groupId>
-            <artifactId>wise-ui</artifactId>
-            <version>${com.wisemapping.version}</version>
-            <type>war</type>
-        </dependency>
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
@@ -63,6 +54,7 @@
             <version>6.1.3</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
@@ -104,11 +96,6 @@
             <artifactId>postgresql</artifactId>
             <version>42.5.4</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-taglibs</artifactId>
-            <version>${spring-security-taglibs.version}</version>
-        </dependency>
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
@@ -180,38 +167,42 @@
             <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
-        <!-- JSLT implementation -->
+
-        <dependency>
-            <groupId>jakarta.servlet.jsp.jstl</groupId>
-            <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
-            <version>3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.web</groupId>
-            <artifactId>jakarta.servlet.jsp.jstl</artifactId>
-            <version>3.0.0</version>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>2.11.0</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>fluent-hc</artifactId>
             <version>4.5.14</version>
         </dependency>
-        <dependency>
+
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-config</artifactId>
-            <version>${org.springframework.addons}</version>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>RELEASE</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
+            <version>0.11.5</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-impl</artifactId>
+            <version>0.11.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId>
+            <version>0.11.5</version>
+        </dependency>
     </dependencies>
     <build>
 

wise-ui/Dockerfile

@@ -11,14 +11,17 @@ RUN mkdir mindplot && npm pack @wisemapping/mindplot@${VERSION} && tar -xvzf wis
 ADD index.html .
 
 # Use Nginx as the production server
-FROM nginx:stable-alpine
+FROM nginx:latest
 LABEL maintainer="Paulo Gustavo Veiga <pveiga@wisemapping.com>"
 
 ## Copy the built React app to Nginx's web server directory
-COPY --from=builder /app /usr/share/nginx/html
+COPY --from=builder /app/index.html /usr/share/nginx/html/
 COPY --from=builder /app/webapp/package/dist/* /usr/share/nginx/html/webapp/
 COPY --from=builder /app/mindplot/package/dist/* /usr/share/nginx/html/mindplot/
 
+ADD nginx.conf .
+COPY nginx.conf /etc/nginx/conf.d/default.conf
+
 # Expose port 80 for the Nginx server
 EXPOSE 80
 

wise-ui/nginx.conf

@@ -0,0 +1,27 @@
+server {
+  listen 80;
+  gzip on;
+  charset UTF-8;
+  server_name wise-ui;
+
+  location / {
+    # This would be the directory where your React app's static files are stored at
+    root /usr/share/nginx/html;
+    try_files $uri /index.html;
+  }
+
+  location /c/ {
+    try_files $uri /usr/share/nginx/html/index.html;
+  }
+
+  location /api/ {
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-NginX-Proxy true;
+    proxy_pass http://localhost:8080/api/;
+    proxy_ssl_session_reuse off;
+    proxy_set_header Host $http_host;
+    proxy_cache_bypass $http_upgrade;
+    proxy_redirect off;
+  }
+}