Skip to content

Commit

Permalink
Create dashboard WAR archive during TestGrid build. (wso2#295)
Browse files Browse the repository at this point in the history
* update gitignore file

* Add react app war generation stage to maven

* Delete redundent webapp files

* Update gitignore to remove webapp folder

* Add versions to parent poms

* Remove hostname URL
  • Loading branch information
sameerawickramasekara authored and kasunbg committed Jan 4, 2018
1 parent 3efd1d2 commit acef375
Show file tree
Hide file tree
Showing 67 changed files with 107 additions and 174 deletions.
22 changes: 5 additions & 17 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,11 @@ hs_err_pid*
# target
*target*

target
.classpath
.settings
.project
*.iml
*.iws
*.ipr
.idea

# dependencies
/node_modules

# testing
/coverage

# production
/build
# webapp dependencies
node_modules/
build/
npm/
webapp/

# misc
.DS_Store
Expand Down
8 changes: 8 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,12 @@
<version>2.5.5</version>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>${org.codehaus.mojo.version}</version>
</plugin>

<!-- Maven Jacoco plugin -->
<plugin>
<groupId>org.jacoco</groupId>
Expand Down Expand Up @@ -502,5 +508,7 @@
<slf4j.api.version>1.7.25</slf4j.api.version>
<log4j.api.version>2.8.2</log4j.api.version>
<log4j.core.version>2.8.2</log4j.core.version>
<!--Dashboard dependencies-->
<org.codehaus.mojo.version>1.3.2</org.codehaus.mojo.version>
</properties>
</project>
121 changes: 93 additions & 28 deletions web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
~ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<parent>
<groupId>org.wso2.testgrid</groupId>
Expand Down Expand Up @@ -59,10 +61,6 @@
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</exclusion>
<!--<exclusion>-->
<!--<groupId>javax.annotation</groupId>-->
<!--<artifactId>javax.annotation-api</artifactId>-->
<!--</exclusion>-->
<exclusion>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-jaxb</artifactId>
Expand Down Expand Up @@ -96,28 +94,95 @@

<build>
<finalName>${project.artifactId}</finalName>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warName>testgrid#v0.9</warName>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.2</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<id>npm install (initialize)</id>
<goals>
<goal>exec</goal>
</goals>
<phase>initialize</phase>
<configuration>
<executable>npm</executable>
<arguments>
<argument>install</argument>
</arguments>
<workingDirectory>${basedir}/src/main/react-dashboard</workingDirectory>
</configuration>
</execution>
<execution>
<id>npm install (clean)</id>
<goals>
<goal>exec</goal>
</goals>
<phase>pre-clean</phase>
<configuration>
<executable>npm</executable>
<arguments>
<argument>install</argument>
</arguments>
<workingDirectory>${basedir}/src/main/react-dashboard</workingDirectory>
</configuration>
</execution>
<execution>
<id>npm run build (compile)</id>
<goals>
<goal>exec</goal>
</goals>
<phase>compile</phase>
<configuration>
<executable>npm</executable>
<arguments>
<argument>run</argument>
<argument>build</argument>
</arguments>
<workingDirectory>${basedir}/src/main/react-dashboard</workingDirectory>
</configuration>
</execution>
</executions>
<configuration>
<environmentVariables>
<!-- The following parameters create an NPM sandbox for CI -->
<NPM_CONFIG_PREFIX>${basedir}/npm</NPM_CONFIG_PREFIX>
<NPM_CONFIG_CACHE>${NPM_CONFIG_PREFIX}/cache</NPM_CONFIG_CACHE>
<NPM_CONFIG_TMP>${project.build.directory}/npmtmp</NPM_CONFIG_TMP>
</environmentVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>prepare-deploy-package</id>
<phase>prepare-package</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<copy todir="${basedir}/src/main/webapp/">
<fileset dir="${basedir}/src/main/react-dashboard/build/"
includes="**/*"/>
</copy>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warName>testgrid#v0.9</warName>
</configuration>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion web/src/main/react-dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "testgrid-dashboard",
"version": "0.1.0",
"private": true,
"homepage" : "http://ec2-34-238-28-168.compute-1.amazonaws.com:8080/testgrid/v0.9/",
"homepage": "/testgrid/v0.9/",
"dependencies": {
"material-ui": "^0.20.0",
"materialize-css": "^0.100.2",
Expand Down
13 changes: 0 additions & 13 deletions web/src/main/react-dashboard/web.xml

This file was deleted.

10 changes: 0 additions & 10 deletions web/src/main/webapp/asset-manifest.json

This file was deleted.

Binary file removed web/src/main/webapp/cube.png
Binary file not shown.
Binary file removed web/src/main/webapp/favicon.ico
Binary file not shown.
Binary file removed web/src/main/webapp/img/fail.png
Binary file not shown.
Binary file removed web/src/main/webapp/img/grid.gif
Binary file not shown.
Binary file removed web/src/main/webapp/img/ok.png
Binary file not shown.
Binary file removed web/src/main/webapp/img/ok2.png
Binary file not shown.
17 changes: 0 additions & 17 deletions web/src/main/webapp/index.html

This file was deleted.

15 changes: 0 additions & 15 deletions web/src/main/webapp/manifest.json

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/service-worker.js

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/css/main.fa2ad9ff.css

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/css/main.fa2ad9ff.css.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.091a39fc.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.091a39fc.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.0c18e0bf.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.0c18e0bf.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.101354b6.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.101354b6.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.17f643a5.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.17f643a5.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.2e36586c.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.2e36586c.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.373dd921.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.373dd921.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.3764be8c.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.3764be8c.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.3d8384e7.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.3d8384e7.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.3f9a734d.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.3f9a734d.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.40e4c229.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.40e4c229.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.47858e3b.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.47858e3b.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.4b9fb3df.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.4b9fb3df.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.567c3237.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.567c3237.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.5b3f905f.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.5b3f905f.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.6ab86b1a.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.6ab86b1a.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.7fc3cb02.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.7fc3cb02.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.83f3db3d.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.83f3db3d.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.870fa8f1.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.870fa8f1.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.952d3b04.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.952d3b04.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.c8c4eed9.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.c8c4eed9.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.d2f41130.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.d2f41130.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.de326afe.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.de326afe.js.map

This file was deleted.

2 changes: 0 additions & 2 deletions web/src/main/webapp/static/js/main.f3ccfbaa.js

This file was deleted.

1 change: 0 additions & 1 deletion web/src/main/webapp/static/js/main.f3ccfbaa.js.map

This file was deleted.

Binary file removed web/src/main/webapp/static/media/close.c893d3e9.png
Binary file not shown.
Binary file removed web/src/main/webapp/static/media/log.813f9d73.png
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit acef375

Please sign in to comment.