Skip to content

Commit

Permalink
Merge Web Management Panel into the Project #2987
Browse files Browse the repository at this point in the history
  • Loading branch information
@mekya
mekya committed May 28, 2021
1 parent 8cc109b commit d7a4858
Show file tree
Hide file tree
Showing 19 changed files with 4,054 additions and 52 deletions.
19 changes: 18 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ dist: bionic
language: java
jdk:
- openjdk11
node_js: "14.8.0"

git:
depth: false
Expand Down Expand Up @@ -63,7 +64,23 @@ before_install:
else
echo "branch not found. Using version in sonatype";
fi)


# Get Angular app
- npm install -g @angular/cli@10.0.5
- (if [ $(git ls-remote https://github.com/ant-media/ManagementConsole_AngularApp.git $TRAVIS_BRANCH | wc -l) == "1" ];
then
echo " $TRAVIS_BRANCH branch found";
git clone --depth=1 -b $TRAVIS_BRANCH https://github.com/ant-media/ManagementConsole_AngularApp.git;
else
echo "branch not found";
git clone --depth=1 https://github.com/ant-media/ManagementConsole_AngularApp.git;
fi)
- cd ManagementConsole_AngularApp
- npm install
- ng build --prod
- cp -a ./dist/. ../src/main/server/webapps/root/
- cd ..

# package ant media server
- mvn clean package -U -P assemble -Dmaven.javadoc.skip=true -Dmaven.test.skip=true -DskipTests=true --quiet

Expand Down
83 changes: 32 additions & 51 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,11 @@
<version>1.1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.mitre.dsmiley.httpproxy</groupId>
<artifactId>smiley-http-proxy-servlet</artifactId>
<version>1.11</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId>
Expand Down Expand Up @@ -572,13 +577,6 @@
<type>war</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.antmedia.app</groupId>
<artifactId>root</artifactId>
<version>${project.parent.version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down Expand Up @@ -646,25 +644,7 @@
<excludeTransitive>false</excludeTransitive>
</configuration>
</execution>
<execution>
<id>unpack-root-app</id>
<phase>package</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>io.antmedia.app</groupId>
<artifactId>root</artifactId>
<version>${project.parent.version}</version>
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/webapps/root</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>

<execution>
<id>copy-war-dependencies</id>
<phase>package</phase>
Expand All @@ -691,6 +671,19 @@
<artifactId>exec-maven-plugin</artifactId>
<version>${exec-maven-plugin.version}</version>
<executions>
<execution>
<id>mkdir-webapps</id>
<phase>package</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>mkdir</executable>
<arguments>
<argument>target/webapps</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>create-liveapp</id>
<phase>package</phase>
Expand Down Expand Up @@ -756,12 +749,6 @@
<version>${project.parent.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>io.antmedia.app</groupId>
<artifactId>root</artifactId>
<version>${project.parent.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>io.antmedia.enterprise</groupId>
<artifactId>ant-media-enterprise</artifactId>
Expand Down Expand Up @@ -800,25 +787,6 @@
<excludeTransitive>false</excludeTransitive>
</configuration>
</execution>
<execution>
<id>unpack-root-app</id>
<phase>package</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>io.antmedia.app</groupId>
<artifactId>root</artifactId>
<version>${project.parent.version}</version>
<type>war</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/webapps/root</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
<execution>
<id>copy-war-dependencies</id>
<phase>package</phase>
Expand Down Expand Up @@ -864,6 +832,19 @@
<artifactId>exec-maven-plugin</artifactId>
<version>${exec-maven-plugin.version}</version>
<executions>
<execution>
<id>mkdir-webapps</id>
<phase>package</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>mkdir</executable>
<arguments>
<argument>target/webapps</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>create-liveapp</id>
<phase>package</phase>
Expand Down

0 comments on commit d7a4858

Please sign in to comment.