Skip to content

B
bi-report
Commit 72e224f1 authored by 赵建伟's avatar 赵建伟
Browse files
Options

update codes

parent 5175ac75
Hide whitespace changes
Inline Side-by-side
Showing with 689 additions and 82 deletions
lib/java/bi-report-service/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: aopalliance:aopalliance:1.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__asm_asm_3_1.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: asm:asm:3.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/asm/asm/3.1/asm-3.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/asm/asm/3.1/asm-3.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/asm/asm/3.1/asm-3.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__com_google_guava_guava_16_0_1.xml → lib/java/bi-report-service/.idea/libraries/Maven__com_google_guava_guava_11_0_2.xml
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: com.google.guava:guava:16.0.1">
<library name="Maven: com.google.guava:guava:11.0.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/16.0.1/guava-16.0.1.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/11.0.2/guava-11.0.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/16.0.1/guava-16.0.1-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/11.0.2/guava-11.0.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/16.0.1/guava-16.0.1-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/11.0.2/guava-11.0.2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__com_google_inject_extensions_guice_servlet_3_0.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: com.google.inject.extensions:guice-servlet:3.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__com_google_inject_guice_3_0.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: com.google.inject:guice:3.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/3.0/guice-3.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/3.0/guice-3.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/inject/guice/3.0/guice-3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__com_jcraft_jsch_0_1_42.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: com.jcraft:jsch:0.1.42">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/jcraft/jsch/0.1.42/jsch-0.1.42.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/jcraft/jsch/0.1.42/jsch-0.1.42-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/jcraft/jsch/0.1.42/jsch-0.1.42-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__com_sun_jersey_contribs_jersey_guice_1_9.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: com.sun.jersey.contribs:jersey-guice:1.9">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/contribs/jersey-guice/1.9/jersey-guice-1.9.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/contribs/jersey-guice/1.9/jersey-guice-1.9-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/contribs/jersey-guice/1.9/jersey-guice-1.9-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__com_sun_jersey_jersey_client_1_9.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: com.sun.jersey:jersey-client:1.9">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-client/1.9/jersey-client-1.9.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-client/1.9/jersey-client-1.9-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-client/1.9/jersey-client-1.9-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_9.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: com.sun.jersey:jersey-core:1.9">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-core/1.9/jersey-core-1.9.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-core/1.9/jersey-core-1.9-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-core/1.9/jersey-core-1.9-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__com_sun_jersey_jersey_json_1_9.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: com.sun.jersey:jersey-json:1.9">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-json/1.9/jersey-json-1.9.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-json/1.9/jersey-json-1.9-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-json/1.9/jersey-json-1.9-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_9.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: com.sun.jersey:jersey-server:1.9">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-server/1.9/jersey-server-1.9.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-server/1.9/jersey-server-1.9-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/jersey/jersey-server/1.9/jersey-server-1.9-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__com_sun_xml_bind_jaxb_impl_2_2_3_1.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: com.sun.xml.bind:jaxb-impl:2.2.3-1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.2.3-1/jaxb-impl-2.2.3-1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.2.3-1/jaxb-impl-2.2.3-1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/sun/xml/bind/jaxb-impl/2.2.3-1/jaxb-impl-2.2.3-1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__commons_collections_commons_collections_3_2_2.xml → lib/java/bi-report-service/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: commons-collections:commons-collections:3.2.2">
<library name="Maven: commons-collections:commons-collections:3.2.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__commons_daemon_commons_daemon_1_0_13.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: commons-daemon:commons-daemon:1.0.13">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/commons-daemon/commons-daemon/1.0.13/commons-daemon-1.0.13.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/commons-daemon/commons-daemon/1.0.13/commons-daemon-1.0.13-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/commons-daemon/commons-daemon/1.0.13/commons-daemon-1.0.13-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__commons_el_commons_el_1_0.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: commons-el:commons-el:1.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/commons-el/commons-el/1.0/commons-el-1.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/commons-el/commons-el/1.0/commons-el-1.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/commons-el/commons-el/1.0/commons-el-1.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__javax_inject_javax_inject_1.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: javax.inject:javax.inject:1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__javax_servlet_jsp_jsp_api_2_1.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: javax.servlet.jsp:jsp-api:2.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__javax_servlet_servlet_api_2_5.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: javax.servlet:servlet-api:2.5">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/javax/servlet/servlet-api/2.5/servlet-api-2.5-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__jline_jline_0_9_94.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: jline:jline:0.9.94">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/jline/jline/0.9.94/jline-0.9.94.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/jline/jline/0.9.94/jline-0.9.94-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/jline/jline/0.9.94/jline-0.9.94-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__net_sf_jpam_jpam_1_1.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: net.sf.jpam:jpam:1.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/net/sf/jpam/jpam/1.1/jpam-1.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/net/sf/jpam/jpam/1.1/jpam-1.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/net/sf/jpam/jpam/1.1/jpam-1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_apache_ant_ant_1_9_1.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.apache.ant:ant:1.9.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.9.1/ant-1.9.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.9.1/ant-1.9.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.9.1/ant-1.9.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_9_1.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.apache.ant:ant-launcher:1.9.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.9.1/ant-launcher-1.9.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.9.1/ant-launcher-1.9.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.9.1/ant-launcher-1.9.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_annotations_2_6_5.xml → lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_annotations_2_6_0.xml
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.apache.hadoop:hadoop-annotations:2.6.5">
<library name="Maven: org.apache.hadoop:hadoop-annotations:2.6.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-annotations/2.6.5/hadoop-annotations-2.6.5.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-annotations/2.6.0/hadoop-annotations-2.6.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-annotations/2.6.5/hadoop-annotations-2.6.5-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-annotations/2.6.0/hadoop-annotations-2.6.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-annotations/2.6.5/hadoop-annotations-2.6.5-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-annotations/2.6.0/hadoop-annotations-2.6.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_hdfs_2_6_5.xml → lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_auth_2_6_0.xml
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.apache.hadoop:hadoop-hdfs:2.6.5">
<library name="Maven: org.apache.hadoop:hadoop-auth:2.6.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-hdfs/2.6.5/hadoop-hdfs-2.6.5.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-auth/2.6.0/hadoop-auth-2.6.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-hdfs/2.6.5/hadoop-hdfs-2.6.5-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-auth/2.6.0/hadoop-auth-2.6.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-hdfs/2.6.5/hadoop-hdfs-2.6.5-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-auth/2.6.0/hadoop-auth-2.6.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_common_2_6_5.xml → lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_common_2_6_0.xml
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.apache.hadoop:hadoop-common:2.6.5">
<library name="Maven: org.apache.hadoop:hadoop-common:2.6.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-common/2.6.5/hadoop-common-2.6.5.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-common/2.6.0/hadoop-common-2.6.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-common/2.6.5/hadoop-common-2.6.5-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-common/2.6.0/hadoop-common-2.6.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-common/2.6.5/hadoop-common-2.6.5-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-common/2.6.0/hadoop-common-2.6.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_auth_2_6_5.xml → lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_hdfs_2_6_0.xml
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.apache.hadoop:hadoop-auth:2.6.5">
<library name="Maven: org.apache.hadoop:hadoop-hdfs:2.6.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-auth/2.6.5/hadoop-auth-2.6.5.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-hdfs/2.6.0/hadoop-hdfs-2.6.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-auth/2.6.5/hadoop-auth-2.6.5-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-hdfs/2.6.0/hadoop-hdfs-2.6.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-auth/2.6.5/hadoop-auth-2.6.5-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-hdfs/2.6.0/hadoop-hdfs-2.6.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_server_applicationhistoryservice_2_6_0.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:2.6.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-yarn-server-applicationhistoryservice/2.6.0/hadoop-yarn-server-applicationhistoryservice-2.6.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-yarn-server-applicationhistoryservice/2.6.0/hadoop-yarn-server-applicationhistoryservice-2.6.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-yarn-server-applicationhistoryservice/2.6.0/hadoop-yarn-server-applicationhistoryservice-2.6.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_server_resourcemanager_2_6_0.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.apache.hadoop:hadoop-yarn-server-resourcemanager:2.6.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-yarn-server-resourcemanager/2.6.0/hadoop-yarn-server-resourcemanager-2.6.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-yarn-server-resourcemanager/2.6.0/hadoop-yarn-server-resourcemanager-2.6.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-yarn-server-resourcemanager/2.6.0/hadoop-yarn-server-resourcemanager-2.6.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_apache_hadoop_hadoop_yarn_server_web_proxy_2_6_0.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.apache.hadoop:hadoop-yarn-server-web-proxy:2.6.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-yarn-server-web-proxy/2.6.0/hadoop-yarn-server-web-proxy-2.6.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-yarn-server-web-proxy/2.6.0/hadoop-yarn-server-web-proxy-2.6.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/hadoop/hadoop-yarn-server-web-proxy/2.6.0/hadoop-yarn-server-web-proxy-2.6.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_codehaus_jackson_jackson_jaxrs_1_9_13.xml → lib/java/bi-report-service/.idea/libraries/Maven__org_codehaus_jackson_jackson_jaxrs_1_8_3.xml
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.codehaus.jackson:jackson-jaxrs:1.9.13">
<library name="Maven: org.codehaus.jackson:jackson-jaxrs:1.8.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-jaxrs/1.9.13/jackson-jaxrs-1.9.13.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-jaxrs/1.8.3/jackson-jaxrs-1.8.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-jaxrs/1.9.13/jackson-jaxrs-1.9.13-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-jaxrs/1.8.3/jackson-jaxrs-1.8.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-jaxrs/1.9.13/jackson-jaxrs-1.9.13-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-jaxrs/1.8.3/jackson-jaxrs-1.8.3-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_codehaus_jackson_jackson_xc_1_9_13.xml → lib/java/bi-report-service/.idea/libraries/Maven__org_codehaus_jackson_jackson_xc_1_8_3.xml
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.codehaus.jackson:jackson-xc:1.9.13">
<library name="Maven: org.codehaus.jackson:jackson-xc:1.8.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-xc/1.9.13/jackson-xc-1.9.13.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-xc/1.8.3/jackson-xc-1.8.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-xc/1.9.13/jackson-xc-1.9.13-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-xc/1.8.3/jackson-xc-1.8.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-xc/1.9.13/jackson-xc-1.9.13-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jackson/jackson-xc/1.8.3/jackson-xc-1.8.3-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_1.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.codehaus.jettison:jettison:1.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jettison/jettison/1.1/jettison-1.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jettison/jettison/1.1/jettison-1.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/jettison/jettison/1.1/jettison-1.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_json_json_20090211.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.json:json:20090211">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/json/json/20090211/json-20090211.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/json/json/20090211/json-20090211-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/json/json/20090211/json-20090211-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_mortbay_jetty_jetty_6_1_26.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.mortbay.jetty:jetty:6.1.26">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/jetty/6.1.26/jetty-6.1.26.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/jetty/6.1.26/jetty-6.1.26-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/mortbay/jetty/jetty/6.1.26/jetty-6.1.26-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_25.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.slf4j:slf4j-log4j12:1.7.25">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.7.25/slf4j-log4j12-1.7.25.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.7.25/slf4j-log4j12-1.7.25-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-log4j12/1.7.25/slf4j-log4j12-1.7.25-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_spark_project_hive_hive_common_1_2_1_spark2.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.spark-project.hive:hive-common:1.2.1.spark2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/hive-common/1.2.1.spark2/hive-common-1.2.1.spark2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/hive-common/1.2.1.spark2/hive-common-1.2.1.spark2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/hive-common/1.2.1.spark2/hive-common-1.2.1.spark2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_spark_project_hive_hive_jdbc_1_2_1_spark2.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.spark-project.hive:hive-jdbc:1.2.1.spark2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/hive-jdbc/1.2.1.spark2/hive-jdbc-1.2.1.spark2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/hive-jdbc/1.2.1.spark2/hive-jdbc-1.2.1.spark2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/hive-jdbc/1.2.1.spark2/hive-jdbc-1.2.1.spark2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_spark_project_hive_hive_serde_1_2_1_spark2.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.spark-project.hive:hive-serde:1.2.1.spark2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/hive-serde/1.2.1.spark2/hive-serde-1.2.1.spark2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/hive-serde/1.2.1.spark2/hive-serde-1.2.1.spark2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/hive-serde/1.2.1.spark2/hive-serde-1.2.1.spark2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_spark_project_hive_hive_service_1_2_1_spark2.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.spark-project.hive:hive-service:1.2.1.spark2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/hive-service/1.2.1.spark2/hive-service-1.2.1.spark2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/hive-service/1.2.1.spark2/hive-service-1.2.1.spark2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/hive-service/1.2.1.spark2/hive-service-1.2.1.spark2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_spark_project_hive_hive_shims_1_2_1_spark2.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.spark-project.hive:hive-shims:1.2.1.spark2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/hive-shims/1.2.1.spark2/hive-shims-1.2.1.spark2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/hive-shims/1.2.1.spark2/hive-shims-1.2.1.spark2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/hive-shims/1.2.1.spark2/hive-shims-1.2.1.spark2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_spark_project_hive_shims_hive_shims_0_20S_1_2_1_spark2.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.spark-project.hive.shims:hive-shims-0.20S:1.2.1.spark2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/shims/hive-shims-0.20S/1.2.1.spark2/hive-shims-0.20S-1.2.1.spark2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/shims/hive-shims-0.20S/1.2.1.spark2/hive-shims-0.20S-1.2.1.spark2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/shims/hive-shims-0.20S/1.2.1.spark2/hive-shims-0.20S-1.2.1.spark2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_spark_project_hive_shims_hive_shims_0_23_1_2_1_spark2.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.spark-project.hive.shims:hive-shims-0.23:1.2.1.spark2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/shims/hive-shims-0.23/1.2.1.spark2/hive-shims-0.23-1.2.1.spark2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/shims/hive-shims-0.23/1.2.1.spark2/hive-shims-0.23-1.2.1.spark2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/shims/hive-shims-0.23/1.2.1.spark2/hive-shims-0.23-1.2.1.spark2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_spark_project_hive_shims_hive_shims_common_1_2_1_spark2.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.spark-project.hive.shims:hive-shims-common:1.2.1.spark2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/shims/hive-shims-common/1.2.1.spark2/hive-shims-common-1.2.1.spark2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/shims/hive-shims-common/1.2.1.spark2/hive-shims-common-1.2.1.spark2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/shims/hive-shims-common/1.2.1.spark2/hive-shims-common-1.2.1.spark2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__org_spark_project_hive_shims_hive_shims_scheduler_1_2_1_spark2.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: org.spark-project.hive.shims:hive-shims-scheduler:1.2.1.spark2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/shims/hive-shims-scheduler/1.2.1.spark2/hive-shims-scheduler-1.2.1.spark2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/shims/hive-shims-scheduler/1.2.1.spark2/hive-shims-scheduler-1.2.1.spark2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/spark-project/hive/shims/hive-shims-scheduler/1.2.1.spark2/hive-shims-scheduler-1.2.1.spark2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__tomcat_jasper_compiler_5_5_23.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: tomcat:jasper-compiler:5.5.23">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/tomcat/jasper-compiler/5.5.23/jasper-compiler-5.5.23.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/tomcat/jasper-compiler/5.5.23/jasper-compiler-5.5.23-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/tomcat/jasper-compiler/5.5.23/jasper-compiler-5.5.23-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/libraries/Maven__tomcat_jasper_runtime_5_5_23.xml 0 → 100644
View file @ 72e224f1
<component name="libraryTable">
<library name="Maven: tomcat:jasper-runtime:5.5.23">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/tomcat/jasper-runtime/5.5.23/jasper-runtime-5.5.23.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/tomcat/jasper-runtime/5.5.23/jasper-runtime-5.5.23-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/tomcat/jasper-runtime/5.5.23/jasper-runtime-5.5.23-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
lib/java/bi-report-service/.idea/workspace.xml
View file @ 72e224f1
......@@ -80,8 +80,8 @@
<component name="RunAnythingCache">
<option name="myCommands">
<command value="mvn clean install" />
<command value="mvn clean" />
<command value="mvn clean install -DskipTests" />
<command value="mvn clean" />
</option>
</component>
<component name="RunManager" selected="JUnit.SparksqlServiceTest">
......@@ -215,7 +215,7 @@
<workItem from="1584945647680" duration="4469000" />
<workItem from="1588148891822" duration="2318000" />
<workItem from="1588152718016" duration="1463000" />
<workItem from="1588154601852" duration="20014000" />
<workItem from="1588154601852" duration="20492000" />
</task>
<servers />
</component>
......@@ -284,26 +284,26 @@
</state>
<state x="553" y="153" key="CommitChangelistDialog2/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584956237641" />
<state x="784" y="1223" key="CommitChangelistDialog2/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588154132365" />
<state width="1878" height="244" key="GridCell.Tab.0.bottom" timestamp="1588240342355">
<state width="1878" height="244" key="GridCell.Tab.0.bottom" timestamp="1588240789163">
<screen x="246" y="1080" width="1920" height="1151" />
</state>
<state width="1878" height="321" key="GridCell.Tab.0.bottom/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584688137007" />
<state width="1878" height="244" key="GridCell.Tab.0.bottom/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588240342355" />
<state width="1878" height="244" key="GridCell.Tab.0.center" timestamp="1588240342353">
<state width="1878" height="244" key="GridCell.Tab.0.bottom/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588240789163" />
<state width="1878" height="244" key="GridCell.Tab.0.center" timestamp="1588240789162">
<screen x="246" y="1080" width="1920" height="1151" />
</state>
<state width="1878" height="321" key="GridCell.Tab.0.center/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584688137005" />
<state width="1878" height="244" key="GridCell.Tab.0.center/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588240342353" />
<state width="1878" height="244" key="GridCell.Tab.0.left" timestamp="1588240342353">
<state width="1878" height="244" key="GridCell.Tab.0.center/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588240789162" />
<state width="1878" height="244" key="GridCell.Tab.0.left" timestamp="1588240789161">
<screen x="246" y="1080" width="1920" height="1151" />
</state>
<state width="1878" height="321" key="GridCell.Tab.0.left/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584688137005" />
<state width="1878" height="244" key="GridCell.Tab.0.left/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588240342353" />
<state width="1878" height="244" key="GridCell.Tab.0.right" timestamp="1588240342354">
<state width="1878" height="244" key="GridCell.Tab.0.left/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588240789161" />
<state width="1878" height="244" key="GridCell.Tab.0.right" timestamp="1588240789163">
<screen x="246" y="1080" width="1920" height="1151" />
</state>
<state width="1878" height="321" key="GridCell.Tab.0.right/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584688137006" />
<state width="1878" height="244" key="GridCell.Tab.0.right/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588240342354" />
<state width="1878" height="244" key="GridCell.Tab.0.right/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588240789163" />
<state width="1878" height="319" key="GridCell.Tab.1.bottom" timestamp="1588216559611">
<screen x="246" y="1080" width="1920" height="1151" />
</state>
......@@ -324,9 +324,9 @@
<screen x="0" y="22" width="1920" height="1058" />
</state>
<state x="560" y="291" key="Vcs.Push.Dialog.v2/246.1080.1920.1151/0.22.1920.1058@0.22.1920.1058" timestamp="1584949293518" />
<state x="715" y="1270" width="670" height="675" key="run.anything.popup" timestamp="1588240342374">
<state x="715" y="1270" width="670" height="675" key="run.anything.popup" timestamp="1588240789184">
<screen x="246" y="1080" width="1920" height="1151" />
</state>
<state x="715" y="1270" width="670" height="675" key="run.anything.popup/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588240342374" />
<state x="715" y="1270" width="670" height="675" key="run.anything.popup/246.1080.1920.1151/0.22.1920.1058@246.1080.1920.1151" timestamp="1588240789184" />
</component>
</project>
\ No newline at end of file
lib/java/bi-report-service/service-server/pom.xml
View file @ 72e224f1
......@@ -87,6 +87,33 @@
<artifactId>spark-hive_${scala.version}</artifactId>
<version>${spark.version}</version>
</dependency>
<!-- spark_hive依赖 -->
<dependency>
<groupId>org.spark-project.hive</groupId>
<artifactId>hive-jdbc</artifactId>
<version>1.2.1.spark2</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- hadoop依赖 -->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>2.6.0</version>
</dependency>
</dependencies>
<build>
<plugins>
......
lib/java/bi-report-service/service-server/service-server.iml
View file @ 72e224f1
......@@ -44,14 +44,13 @@
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.7.10" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.7.10" level="project" />
<orderEntry type="library" name="Maven: org.objenesis:objenesis:2.6" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
......@@ -90,10 +89,7 @@
<orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
<orderEntry type="library" name="Maven: org.apache.spark:spark-core_2.11:2.3.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.avro:avro:1.7.7" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
<orderEntry type="library" name="Maven: com.thoughtworks.paranamer:paranamer:2.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.4.1" level="project" />
<orderEntry type="library" name="Maven: org.tukaani:xz:1.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.avro:avro-mapred:hadoop2:1.7.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.avro:avro-ipc:1.7.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.avro:avro-ipc:tests:1.7.7" level="project" />
......@@ -103,25 +99,6 @@
<orderEntry type="library" name="Maven: com.twitter:chill-java:0.8.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.xbean:xbean-asm5-shaded:4.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-client:2.6.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-common:2.6.5" level="project" />
<orderEntry type="library" name="Maven: xmlenc:xmlenc:0.52" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
<orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.6" level="project" />
<orderEntry type="library" name="Maven: commons-digester:commons-digester:1.8" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.7.0" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.8.0" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-auth:2.6.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M15" level="project" />
<orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-i18n:2.0.0-M15" level="project" />
<orderEntry type="library" name="Maven: org.apache.directory.api:api-asn1-api:1.0.0-M20" level="project" />
<orderEntry type="library" name="Maven: org.apache.directory.api:api-util:1.0.0-M20" level="project" />
<orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.6.0" level="project" />
<orderEntry type="library" name="Maven: org.htrace:htrace-core:3.0.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-hdfs:2.6.5" level="project" />
<orderEntry type="library" name="Maven: org.mortbay.jetty:jetty-util:6.1.26" level="project" />
<orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-mapreduce-client-app:2.6.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-mapreduce-client-common:2.6.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-yarn-client:2.6.5" level="project" />
......@@ -130,11 +107,7 @@
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-yarn-api:2.6.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-mapreduce-client-core:2.6.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-yarn-common:2.6.5" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.0" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.9.13" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-xc:1.9.13" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-mapreduce-client-jobclient:2.6.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-annotations:2.6.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.spark:spark-launcher_2.11:2.3.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.spark:spark-kvstore_2.11:2.3.0" level="project" />
<orderEntry type="library" name="Maven: org.fusesource.leveldbjni:leveldbjni-all:1.8" level="project" />
......@@ -144,14 +117,10 @@
<orderEntry type="library" name="Maven: org.apache.spark:spark-network-shuffle_2.11:2.3.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.spark:spark-unsafe_2.11:2.3.0" level="project" />
<orderEntry type="library" name="Maven: net.java.dev.jets3t:jets3t:0.9.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.9" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.52" level="project" />
<orderEntry type="library" name="Maven: com.jamesmurty.utils:java-xmlbuilder:1.1" level="project" />
<orderEntry type="library" name="Maven: net.iharder:base64:2.3.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.curator:curator-recipes:2.6.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.6.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:16.0.1" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.4.1" level="project" />
......@@ -208,8 +177,6 @@
<orderEntry type="library" name="Maven: org.codehaus.janino:commons-compiler:3.0.8" level="project" />
<orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.orc:orc-core:nohive:1.4.1" level="project" />
<orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.5.0" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: io.airlift:aircompressor:0.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.orc:orc-mapreduce:nohive:1.4.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.parquet:parquet-column:1.8.2" level="project" />
......@@ -226,7 +193,6 @@
<orderEntry type="library" name="Maven: org.apache.spark:spark-hive_2.11:2.3.0" level="project" />
<orderEntry type="library" name="Maven: com.twitter:parquet-hadoop-bundle:1.6.0" level="project" />
<orderEntry type="library" name="Maven: org.spark-project.hive:hive-exec:1.2.1.spark2" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
<orderEntry type="library" name="Maven: javolution:javolution:5.5.1" level="project" />
<orderEntry type="library" name="Maven: log4j:apache-log4j-extras:1.2.17" level="project" />
<orderEntry type="library" name="Maven: org.antlr:antlr-runtime:3.4" level="project" />
......@@ -239,8 +205,6 @@
<orderEntry type="library" name="Maven: net.sf.opencsv:opencsv:2.3" level="project" />
<orderEntry type="library" name="Maven: org.spark-project.hive:hive-metastore:1.2.1.spark2" level="project" />
<orderEntry type="library" name="Maven: com.jolbox:bonecp:0.8.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
<orderEntry type="library" name="Maven: org.datanucleus:datanucleus-api-jdo:3.2.6" level="project" />
<orderEntry type="library" name="Maven: org.datanucleus:datanucleus-rdbms:3.2.9" level="project" />
<orderEntry type="library" name="Maven: commons-pool:commons-pool:1.6" level="project" />
......@@ -260,5 +224,79 @@
<orderEntry type="library" name="Maven: org.apache.thrift:libthrift:0.9.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.thrift:libfb303:0.9.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.derby:derby:10.14.1.0" level="project" />
<orderEntry type="library" name="Maven: org.spark-project.hive:hive-jdbc:1.2.1.spark2" level="project" />
<orderEntry type="library" name="Maven: org.spark-project.hive:hive-common:1.2.1.spark2" level="project" />
<orderEntry type="library" name="Maven: org.apache.ant:ant:1.9.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.9.1" level="project" />
<orderEntry type="library" name="Maven: org.json:json:20090211" level="project" />
<orderEntry type="library" name="Maven: org.spark-project.hive:hive-service:1.2.1.spark2" level="project" />
<orderEntry type="library" name="Maven: net.sf.jpam:jpam:1.1" level="project" />
<orderEntry type="library" name="Maven: org.spark-project.hive:hive-serde:1.2.1.spark2" level="project" />
<orderEntry type="library" name="Maven: org.spark-project.hive:hive-shims:1.2.1.spark2" level="project" />
<orderEntry type="library" name="Maven: org.spark-project.hive.shims:hive-shims-common:1.2.1.spark2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.spark-project.hive.shims:hive-shims-0.20S:1.2.1.spark2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.spark-project.hive.shims:hive-shims-0.23:1.2.1.spark2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.hadoop:hadoop-yarn-server-resourcemanager:2.6.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.google.inject.extensions:guice-servlet:3.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.google.inject:guice:3.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: javax.inject:javax.inject:1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: aopalliance:aopalliance:1.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey.contribs:jersey-guice:1.9" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.sun.jersey:jersey-client:1.9" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:2.6.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.hadoop:hadoop-yarn-server-web-proxy:2.6.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.spark-project.hive.shims:hive-shims-scheduler:1.2.1.spark2" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.4.6" level="project" />
<orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
<orderEntry type="library" name="Maven: org.apache.curator:curator-framework:2.6.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.7.25" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-hdfs:2.6.0" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
<orderEntry type="library" name="Maven: org.mortbay.jetty:jetty:6.1.26" level="project" />
<orderEntry type="library" name="Maven: org.mortbay.jetty:jetty-util:6.1.26" level="project" />
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.9" level="project" />
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-server:1.9" level="project" />
<orderEntry type="library" name="Maven: asm:asm:3.1" level="project" />
<orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.4" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
<orderEntry type="library" name="Maven: commons-daemon:commons-daemon:1.0.13" level="project" />
<orderEntry type="library" name="Maven: javax.servlet.jsp:jsp-api:2.1" level="project" />
<orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.5.0" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
<orderEntry type="library" name="Maven: tomcat:jasper-runtime:5.5.23" level="project" />
<orderEntry type="library" name="Maven: xmlenc:xmlenc:0.52" level="project" />
<orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
<orderEntry type="library" name="Maven: org.htrace:htrace-core:3.0.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-common:2.6.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-annotations:2.6.0" level="project" />
<orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-json:1.9" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.3-1" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.3.0" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.8.3" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-xc:1.8.3" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: tomcat:jasper-compiler:5.5.23" level="project" />
<orderEntry type="library" name="Maven: commons-el:commons-el:1.0" level="project" />
<orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.6" level="project" />
<orderEntry type="library" name="Maven: commons-digester:commons-digester:1.8" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.7.0" level="project" />
<orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.8.0" level="project" />
<orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.hadoop:hadoop-auth:2.6.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M15" level="project" />
<orderEntry type="library" name="Maven: org.apache.directory.server:apacheds-i18n:2.0.0-M15" level="project" />
<orderEntry type="library" name="Maven: org.apache.directory.api:api-asn1-api:1.0.0-M20" level="project" />
<orderEntry type="library" name="Maven: org.apache.directory.api:api-util:1.0.0-M20" level="project" />
<orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.42" level="project" />
<orderEntry type="library" name="Maven: org.apache.curator:curator-client:2.6.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.4.1" level="project" />
<orderEntry type="library" name="Maven: org.tukaani:xz:1.0" level="project" />
</component>
</module>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment