diff options
author | Luji <lu.ji3@zte.com.cn> | 2016-09-21 04:41:06 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@open-o.org> | 2016-09-21 04:41:06 +0000 |
commit | 6b4138c9f9e2c5e8f112c664a77620f752343369 (patch) | |
tree | 613c2f43c17007d44a2b17aeca0b4ceb900fee6f | |
parent | 54c8aab23b9f984cf9e09bca556479f013c3d2ed (diff) | |
parent | 86bcc31cf8d72016242bffc0f31dfbfe297b594c (diff) |
Merge "Change folder structure of resmagr module."
-rw-r--r-- | openo-portal/portal-resmgr/pom.xml | 42 | ||||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/css/RMain.css (renamed from openo-portal/portal-resmgr/openo-brs/css/RMain.css) | 0 | ||||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/css/VMMain.css (renamed from openo-portal/portal-resmgr/openo-brs/css/VMMain.css) | 0 | ||||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/css/bootstrap-table.min.css (renamed from openo-portal/portal-resmgr/openo-brs/css/bootstrap-table.min.css) | 0 | ||||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/css/bootstrap.min.css (renamed from openo-portal/portal-resmgr/openo-brs/css/bootstrap.min.css) | 0 | ||||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/images/add.png (renamed from openo-portal/portal-resmgr/openo-brs/images/add.png) | bin | 1104 -> 1104 bytes | |||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/images/arrow-down-enable.png (renamed from openo-portal/portal-resmgr/openo-brs/images/arrow-down-enable.png) | bin | 1035 -> 1035 bytes | |||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/images/collapse_arrow.png (renamed from openo-portal/portal-resmgr/openo-brs/images/collapse_arrow.png) | bin | 1174 -> 1174 bytes | |||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/images/delete.png (renamed from openo-portal/portal-resmgr/openo-brs/images/delete.png) | bin | 1100 -> 1100 bytes | |||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/images/edit.png (renamed from openo-portal/portal-resmgr/openo-brs/images/edit.png) | bin | 3045 -> 3045 bytes | |||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/images/expand_arrow.png (renamed from openo-portal/portal-resmgr/openo-brs/images/expand_arrow.png) | bin | 1182 -> 1182 bytes | |||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/images/ideo_default_select.png (renamed from openo-portal/portal-resmgr/openo-brs/images/ideo_default_select.png) | bin | 1035 -> 1035 bytes | |||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/images/import.png (renamed from openo-portal/portal-resmgr/openo-brs/images/import.png) | bin | 1250 -> 1250 bytes | |||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/images/line.png (renamed from openo-portal/portal-resmgr/openo-brs/images/line.png) | bin | 139 -> 139 bytes | |||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/images/loading-spinner-grey.gif (renamed from openo-portal/portal-resmgr/openo-brs/images/loading-spinner-grey.gif) | bin | 5203 -> 5203 bytes | |||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/images/openo.png (renamed from openo-portal/portal-resmgr/openo-brs/images/openo.png) | bin | 49007 -> 49007 bytes | |||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/images/page_l.png (renamed from openo-portal/portal-resmgr/openo-brs/images/page_l.png) | bin | 1066 -> 1066 bytes | |||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/images/page_left_disabled.png (renamed from openo-portal/portal-resmgr/openo-brs/images/page_left_disabled.png) | bin | 1066 -> 1066 bytes | |||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/images/page_r.png (renamed from openo-portal/portal-resmgr/openo-brs/images/page_r.png) | bin | 1070 -> 1070 bytes | |||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/images/sort_asc.png (renamed from openo-portal/portal-resmgr/openo-brs/images/sort_asc.png) | bin | 1118 -> 1118 bytes | |||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/images/sort_both.png (renamed from openo-portal/portal-resmgr/openo-brs/images/sort_both.png) | bin | 1136 -> 1136 bytes | |||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/images/sort_desc.png (renamed from openo-portal/portal-resmgr/openo-brs/images/sort_desc.png) | bin | 1127 -> 1127 bytes | |||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/js/bootstrap-table.min.js (renamed from openo-portal/portal-resmgr/openo-brs/js/bootstrap-table.min.js) | 0 | ||||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/js/bootstrap.min.js (renamed from openo-portal/portal-resmgr/openo-brs/js/bootstrap.min.js) | 0 | ||||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/js/brs.js (renamed from openo-portal/portal-resmgr/openo-brs/js/brs.js) | 0 | ||||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/js/jquery-1.11.2.min.js (renamed from openo-portal/portal-resmgr/openo-brs/js/jquery-1.11.2.min.js) | 0 | ||||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/link.html (renamed from openo-portal/portal-resmgr/openo-brs/link.html) | 0 | ||||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/ne.html (renamed from openo-portal/portal-resmgr/openo-brs/ne.html) | 0 | ||||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/port.html (renamed from openo-portal/portal-resmgr/openo-brs/port.html) | 0 | ||||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/resource.html (renamed from openo-portal/portal-resmgr/openo-brs/resource.html) | 0 | ||||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr/site.html (renamed from openo-portal/portal-resmgr/openo-brs/site.html) | 0 |
31 files changed, 42 insertions, 0 deletions
diff --git a/openo-portal/portal-resmgr/pom.xml b/openo-portal/portal-resmgr/pom.xml new file mode 100644 index 00000000..0ba93617 --- /dev/null +++ b/openo-portal/portal-resmgr/pom.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright 2016 Huawei Technologies Co., Ltd. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations 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"> + <parent> + <groupId>org.openo.gso.gui</groupId> + <artifactId>openo-portal</artifactId> + <version>1.0.0-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>portal-resmgr</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>war</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <failOnMissingWebXml>false</failOnMissingWebXml> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/openo-portal/portal-resmgr/openo-brs/css/RMain.css b/openo-portal/portal-resmgr/src/main/webapp/resmgr/css/RMain.css index 1b8488aa..1b8488aa 100644 --- a/openo-portal/portal-resmgr/openo-brs/css/RMain.css +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/css/RMain.css diff --git a/openo-portal/portal-resmgr/openo-brs/css/VMMain.css b/openo-portal/portal-resmgr/src/main/webapp/resmgr/css/VMMain.css index e625e907..e625e907 100644 --- a/openo-portal/portal-resmgr/openo-brs/css/VMMain.css +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/css/VMMain.css diff --git a/openo-portal/portal-resmgr/openo-brs/css/bootstrap-table.min.css b/openo-portal/portal-resmgr/src/main/webapp/resmgr/css/bootstrap-table.min.css index d72d0655..d72d0655 100644 --- a/openo-portal/portal-resmgr/openo-brs/css/bootstrap-table.min.css +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/css/bootstrap-table.min.css diff --git a/openo-portal/portal-resmgr/openo-brs/css/bootstrap.min.css b/openo-portal/portal-resmgr/src/main/webapp/resmgr/css/bootstrap.min.css index 679272d2..679272d2 100644 --- a/openo-portal/portal-resmgr/openo-brs/css/bootstrap.min.css +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/css/bootstrap.min.css diff --git a/openo-portal/portal-resmgr/openo-brs/images/add.png b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/add.png Binary files differindex d1f82993..d1f82993 100644 --- a/openo-portal/portal-resmgr/openo-brs/images/add.png +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/add.png diff --git a/openo-portal/portal-resmgr/openo-brs/images/arrow-down-enable.png b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/arrow-down-enable.png Binary files differindex dc8ddbe6..dc8ddbe6 100644 --- a/openo-portal/portal-resmgr/openo-brs/images/arrow-down-enable.png +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/arrow-down-enable.png diff --git a/openo-portal/portal-resmgr/openo-brs/images/collapse_arrow.png b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/collapse_arrow.png Binary files differindex 8830741a..8830741a 100644 --- a/openo-portal/portal-resmgr/openo-brs/images/collapse_arrow.png +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/collapse_arrow.png diff --git a/openo-portal/portal-resmgr/openo-brs/images/delete.png b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/delete.png Binary files differindex 737f8797..737f8797 100644 --- a/openo-portal/portal-resmgr/openo-brs/images/delete.png +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/delete.png diff --git a/openo-portal/portal-resmgr/openo-brs/images/edit.png b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/edit.png Binary files differindex 68d76257..68d76257 100644 --- a/openo-portal/portal-resmgr/openo-brs/images/edit.png +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/edit.png diff --git a/openo-portal/portal-resmgr/openo-brs/images/expand_arrow.png b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/expand_arrow.png Binary files differindex f8935e1f..f8935e1f 100644 --- a/openo-portal/portal-resmgr/openo-brs/images/expand_arrow.png +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/expand_arrow.png diff --git a/openo-portal/portal-resmgr/openo-brs/images/ideo_default_select.png b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/ideo_default_select.png Binary files differindex 50c3a251..50c3a251 100644 --- a/openo-portal/portal-resmgr/openo-brs/images/ideo_default_select.png +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/ideo_default_select.png diff --git a/openo-portal/portal-resmgr/openo-brs/images/import.png b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/import.png Binary files differindex 8cfc5256..8cfc5256 100644 --- a/openo-portal/portal-resmgr/openo-brs/images/import.png +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/import.png diff --git a/openo-portal/portal-resmgr/openo-brs/images/line.png b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/line.png Binary files differindex 9d340a8d..9d340a8d 100644 --- a/openo-portal/portal-resmgr/openo-brs/images/line.png +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/line.png diff --git a/openo-portal/portal-resmgr/openo-brs/images/loading-spinner-grey.gif b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/loading-spinner-grey.gif Binary files differindex 6d614d3d..6d614d3d 100644 --- a/openo-portal/portal-resmgr/openo-brs/images/loading-spinner-grey.gif +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/loading-spinner-grey.gif diff --git a/openo-portal/portal-resmgr/openo-brs/images/openo.png b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/openo.png Binary files differindex 328b7353..328b7353 100644 --- a/openo-portal/portal-resmgr/openo-brs/images/openo.png +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/openo.png diff --git a/openo-portal/portal-resmgr/openo-brs/images/page_l.png b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/page_l.png Binary files differindex e8b98c7c..e8b98c7c 100644 --- a/openo-portal/portal-resmgr/openo-brs/images/page_l.png +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/page_l.png diff --git a/openo-portal/portal-resmgr/openo-brs/images/page_left_disabled.png b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/page_left_disabled.png Binary files differindex f72a90bd..f72a90bd 100644 --- a/openo-portal/portal-resmgr/openo-brs/images/page_left_disabled.png +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/page_left_disabled.png diff --git a/openo-portal/portal-resmgr/openo-brs/images/page_r.png b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/page_r.png Binary files differindex 2e637eee..2e637eee 100644 --- a/openo-portal/portal-resmgr/openo-brs/images/page_r.png +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/page_r.png diff --git a/openo-portal/portal-resmgr/openo-brs/images/sort_asc.png b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/sort_asc.png Binary files differindex a88d7975..a88d7975 100644 --- a/openo-portal/portal-resmgr/openo-brs/images/sort_asc.png +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/sort_asc.png diff --git a/openo-portal/portal-resmgr/openo-brs/images/sort_both.png b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/sort_both.png Binary files differindex 18670406..18670406 100644 --- a/openo-portal/portal-resmgr/openo-brs/images/sort_both.png +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/sort_both.png diff --git a/openo-portal/portal-resmgr/openo-brs/images/sort_desc.png b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/sort_desc.png Binary files differindex def071ed..def071ed 100644 --- a/openo-portal/portal-resmgr/openo-brs/images/sort_desc.png +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/images/sort_desc.png diff --git a/openo-portal/portal-resmgr/openo-brs/js/bootstrap-table.min.js b/openo-portal/portal-resmgr/src/main/webapp/resmgr/js/bootstrap-table.min.js index aa8e6854..aa8e6854 100644 --- a/openo-portal/portal-resmgr/openo-brs/js/bootstrap-table.min.js +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/js/bootstrap-table.min.js diff --git a/openo-portal/portal-resmgr/openo-brs/js/bootstrap.min.js b/openo-portal/portal-resmgr/src/main/webapp/resmgr/js/bootstrap.min.js index b04a0e82..b04a0e82 100644 --- a/openo-portal/portal-resmgr/openo-brs/js/bootstrap.min.js +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/js/bootstrap.min.js diff --git a/openo-portal/portal-resmgr/openo-brs/js/brs.js b/openo-portal/portal-resmgr/src/main/webapp/resmgr/js/brs.js index 83d213c3..83d213c3 100644 --- a/openo-portal/portal-resmgr/openo-brs/js/brs.js +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/js/brs.js diff --git a/openo-portal/portal-resmgr/openo-brs/js/jquery-1.11.2.min.js b/openo-portal/portal-resmgr/src/main/webapp/resmgr/js/jquery-1.11.2.min.js index e6a051d0..e6a051d0 100644 --- a/openo-portal/portal-resmgr/openo-brs/js/jquery-1.11.2.min.js +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/js/jquery-1.11.2.min.js diff --git a/openo-portal/portal-resmgr/openo-brs/link.html b/openo-portal/portal-resmgr/src/main/webapp/resmgr/link.html index ee24edae..ee24edae 100644 --- a/openo-portal/portal-resmgr/openo-brs/link.html +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/link.html diff --git a/openo-portal/portal-resmgr/openo-brs/ne.html b/openo-portal/portal-resmgr/src/main/webapp/resmgr/ne.html index 301cb75a..301cb75a 100644 --- a/openo-portal/portal-resmgr/openo-brs/ne.html +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/ne.html diff --git a/openo-portal/portal-resmgr/openo-brs/port.html b/openo-portal/portal-resmgr/src/main/webapp/resmgr/port.html index e47b30d5..e47b30d5 100644 --- a/openo-portal/portal-resmgr/openo-brs/port.html +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/port.html diff --git a/openo-portal/portal-resmgr/openo-brs/resource.html b/openo-portal/portal-resmgr/src/main/webapp/resmgr/resource.html index 06ddae83..06ddae83 100644 --- a/openo-portal/portal-resmgr/openo-brs/resource.html +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/resource.html diff --git a/openo-portal/portal-resmgr/openo-brs/site.html b/openo-portal/portal-resmgr/src/main/webapp/resmgr/site.html index 9cb3e50d..9cb3e50d 100644 --- a/openo-portal/portal-resmgr/openo-brs/site.html +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr/site.html |