mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
Merge branch 'application-mgt-new' into 'application-mgt-new'
Add frontend-maven-plugin See merge request entgra/carbon-device-mgt!86
This commit is contained in:
Dharmakeerthi Lasantha
commit
7e3ec78c63
2
.gitignore
vendored
2
.gitignore
vendored
@ -29,7 +29,9 @@ components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/r
|
||||
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/package-lock.json
|
||||
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/npm-debug.log
|
||||
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/dist/
|
||||
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/tmp/
|
||||
components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/node_modules/
|
||||
components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/dist/
|
||||
components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/package-lock.json
|
||||
components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/tmp/
|
||||
|
||||
|
||||
@ -40,5 +40,5 @@ public class HandlerConstants {
|
||||
public static final String TOKEN_IS_EXPIRED = "ACCESS_TOKEN_IS_EXPIRED";
|
||||
|
||||
public static final int INTERNAL_ERROR_CODE = 500;
|
||||
public static final long TIMEOUT = 300;
|
||||
public static final long TIMEOUT = 1200;
|
||||
}
|
||||
|
||||
@ -51,45 +51,88 @@
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>exec-maven-plugin</artifactId>
|
||||
<version>1.5.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>npm install (initialize)</id>
|
||||
<goals>
|
||||
<goal>exec</goal>
|
||||
</goals>
|
||||
<phase>initialize</phase>
|
||||
<configuration>
|
||||
<workingDirectory>react-app</workingDirectory>
|
||||
<executable>${npm.executable}</executable>
|
||||
<arguments>
|
||||
<argument>install</argument>
|
||||
<argument>--silent</argument>
|
||||
</arguments>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>npm run build (compile)</id>
|
||||
<goals>
|
||||
<goal>exec</goal>
|
||||
</goals>
|
||||
<phase>compile</phase>
|
||||
<configuration>
|
||||
<workingDirectory>react-app</workingDirectory>
|
||||
<executable>${npm.executable}</executable>
|
||||
<arguments>
|
||||
<argument>run</argument>
|
||||
<argument>${npm.build.command}</argument>
|
||||
</arguments>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
<groupId>com.github.eirslett</groupId>
|
||||
<artifactId>frontend-maven-plugin</artifactId>
|
||||
<version>${frontend.mave.version}</version>
|
||||
<configuration>
|
||||
<workingDirectory>${npm.working.dir}</workingDirectory>
|
||||
<!-- where to install npm -->
|
||||
<installDirectory>${npm.install.dir}</installDirectory>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>install node and npm</id>
|
||||
<goals>
|
||||
<goal>install-node-and-npm</goal>
|
||||
</goals>
|
||||
<phase>generate-resources</phase>
|
||||
<configuration>
|
||||
<nodeVersion>${node.version}</nodeVersion>
|
||||
<npmVersion>${npm.version}</npmVersion>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>npm install</id>
|
||||
<goals>
|
||||
<goal>npm</goal>
|
||||
</goals>
|
||||
<!-- Optional configuration which provides for running any npm command -->
|
||||
<configuration>
|
||||
<arguments>install</arguments>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>prod</id>
|
||||
<goals>
|
||||
<goal>npm</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<arguments>run-script ${npm.build.command}</arguments>
|
||||
</configuration>
|
||||
<phase>generate-resources</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<!-- <plugin>-->
|
||||
<!-- <groupId>org.codehaus.mojo</groupId>-->
|
||||
<!-- <artifactId>exec-maven-plugin</artifactId>-->
|
||||
<!-- <version>1.5.0</version>-->
|
||||
<!-- <executions>-->
|
||||
<!-- <execution>-->
|
||||
<!-- <id>npm install (initialize)</id>-->
|
||||
<!-- <goals>-->
|
||||
<!-- <goal>exec</goal>-->
|
||||
<!-- </goals>-->
|
||||
<!-- <phase>initialize</phase>-->
|
||||
<!-- <configuration>-->
|
||||
<!-- <workingDirectory>react-app</workingDirectory>-->
|
||||
<!-- <executable>${npm.executable}</executable>-->
|
||||
<!-- <arguments>-->
|
||||
<!-- <argument>install</argument>-->
|
||||
<!-- <argument>--silent</argument>-->
|
||||
<!-- </arguments>-->
|
||||
<!-- </configuration>-->
|
||||
<!-- </execution>-->
|
||||
<!-- <execution>-->
|
||||
<!-- <id>npm run build (compile)</id>-->
|
||||
<!-- <goals>-->
|
||||
<!-- <goal>exec</goal>-->
|
||||
<!-- </goals>-->
|
||||
<!-- <phase>compile</phase>-->
|
||||
<!-- <configuration>-->
|
||||
<!-- <workingDirectory>react-app</workingDirectory>-->
|
||||
<!-- <executable>${npm.executable}</executable>-->
|
||||
<!-- <arguments>-->
|
||||
<!-- <argument>run</argument>-->
|
||||
<!-- <argument>${npm.build.command}</argument>-->
|
||||
<!-- </arguments>-->
|
||||
<!-- </configuration>-->
|
||||
<!-- </execution>-->
|
||||
<!-- </executions>-->
|
||||
<!-- <configuration>-->
|
||||
<!-- <workingDirectory>${npm.working.dir}</workingDirectory>-->
|
||||
<!-- </configuration>-->
|
||||
<!-- </plugin>-->
|
||||
</plugins>
|
||||
</build>
|
||||
<profiles>
|
||||
@ -111,6 +154,7 @@
|
||||
<npm.executable>npm</npm.executable>
|
||||
<npm.build.command>build_prod</npm.build.command>
|
||||
<npm.working.dir>./react-app</npm.working.dir>
|
||||
<npm.install.dir>./react-app/tmp</npm.install.dir>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<npm.output.directory>react-app</npm.output.directory>
|
||||
</properties>
|
||||
|
||||
@ -54,45 +54,88 @@
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>exec-maven-plugin</artifactId>
|
||||
<version>1.5.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>npm install (initialize)</id>
|
||||
<goals>
|
||||
<goal>exec</goal>
|
||||
</goals>
|
||||
<phase>initialize</phase>
|
||||
<configuration>
|
||||
<workingDirectory>react-app</workingDirectory>
|
||||
<executable>${npm.executable}</executable>
|
||||
<arguments>
|
||||
<argument>install</argument>
|
||||
<argument>--silent</argument>
|
||||
</arguments>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>npm run build (compile)</id>
|
||||
<goals>
|
||||
<goal>exec</goal>
|
||||
</goals>
|
||||
<phase>compile</phase>
|
||||
<configuration>
|
||||
<workingDirectory>react-app</workingDirectory>
|
||||
<executable>${npm.executable}</executable>
|
||||
<arguments>
|
||||
<argument>run</argument>
|
||||
<argument>${npm.build.command}</argument>
|
||||
</arguments>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
<groupId>com.github.eirslett</groupId>
|
||||
<artifactId>frontend-maven-plugin</artifactId>
|
||||
<version>${frontend.mave.version}</version>
|
||||
<configuration>
|
||||
<workingDirectory>${npm.working.dir}</workingDirectory>
|
||||
<!-- where to install npm -->
|
||||
<installDirectory>${npm.install.dir}</installDirectory>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>install node and npm</id>
|
||||
<goals>
|
||||
<goal>install-node-and-npm</goal>
|
||||
</goals>
|
||||
<phase>generate-resources</phase>
|
||||
<configuration>
|
||||
<nodeVersion>${node.version}</nodeVersion>
|
||||
<npmVersion>${npm.version}</npmVersion>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>npm install</id>
|
||||
<goals>
|
||||
<goal>npm</goal>
|
||||
</goals>
|
||||
<!-- Optional configuration which provides for running any npm command -->
|
||||
<configuration>
|
||||
<arguments>install</arguments>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>prod</id>
|
||||
<goals>
|
||||
<goal>npm</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<arguments>run-script ${npm.build.command}</arguments>
|
||||
</configuration>
|
||||
<phase>generate-resources</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<!-- <plugin>-->
|
||||
<!-- <groupId>org.codehaus.mojo</groupId>-->
|
||||
<!-- <artifactId>exec-maven-plugin</artifactId>-->
|
||||
<!-- <version>1.5.0</version>-->
|
||||
<!-- <executions>-->
|
||||
<!-- <execution>-->
|
||||
<!-- <id>npm install (initialize)</id>-->
|
||||
<!-- <goals>-->
|
||||
<!-- <goal>exec</goal>-->
|
||||
<!-- </goals>-->
|
||||
<!-- <phase>initialize</phase>-->
|
||||
<!-- <configuration>-->
|
||||
<!-- <workingDirectory>react-app</workingDirectory>-->
|
||||
<!-- <executable>${npm.executable}</executable>-->
|
||||
<!-- <arguments>-->
|
||||
<!-- <argument>install</argument>-->
|
||||
<!-- <argument>--silent</argument>-->
|
||||
<!-- </arguments>-->
|
||||
<!-- </configuration>-->
|
||||
<!-- </execution>-->
|
||||
<!-- <execution>-->
|
||||
<!-- <id>npm run build (compile)</id>-->
|
||||
<!-- <goals>-->
|
||||
<!-- <goal>exec</goal>-->
|
||||
<!-- </goals>-->
|
||||
<!-- <phase>compile</phase>-->
|
||||
<!-- <configuration>-->
|
||||
<!-- <workingDirectory>react-app</workingDirectory>-->
|
||||
<!-- <executable>${npm.executable}</executable>-->
|
||||
<!-- <arguments>-->
|
||||
<!-- <argument>run</argument>-->
|
||||
<!-- <argument>${npm.build.command}</argument>-->
|
||||
<!-- </arguments>-->
|
||||
<!-- </configuration>-->
|
||||
<!-- </execution>-->
|
||||
<!-- </executions>-->
|
||||
<!-- <configuration>-->
|
||||
<!-- <workingDirectory>${npm.working.dir}</workingDirectory>-->
|
||||
<!-- </configuration>-->
|
||||
<!-- </plugin>-->
|
||||
</plugins>
|
||||
</build>
|
||||
<profiles>
|
||||
@ -114,6 +157,7 @@
|
||||
<npm.executable>npm</npm.executable>
|
||||
<npm.build.command>build_prod</npm.build.command>
|
||||
<npm.working.dir>./react-app</npm.working.dir>
|
||||
<npm.install.dir>./react-app/tmp</npm.install.dir>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<npm.output.directory>react-app</npm.output.directory>
|
||||
</properties>
|
||||
|
||||
3
pom.xml
3
pom.xml
@ -2230,6 +2230,9 @@
|
||||
<!-- app management related versions -->
|
||||
<googlecode.plist.version>1.21</googlecode.plist.version>
|
||||
<net.dongliu.version>2.6.5</net.dongliu.version>
|
||||
<frontend.mave.version>1.7.6</frontend.mave.version>
|
||||
<node.version>v10.15.3</node.version>
|
||||
<npm.version>6.9.0</npm.version>
|
||||
|
||||
<!--websocket related lib versions-->
|
||||
<tomcat.websocket.version>7.0.85</tomcat.websocket.version>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user