Skip to content
Permalink
Browse files
rename dir & add rat plugin & improve license
  • Loading branch information
nzomkxia committed Feb 2, 2019
1 parent 90b9e56 commit 82ddf71944e0a6674df1ce9d0e1a134b21a60da7
Show file tree
Hide file tree
Showing 222 changed files with 381 additions and 32 deletions.
@@ -29,8 +29,8 @@ target/
.DS_Store
Thumbs.db

dubbo-admin-backend/src/main/resources/public
dubbo-admin-backend/target
dubbo-admin-frontend/dist
dubbo-admin-frontend/node
dubbo-admin-frontend/node-modules
dubbo-admin-server/src/main/resources/public
dubbo-admin-server/target
dubbo-admin-ui/dist
dubbo-admin-ui/node
dubbo-admin-ui/node-modules
@@ -12,7 +12,7 @@ cache:
install: true

script:
- travis_wait 30 ./mvnw clean install -DskipTests=false -Dcheckstyle.skip=false -Dmaven.javadoc.skip=true
- travis_wait 30 ./mvnw clean install -DskipTests=false -Dcheckstyle.skip=false -Drat.skip=false -Dmaven.javadoc.skip=true

after_success:
- bash <(curl -s https://codecov.io/bash)
13 LICENSE
@@ -209,8 +209,15 @@ and license terms. Your use of these submodules is subject to the terms and
conditions of the following licenses.

================================================================
For dubbo-admin-frontend/static
This product bundles files from google fonts roboto and google material design icons which is licensed under the Apache License v2
For details, see https://github.com/google/fonts/tree/master/apache/roboto,
For dubbo-admin-frontend/static/fonts
This product bundles files from google fonts roboto which is licensed under the Apache License v2
For details, see https://github.com/google/fonts/tree/master/apache/roboto

For dubbo-admin-frontend/static/OpenSans.css
This product bundles files from google material design icons which is licensed under the Apache License v2
For details, see https://github.com/google/material-design-icons/blob/2.2.0/LICENSE



https://github.com/google/material-design-icons

7 NOTICE
@@ -10,10 +10,7 @@ This product contains code form the google fonts roboto and google material desi
Google Fonts roboto
===================
please visit google fonts for more information:
https://fonts.google.com/specimen/Roboto
* https://fonts.google.com/specimen/Roboto

Copyright 2011 Google Inc. All Rights Reserved.

Google Material Design
=======================
please visit material design website for more information
https://material.io/tools/icons/
@@ -22,22 +22,21 @@ service governance follows the version of Dubbo 2.7, and compatible for Dubbo 2.
### Backend

* Standard spring boot project
* **NOTICE** this branch is based on Dubbo 2.7-SNAPSHOT, since this version is not published yet, so if you find a dependency error, please clear the dubbo2.7 related files in the local library
* [configurations in application.properties](https://github.com/apache/incubator-dubbo-ops/wiki/Dubbo-Admin-configuration)
* force update under root path(incubator-dubbo-ops) for the first building: `mvn -Dmaven.test.skip=true clean -U package`


### Production Setup

1. Clone source code on develop branch `git clone https://github.com/apache/incubator-dubbo-ops.git`
2. Specify registry address in `dubbo-admin-backend/src/main/resources/application-production.properties`
2. Specify registry address in `dubbo-admin-server/src/main/resources/application-production.properties`
3. Build

> - `mvn clean package`
4. Start
* `mvn --projects dubbo-admin-backend spring-boot:run`
* `mvn --projects dubbo-admin-server spring-boot:run`
OR
* `cd dubbo-admin-backend/target`; `java -jar dubbo-admin-backend-0.1.jar`
* `cd dubbo-admin-server/target`; `java -jar dubbo-admin-server-0.1.jar`
5. Visit `http://localhost:8080`
---
@@ -22,22 +22,21 @@
### 后端部分

* 标准spring boot工程
* **注意** 本分支依赖Dubbo2.7-SNAPSHOT版本,该Dubbo版本还未正式发布,因此如果发现依赖方面的错误,请清空本地库中的dubbo2.7相关文件
* [application.properties配置说明](https://github.com/apache/incubator-dubbo-ops/wiki/Dubbo-Admin%E9%85%8D%E7%BD%AE%E8%AF%B4%E6%98%8E)
* 在项目根目录(incubator-dubbo-ops)第一次构建需要强制更新: `mvn -Dmaven.test.skip=true clean -U package`


### 生产环境配置

1. 下载代码: `git clone https://github.com/apache/incubator-dubbo-ops.git`
2.`dubbo-admin-backend/src/main/resources/application-production.properties`中指定注册中心地址
2.`dubbo-admin-server/src/main/resources/application-production.properties`中指定注册中心地址
3. 构建

> - `mvn clean package`
4. 启动
* `mvn --projects dubbo-admin-backend spring-boot:run`
* `mvn --projects dubbo-admin-server spring-boot:run`
或者
* `cd dubbo-admin-backend/target; java -jar dubbo-admin-backend-0.1.jar`
* `cd dubbo-admin-server/target; java -jar dubbo-admin-server-0.1.jar`
5. 访问 `http://localhost:8080`
---
@@ -0,0 +1,2 @@
* run: java -jar dubbo-admin-0.1.jar
* modify properties in `application.properties`
@@ -31,16 +31,39 @@
<dependencies>
<dependency>
<groupId>org.apache</groupId>
<artifactId>dubbo-admin-frontend</artifactId>
<artifactId>dubbo-admin-ui</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache</groupId>
<artifactId>dubbo-admin-backend</artifactId>
<artifactId>dubbo-admin-server</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>package</phase>
<configuration>
<tasks>
<copy file="../dubbo-admin-server/target/dubbo-admin-server-${project.version}.jar"
tofile="target/dubbo-admin-${project.version}.jar"/>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>release</id>
@@ -29,16 +29,22 @@
<include>DISCLAIMER</include>
<include>NOTICE</include>
<include>LICENSE</include>
<include>dubbo-admin-distribution/README.md</include>
</includes>
</fileSet>
</fileSets>
<files>
<file>
<source>../dubbo-admin-backend/target/dubbo-admin-backend-${project.version}.jar</source>
<source>target/dubbo-admin-${project.version}.jar</source>
<outputDirectory></outputDirectory>
</file>
<file>
<source>../dubbo-admin-backend/src/main/resources/application.properties</source>
<source>../dubbo-admin-server/src/main/resources/application.properties</source>
<outputDirectory></outputDirectory>
</file>
<file>
<source>README.md</source>
<outputDirectory></outputDirectory>
</file>
</files>

@@ -34,7 +34,7 @@
<exclude>**/target/**</exclude>
<exclude>**/eclipse-classes/**</exclude>
<exclude>**/dubbo-governance.log*</exclude>
<exclude>dubbo-admin-backend/src/main/resources/public/**</exclude>
<exclude>dubbo-admin-server/src/main/resources/public/**</exclude>
<exclude>**/.gitrepo</exclude>
<exclude>**/.gitkeep</exclude>
<exclude>*.enc</exclude>
File renamed without changes.
@@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>dubbo-admin-backend</artifactId>
<artifactId>dubbo-admin-server</artifactId>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -147,6 +147,24 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<phase>verify</phase>
<configuration>
<tasks>
<copy file="target/dubbo-admin-server-${project.version}.jar"
tofile="../dubbo-admin-distribution/target/dubbo-admin-${project.version}.jar"/>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>