1. Adjust the directory hierarchy

2. Fix the compile issue
Change-Id: Ibf10c83104e5e673bc797013799861426cd950ce
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>

3 files changed, 0 insertions, 366 deletions

diff --git a/apiroute/apiroute-service/src/main/resources/iui-route/i18n/loadi18nApp_iui-route_view.js b/apiroute/apiroute-service/src/main/resources/iui-route/i18n/loadi18nApp_iui-route_view.js
deleted file mode 100644
index ad8dc39..0000000
--- a/apiroute/apiroute-service/src/main/resources/iui-route/i18n/loadi18nApp_iui-route_view.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
- *
- * 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.
- */
-function loadPropertiesSideMenu(lang, propertiesFileNamePrefix, propertiesFilePath){
-    jQuery.i18n.properties({
-        // language:lang,
-        name:propertiesFileNamePrefix,
-        path:propertiesFilePath, // 资源文件路径
-        mode:'map', // 用 Map 的方式使用资源文件中的值
-        callback: function() {// 加载成功后设置显示内容
-        
-            var i18nItems = $('[name_i18n=org_openo_msb_route_ui_i18n]');
-            for(var i=0;i<i18nItems.length;i++){
-                var $item = $(i18nItems.eq(i));
-                var itemId = $item.attr('id');
-                var itemTitle = $item.attr('title');
-                /** id存在时元素内容需要国际化，title存在时元素title需要国际化 */
-                if(typeof($item.attr("title")) == "string"){
-                    $item.attr("title", ($.i18n.prop(itemTitle)));
-                }
-                if(undefined != itemId && typeof($item.attr("placeholder"))=="undefined"){
-                    $item.text($.i18n.prop(itemId));
-                }else if(undefined != itemId && typeof($item.attr("placeholder"))!="undefined"){
-                    $item.attr("placeholder", $.i18n.prop(itemId));
-                }
-            }
-        }
-    });
-}
-
-
diff --git a/apiroute/apiroute-service/src/main/resources/iui-route/i18n/msb-iui-route-i18n-en-US.properties b/apiroute/apiroute-service/src/main/resources/iui-route/i18n/msb-iui-route-i18n-en-US.properties
deleted file mode 100644
index 1f3ff5d..0000000
--- a/apiroute/apiroute-service/src/main/resources/iui-route/i18n/msb-iui-route-i18n-en-US.properties
+++ /dev/null
@@ -1,164 +0,0 @@
-#
-# Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-#
-# 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.
-#
-org_openo_msb_route_title=MicroService Bus
-
-org_openo_msb_route_sideBar_serviceroute=Service Route
-org_openo_msb_route_sideBar_servicediscover=Service Discover
-org_openo_msb_route_sideBar_servicemng=Service Manage
-
-org_openo_msb_route_chinese_name=
-org_openo_msb_route_english_name=MicroService Bus
-
-org_openo_msb_route_banner_title=MicroService Bus
-org_openo_msb_route_btn_export=Service Export
-org_openo_msb_route_tab_api=API Service
-org_openo_msb_route_tab_iui=IUI Service
-org_openo_msb_route_tab_custom=Custom Service
-org_openo_msb_route_tab_msb=MSB Service
-org_openo_msb_route_btn_add_api=Add API Service
-org_openo_msb_route_form_sourceservice=Source Service
-org_openo_msb_route_form_address=Host
-org_openo_msb_route_form_host_tip=Add Host(format--IP:Port)
-org_openo_msb_route_form_node_no=No
-org_openo_msb_route_form_node_control=operate
-org_openo_msb_route_form_url=URL
-org_openo_msb_route_form_target_tip=Published as
-org_openo_msb_route_form_target_service=Published URL 
-org_openo_msb_route_form_servicename=Name
-org_openo_msb_route_form_version=Version
-org_openo_msb_route_form_version_tip=format：v(lowercase) + digital
-org_openo_msb_route_form_swagger=API Define
-org_openo_msb_route_form_swagger_address=API Address
-org_openo_msb_route_form_target_address= Target Address:
-org_openo_msb_route_form_publish_address=Published Address:
-org_openo_msb_route_form_metrics=Metrics Define
-org_openo_msb_route_form_metrics_address=Metrics Address
-org_openo_msb_route_form_btn_cancel=Cancel
-org_openo_msb_route_form_btn_save=Save
-org_openo_msb_route_form_btn_close=Close
-
-org_openo_msb_route_box_version=version:
-org_openo_msb_route_box_btn_disable=Disable
-org_openo_msb_route_box_btn_able=Enable 
-org_openo_msb_route_box_btn_delete=Delete
-org_openo_msb_route_box_btn_update=Edit
-org_openo_msb_route_form_btn_addhost=Add Host
-org_openo_msb_route_form_btn_delhost=Delete Host
-org_openo_msb_route_box_btn_view=View
-
-org_openo_msb_route_btn_add_iui=Add IUI Service
-org_openo_msb_route_form_iui_tip=Target service registration at the same time corresponding Api service can be accessed through this address
-org_openo_msb_route_btn_add_custom=Add Custom Service
-org_openo_msb_route_btn_add_msb=Add MSB Service
-org_openo_msb_route_form_protocol=Protocol
-org_openo_msb_route_form_visualrange=VisualRange
-org_openo_msb_route_form_intersystem=OutSystem
-org_openo_msb_route_form_insystem=InSystem
-org_openo_msb_route_form_msb_host=Host
-org_openo_msb_route_form_ttl_tip=Add TTL
-
-org_openo_msb_route_servicecontent_swagger=Rest Interface
-org_openo_msb_route_servicecontent_metrics=Metrics
-
-org_openo_msb_route_msb_info=Basic Information
-org_openo_msb_route_msb_hostlist=Host List
-
-org_openo_msb_route_content_title=Service Detail 
-org_openo_msb_route_swagger_type_predefined=predeFined
-org_openo_msb_route_swagger_type_custominput=customInput
-
-
-//table
-org_openo_msb_route-table-sLengthMenu=View _MENU_ records
-org_openo_msb_route-table-sZeroRecords=No matching records found
-org_openo_msb_route-table-sInfo=Found total _TOTAL_ records     
-org_openo_msb_route-table-sInfoEmpty=No records found to show
-org_openo_msb_route-table-sGroupActions=_TOTAL_ records selected:  
-org_openo_msb_route-table-sAjaxRequestGeneralError=Could not complete request. Please check your internet connection.
-org_openo_msb_route-table-sEmptyTable=No data available in table
-org_openo_msb_route-table-sPrevious=Prev
-org_openo_msb_route-table-sNext=Next
-org_openo_msb_route-table-sPage=Page
-org_openo_msb_route-table-sPageOf=of
-org_openo_msb_route-table-search=Search: 
-org_openo_msb_route-table-infofilter=(Filter from _MAX_ Records)
-
-org_openo_msb_route_err_host_empty=The new Host cannot be empty
-org_openo_msb_route_err_ttl_empty=The new TTL cannot be empty
-org_openo_msb_route_err_host_format=Wrong Host format (format IP: port)
-org_openo_msb_route_err_ttl_format=TTL can only for Numbers
-org_openo_msb_route_err_host_repeat=The services (Host: {0}) has been in existence
-org_openo_msb_route_err_host_del=Are you sure to delete [Host: {0}:{1}]?
-
-org_openo_msb_route_title_add_msb=Add MSB Service
-org_openo_msb_route_title_edit_msb=Edit MSB Service
-org_openo_msb_route_title_view_msb=View MSB Service
-org_openo_msb_route_title_add_iui=Add IUI Service
-org_openo_msb_route_title_edit_iui=Edit IUI Service
-org_openo_msb_route_title_view_iui=View IUI Service
-org_openo_msb_route_title_add_api=Add API Service
-org_openo_msb_route_title_edit_api=Edit API Service
-org_openo_msb_route_title_view_api=View API Service
-org_openo_msb_route_title_add_custom=Add Custom Service
-org_openo_msb_route_title_edit_custom=Edit Custom Service
-org_openo_msb_route_title_view_custom=View Custom Service
-org_openo_msb_route_err_service_repeat=Service(Name：{0}) has been published
-org_openo_msb_route_err_api_repeat=Service(Name：{0}-Version：{1}) has been published
-org_openo_msb_route_err_service_del_ask=Sure to delete[Name：{0} - Version：{1}]Service?
-org_openo_msb_route_err_service2_del_ask=Sure to delete[Name：{0}]Service?
-org_openo_msb_route_err_service_save=Service save failed：
-org_openo_msb_route_service_save= - Save success
-org_openo_msb_route_service_update= - Edit success
-org_openo_msb_route_err_host_leastone=Please enter at least one HOST address
-org_openo_msb_route_err_visualrange_empty= Please select the service visibleRange
-org_openo_msb_route_status_enable=Enable service success
-org_openo_msb_route_status_disable=Disable service success
-org_openo_msb_route_err_status=Service status update failed: 
-
-org_openo_msb_route_service_del_success= - Delete success
-org_openo_msb_route_service_del_fail=Service delete failed: 
-
-org_openo_msb_route_metric_content_title=Metrics Detail
-org_openo_msb_route_iui_content_title=IUI Service Detail
-
-//Input efficacy suggested
-org_openo_msb_route_validator_ip_format=Please fill in the correct IP
-org_openo_msb_route_validator_url_head_format=url address  Begin with /, cannot end with /
-org_openo_msb_route_validator_url_head_only_format=url address  Begin with/
-org_openo_msb_route_validator_url_format=The service URL format：ip:port/url
-org_openo_msb_route_validator_url_line_format=Name cannot contain /
-org_openo_msb_route_validator_content_format=Special symbols and Chinese name can not be filled in
-org_openo_msb_route_validator_name_empty=Please enter the service name
-org_openo_msb_route_validator_url_empty=Please enter the URL address
-org_openo_msb_route_validator_server_empty=Please enter the Host address
-org_openo_msb_route_validator_protocol_empty=Please select a service protocol
-org_openo_msb_route_validator_type_empty=Please select a service type
-org_openo_msb_route_validator_digits=Please enter an integer
-org_openo_msb_route_validator_min=Not a negative
-
-
-org_openo_msb_route_property_ttl=Tip： 
-org_openo_msb_route_property_root=Root Service
-org_openo_msb_route_property_other_group=other
-org_openo_msb_route_property_normal=normal
-org_openo_msb_route_property_disable=disable
-org_openo_msb_route_property_unknown=unknown
-
-
-
-
-
-
diff --git a/apiroute/apiroute-service/src/main/resources/iui-route/i18n/msb-iui-route-i18n-zh-CN.properties b/apiroute/apiroute-service/src/main/resources/iui-route/i18n/msb-iui-route-i18n-zh-CN.properties
deleted file mode 100644
index 75e374a..0000000
--- a/apiroute/apiroute-service/src/main/resources/iui-route/i18n/msb-iui-route-i18n-zh-CN.properties
+++ /dev/null
@@ -1,159 +0,0 @@
-#
-# Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-#
-# 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.
-#
-org_openo_msb_route_title=ZTE 微服务
-
-org_openo_msb_route_sideBar_serviceroute=服务路由
-org_openo_msb_route_sideBar_servicediscover=服务发现
-org_openo_msb_route_sideBar_servicemng=服务管理
-
-
-org_openo_msb_route_chinese_name=微服务
-org_openo_msb_route_english_name=MicroService Bus
-
-org_openo_msb_route_banner_title= —— 微服务
-org_openo_msb_route_btn_export=服务导出
-org_openo_msb_route_tab_api=API服务
-org_openo_msb_route_tab_iui=IUI服务
-org_openo_msb_route_tab_custom=自定义服务
-org_openo_msb_route_tab_msb=MSB服务
-org_openo_msb_route_btn_add_api=添加API服务
-org_openo_msb_route_form_sourceservice=源服务
-org_openo_msb_route_form_address=服务器地址
-org_openo_msb_route_form_host_tip=添加host地址(格式 IP:Port)
-org_openo_msb_route_form_node_no=序号
-org_openo_msb_route_form_node_control=操作
-org_openo_msb_route_form_url=URL地址
-org_openo_msb_route_form_target_tip=发布为
-org_openo_msb_route_form_target_service=发布服务
-org_openo_msb_route_form_servicename=服务名
-org_openo_msb_route_form_version=版本号
-org_openo_msb_route_form_version_tip=格式：v(小写)+数字
-org_openo_msb_route_form_swagger=API定义
-org_openo_msb_route_form_swagger_address=API地址
-org_openo_msb_route_form_target_address=目标地址：
-org_openo_msb_route_form_publish_address=发布地址：
-org_openo_msb_route_form_metrics=性能指标定义
-org_openo_msb_route_form_metrics_address=性能指标地址
-org_openo_msb_route_form_btn_cancel=取消
-org_openo_msb_route_form_btn_save=保存
-org_openo_msb_route_form_btn_close=关闭
-
-org_openo_msb_route_box_version=版本：
-org_openo_msb_route_box_btn_disable=禁用
-org_openo_msb_route_box_btn_able=启用
-org_openo_msb_route_box_btn_delete=删除
-org_openo_msb_route_box_btn_update=修改
-org_openo_msb_route_form_btn_addhost=添加Host
-org_openo_msb_route_form_btn_delhost=删除Host
-org_openo_msb_route_box_btn_view=查看
-
-org_openo_msb_route_btn_add_iui=添加IUI服务
-org_openo_msb_route_form_iui_tip=目标服务同时注册对应Api服务才能通过此地址访问
-org_openo_msb_route_btn_add_custom=添加自定义服务
-org_openo_msb_route_btn_add_msb=添加MSB服务
-org_openo_msb_route_form_protocol=服务协议
-org_openo_msb_route_form_visualrange=服务可见范围
-org_openo_msb_route_form_intersystem=系统间
-org_openo_msb_route_form_insystem=系统内
-org_openo_msb_route_form_msb_host=服务HOST
-org_openo_msb_route_form_ttl_tip=添加TTL数字
-
-org_openo_msb_route_servicecontent_swagger=接口
-org_openo_msb_route_servicecontent_metrics=性能
-
-org_openo_msb_route_msb_info=基本信息
-org_openo_msb_route_msb_hostlist=服务实例列表
-
-org_openo_msb_route_content_title=微服务详情
-org_openo_msb_route_swagger_type_predefined=预定义选择
-org_openo_msb_route_swagger_type_custominput=自定义输入
-
-
-//表格相关
-org_openo_msb_route-table-sLengthMenu=每页 _MENU_ 条结果
-org_openo_msb_route-table-sZeroRecords=没有匹配结果
-org_openo_msb_route-table-sInfo=总共找到 _TOTAL_ 条结果
-org_openo_msb_route-table-sInfoEmpty=共 0 项
-org_openo_msb_route-table-sGroupActions=_TOTAL_ 条结果被选择:
-org_openo_msb_route-table-sAjaxRequestGeneralError=不能完成请求，请检查您的网络连接情况。
-org_openo_msb_route-table-sEmptyTable=表中数据为空
-org_openo_msb_route-table-sPrevious=前页
-org_openo_msb_route-table-sNext=下页
-org_openo_msb_route-table-sPage=第
-org_openo_msb_route-table-sPageOf=页，总页数：
-org_openo_msb_route-table-search=搜索：
-org_openo_msb_route-table-infofilter=(从 _MAX_ 条记录过滤)
-
-org_openo_msb_route_err_host_empty=新增HOST不能为空
-org_openo_msb_route_err_ttl_empty=新增HOST的TTL不能为空
-org_openo_msb_route_err_host_format=HOST格式有误(格式 ip:port)
-org_openo_msb_route_err_ttl_format=TTL只能为数字
-org_openo_msb_route_err_host_repeat=服务(HOST：{0})已存在
-org_openo_msb_route_err_host_del=确定删除[HOST：{0}:{1}]?
-
-org_openo_msb_route_title_add_msb=添加MSB服务实例
-org_openo_msb_route_title_edit_msb=修改MSB服务实例
-org_openo_msb_route_title_view_msb=查看MSB服务实例
-org_openo_msb_route_title_add_iui=添加IUI服务实例
-org_openo_msb_route_title_edit_iui=修改IUI服务实例
-org_openo_msb_route_title_view_iui=查看IUI服务实例
-org_openo_msb_route_title_add_api=添加API服务实例
-org_openo_msb_route_title_edit_api=修改API服务实例
-org_openo_msb_route_title_view_api=查看API服务实例
-org_openo_msb_route_title_add_custom=添加自定义服务实例
-org_openo_msb_route_title_edit_custom=修改自定义服务实例
-org_openo_msb_route_title_view_custom=查看自定义服务实例
-org_openo_msb_route_err_service_repeat=服务(服务名：{0})已发布
-org_openo_msb_route_err_api_repeat=服务(服务名：{0}-版本号：{1})已发布
-org_openo_msb_route_err_service_del_ask=确定删除[服务名：{0} - 版本号：{1}]服务?
-org_openo_msb_route_err_service2_del_ask=确定删除[服务名：{0}]服务?
-org_openo_msb_route_err_service_save=服务保存失败：
-org_openo_msb_route_service_save=保存成功
-org_openo_msb_route_service_update=修改成功
-org_openo_msb_route_err_host_leastone=请至少输入一个HOST地址
-org_openo_msb_route_err_visualrange_empty=请选择服务可见范围 
-org_openo_msb_route_status_enable=激活成功
-org_openo_msb_route_status_disable=禁用成功
-org_openo_msb_route_err_status=服务状态操作失败: 
-
-org_openo_msb_route_service_del_success=删除成功
-org_openo_msb_route_service_del_fail=服务删除失败: 
-
-org_openo_msb_route_metric_content_title=性能详情
-org_openo_msb_route_iui_content_title=IUI服务详情
-
-//输入效验提示
-org_openo_msb_route_validator_ip_format=请填写正确的IP地址
-org_openo_msb_route_validator_url_head_format=url地址以/开头，不能以/结尾
-org_openo_msb_route_validator_url_head_only_format=url地址以/开头
-org_openo_msb_route_validator_url_format=服务地址格式：ip:port/url
-org_openo_msb_route_validator_url_line_format=名称不能包含/
-org_openo_msb_route_validator_content_format=名称不能输入特殊符号和中文
-org_openo_msb_route_validator_name_empty=请输入服务名
-org_openo_msb_route_validator_url_empty=请输入URL地址
-org_openo_msb_route_validator_server_empty=请输入服务器地址
-org_openo_msb_route_validator_protocol_empty=请选择服务协议
-org_openo_msb_route_validator_type_empty=请选择服务类型
-org_openo_msb_route_validator_digits=请输入整数
-org_openo_msb_route_validator_min=不能为负数
-
-
-org_openo_msb_route_property_ttl=提示： 
-org_openo_msb_route_property_root=根服务
-org_openo_msb_route_property_other_group=其他
-org_openo_msb_route_property_normal=正常
-org_openo_msb_route_property_disable=停用
-org_openo_msb_route_property_unknown=未知
\ No newline at end of file