Gh-1046: Remove UI (#1048)

* Remove UI * Add ability to run road-traffic-demo from main POM Also restores some test schemas etc to cd folder * Update CI/CD Brings back a couple of federated config files this seems to be using * Quieten CI logs for road-traffic-demo No more transfer progress messages
gchq · Feb 6, 2023 · 864f7a3 · 864f7a3
1 parent 02ab854
commit 864f7a3
Show file tree

Hide file tree

Showing 1,225 changed files with 96 additions and 42,754 deletions.
diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
@@ -43,32 +43,6 @@ jobs:
     - name: Check all modules are tested
       run: ./cd/check_modules.sh
 
-  ui-selenium-test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Setup JDK
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'zulu'
-        java-version: '8'
-
-    - name: Cache dependencies
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.m2/repository
-          !~/.m2/repository/uk
-        key: gaffer-tools-dependencies
-
-    - name: Setup System tests
-      run: ./cd/setup_ui_system_tests.sh
-
-    - name: Run Selenium Tests
-      uses: GabrielBB/xvfb-action@v1
-      with:
-        run: mvn verify -P system-test -Dwebdriver.gecko.driver=geckodriver -pl ui
-
   python-tests:
     runs-on: ubuntu-latest
     steps:
@@ -89,43 +63,13 @@ jobs:
 
     - name: Start road-traffic example
       run: |
-        ./ui/example/road-traffic/scripts/start.sh &
+        mvn verify -ntp -Proad-traffic-demo &
         sleep 1m
 
     - name: Run Python tests
       working-directory: python-shell
       run: python3 -m unittest discover -s src
 
-  ui-jasmine-test:
-    runs-on: ubuntu-latest
-    env:
-      MAVEN_OPTS: -Dmaven.wagon.http.retryHandler.count=3 -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Setup JDK
-      uses: actions/setup-java@v2
-      with:
-        distribution: 'zulu'
-        java-version: '8'
-
-    - name: Cache dependencies
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.m2/repository
-          !~/.m2/repository/uk
-        key: gaffer-tools-dependencies
-
-    - name: Install dependencies
-      run: mvn -q clean install -pl :ui -Pquick -am
-
-    - name: Run Tests
-      run: xvfb-run mvn verify -pl :ui
-
-    - name: Cleanup xvfb pidx
-      uses: bcomnes/cleanup-xvfb@v1
-
   java-build:
     runs-on: ubuntu-latest
     strategy:

diff --git a/.github/workflows/update-gaffer-version.yaml b/.github/workflows/update-gaffer-version.yaml
@@ -40,7 +40,7 @@ jobs:
       run: |
         newVersion=${{ github.event.inputs.version }}
         curl -o spring-rest.jar https://repo.maven.apache.org/maven2/uk/gov/gchq/gaffer/spring-rest/$newVersion/spring-rest-$newVersion-exec.jar
-        java -Dgaffer.schemas=ui/example/road-traffic/schema/ -Dgaffer.storeProperties=ui/example/federated/federatedStore.properties -Dgaffer.graph.config=ui/example/federated/graphConfig.json -jar spring-rest.jar &
+        java -Dgaffer.schemas=cd/road-traffic-example/schema -Dgaffer.storeProperties=cd/road-traffic-example/federatedStore.properties -Dgaffer.graph.config=cd/road-traffic-example/federatedGraphConfig.json -jar spring-rest.jar &
         sleep 1m
         python python-shell/src/generate.py
         rm spring-rest.jar

diff --git a/NOTICES b/NOTICES
@@ -32,84 +32,4 @@ Apache Accumulo (org.apache.accumulo:accumulo-core:1.6.5, org.apache.accumulo:ac
 
 Graph QL (com.graphql-java:graphql-java:2.1.0):
 
-- MIT License
-
-
-Selenium (org.seleniumhq.selenium:selenium-server:3.4.0)
-
-- Apache License, Version 2.0
-
-
-Jasmine Maven Plugin (com.github.searls:jasmine-maven-plugin:2.2)
-
-- Apache License, Version 2.0
-
-----------------------------------------------------------------------
-
-The UI contains the following javascript dependencies
-
-Moment.js (moment.min.js:2.20.1)
-
-- MIT Licence
-
-Cytoscape (cytoscape-2.7.4.min.js)
-
-- MIT License
-
-
-Cytoscape ngraph.forcelayout (cytoscape-ngraph.forcelayout-1.3.8.js)
-
-- MIT License
-
-
-JQuery (jquery-1.8.0.min.js)
-
-- MIT License
-
-
-Angular (angular.min.js)
-
-- MIT License
-
-Angular Mocks (angular-mock.min.js)
-
-- MIT License
-
-
-Angular Material (angular-animate.min.js)
-
-- MIT License
-
-
-Angular Material (angular-aria.min.js)
-
-- MIT License
-
-
-Angular Material (angular-material.min.js)
-
-- MIT License
-
-Angular Route (angular-route.min.js)
-
-- MIT Licence
-
-Angular Messages (angular-messages.min.js)
-
-- MIT Licence
-
-Google Material Design Icons (material.io)
-
-- Apache License, Version 2.0
-
-daniel-nagy/md-data-table (md-data-table)
-
-- MIT Licence
-
-jtblin/angular-chart.js (angular-chart.js)
-
-- BSD License
-
-chart.js/Chartjs (Chart.js)
-
-- MIT Licence
+- MIT License
diff --git a/...le/road-traffic/addOperationsToChain.json → ...traffic-example/addOperationsToChain.json b/...le/road-traffic/addOperationsToChain.json → ...traffic-example/addOperationsToChain.json
diff --git a/ui/example/federated/graphConfig.json → ...traffic-example/federatedGraphConfig.json b/ui/example/federated/graphConfig.json → ...traffic-example/federatedGraphConfig.json
diff --git a/...ample/federated/federatedStore.properties → ...traffic-example/federatedStore.properties b/...ample/federated/federatedStore.properties → ...traffic-example/federatedStore.properties
diff --git a/ui/example/road-traffic/graphConfig.json → cd/road-traffic-example/graphConfig.json b/ui/example/road-traffic/graphConfig.json → cd/road-traffic-example/graphConfig.json
diff --git a/...le/road-traffic/roadTrafficSampleData.csv → ...traffic-example/roadTrafficSampleData.csv b/...le/road-traffic/roadTrafficSampleData.csv → ...traffic-example/roadTrafficSampleData.csv
diff --git a/ui/example/road-traffic/schema/elements.json → cd/road-traffic-example/schema/elements.json b/ui/example/road-traffic/schema/elements.json → cd/road-traffic-example/schema/elements.json
diff --git a/ui/example/road-traffic/schema/types.json → cd/road-traffic-example/schema/types.json b/ui/example/road-traffic/schema/types.json → cd/road-traffic-example/schema/types.json
diff --git a/ui/example/road-traffic/map/store.properties → cd/road-traffic-example/store.properties b/ui/example/road-traffic/map/store.properties → cd/road-traffic-example/store.properties
diff --git a/cd/setup_ui_system_tests.sh b/cd/setup_ui_system_tests.sh
diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2016-2022 Crown Copyright
+  ~ Copyright 2016-2023 Crown Copyright
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -28,12 +28,7 @@
     <version>2.0.0-alpha-1.3.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <modules>
-        <module>ui</module>
-        <module>mini-accumulo-cluster</module>
-        <module>performance-testing</module>
-        <module>random-element-generation</module>
-    </modules>
+    <!-- For <modules> see default profile -->
 
     <properties>
         <gaffer.version>2.0.0-alpha-0.4</gaffer.version>
@@ -139,58 +134,103 @@
             </build>
         </profile>
         <profile>
-            <id>system-test</id>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <!-- If no other profile is in use then include modules -->
+            <modules>
+                <module>mini-accumulo-cluster</module>
+                <module>performance-testing</module>
+                <module>random-element-generation</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>road-traffic-demo</id>
+            <!-- Used for Python CI/CD tests -->
             <properties>
-                <skip.surefire.tests>true</skip.surefire.tests>
-                <skip.failsafe.tests>false</skip.failsafe.tests>
+                <maven.test.skip>true</maven.test.skip>
+                <enforcer.skip>true</enforcer.skip>
+                <checkstyle.skip>true</checkstyle.skip>
+                <spotbugs.skip>true</spotbugs.skip>
+                <standalone-rest-path>rest</standalone-rest-path>
+                <standalone-port>8080</standalone-port>
             </properties>
+            <dependencies>
+                <dependency>
+                    <groupId>uk.gov.gchq.gaffer</groupId>
+                    <artifactId>road-traffic-rest</artifactId>
+                    <version>${gaffer.version}</version>
+                    <type>war</type>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <!-- Older Failsafe required for Selenium -->
-                        <version>2.22.2</version>
-                        <executions>
-                            <execution>
-                                <id>system-test</id>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                            </execution>
-                        </executions>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven3-plugin</artifactId>
+                        <version>${cargo.plugin.version}</version>
                         <configuration>
-                            <skipITs>${skip.failsafe.tests}</skipITs>
-                            <excludes>
-                                <exclude>**/*$*</exclude>
-                                <exclude>**/performance/**</exclude>
-                            </excludes>
-                            <includes>
-                                <include>**/*SystemTest.java</include>
-                                <include>**/*ST.java</include>
-                                <include>**/*STs.java</include>
-                                <include>**/*SystemTests.java</include>
-                            </includes>
+                            <deployables>
+                                <deployable>
+                                    <groupId>uk.gov.gchq.gaffer</groupId>
+                                    <artifactId>road-traffic-rest</artifactId>
+                                    <type>war</type>
+                                    <properties>
+                                        <context>/${standalone-rest-path}</context>
+                                    </properties>
+                                </deployable>
+                            </deployables>
+                            <container>
+                                <containerId>tomcat9x</containerId>
+                                <dependencies>
+                                    <dependency>
+                                        <groupId>uk.gov.gchq.gaffer</groupId>
+                                        <artifactId>road-traffic-rest</artifactId>
+                                        <type>war</type>
+                                    </dependency>
+                                </dependencies>
+                                <systemProperties>
+                                    <gaffer.properties.app.title>
+                                        Road Traffic Example
+                                    </gaffer.properties.app.title>
+                                    <gaffer.rest-api.basePath>
+                                        ${standalone-rest-path}
+                                    </gaffer.rest-api.basePath>
+                                    <gaffer.graph.config>
+                                        ${project.basedir}/cd/road-traffic-example/graphConfig.json
+                                    </gaffer.graph.config>
+                                    <gaffer.schemas>
+                                        ${project.basedir}/cd/road-traffic-example/schema
+                                    </gaffer.schemas>
+                                    <gaffer.storeProperties>
+                                        ${project.basedir}/cd/road-traffic-example/store.properties
+                                    </gaffer.storeProperties>
+                                    <roadTraffic.dataLoader.dataPath>
+                                        ${project.basedir}/cd/road-traffic-example/roadTrafficSampleData.csv
+                                    </roadTraffic.dataLoader.dataPath>
+                                    <gaffer.graph.hook.add.operations.path>
+                                        ${project.basedir}/cd/road-traffic-example/addOperationsToChain.json
+                                    </gaffer.graph.hook.add.operations.path>
+                                    <gaffer.error-mode.debug>
+                                        false
+                                    </gaffer.error-mode.debug>
+                                </systemProperties>
+                            </container>
+                            <configuration>
+                                <properties>
+                                    <cargo.servlet.port>${standalone-port}</cargo.servlet.port>
+                                </properties>
+                            </configuration>
                         </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-checkstyle-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>validate</id>
-                                <phase>none</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>com.github.spotbugs</groupId>
-                        <artifactId>spotbugs-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>analyze-compile</id>
-                                <phase>none</phase>
+                                <id>deploy</id>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
                             </execution>
                         </executions>
                     </plugin>

diff --git a/python-shell/README.md b/python-shell/README.md
@@ -28,10 +28,10 @@ pip install -e .
 
 ## Quick Start
 
-The python shell connects to a running Gaffer REST API. You can start the Gaffer road-traffic-demo rest server and [ui](../ui/README.md) using the command:
+The python shell connects to a running Gaffer REST API. You can start the Gaffer road-traffic-demo rest server using the command:
 
 ```bash
-./ui/example/road-traffic/scripts/start.sh
+mvn verify -Proad-traffic-demo
 ```
 
 ```python
@@ -81,7 +81,7 @@ Please ensure that your coding style is consistent with the rest of the Gaffer p
 
 ```bash
 # To run all of the tests, first deploy the road traffic example
-./ui/example/road-traffic/scripts/start.sh
+mvn verify -Proad-traffic-demo
 
 # Then from within the python-shell folder run
 python -m unittest discover