Repository: kylin Updated Branches: refs/heads/master 50c948ce5 -> 07c242e8d
Revert "KYLIN-1821 add intellij per project settings" This reverts commit 50c948ce5026b34eb90b73ad29d82ff66c918487. Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/07c242e8 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/07c242e8 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/07c242e8 Branch: refs/heads/master Commit: 07c242e8df80e4706bb2d880e340e94bf297ba54 Parents: 50c948c Author: Hongbin Ma <mahong...@apache.org> Authored: Mon Jun 27 11:06:20 2016 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Mon Jun 27 11:06:20 2016 +0800 ---------------------------------------------------------------------- .gitignore | 5 +- .idea/.name | 1 - .idea/codeStyleSettings.xml | 15 -- .idea/compiler.xml | 192 ------------------ .idea/copyright/apache.xml | 6 - .idea/copyright/profiles_settings.xml | 7 - .idea/encodings.xml | 28 --- .idea/misc.xml | 129 ------------ .idea/modules.xml | 29 --- .idea/vcs.xml | 6 - .idea/workspace.xml | 308 ----------------------------- 11 files changed, 2 insertions(+), 724 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/07c242e8/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index ac36c7e..bb8b3b0 100644 --- a/.gitignore +++ b/.gitignore @@ -15,8 +15,6 @@ release.properties #IDEA *.iml #.settings -.idea/libraries -.idea/artifacts # External tool builders .externalToolBuilders/ @@ -55,6 +53,7 @@ hs_err_pid* # / .classpath .project +.idea .DS_Store target logs @@ -89,4 +88,4 @@ build/commit_SHA1 dist/ tomcat/ webapp/app/kylin-servlet.xml -webapp/app/web.xml +webapp/app/web.xml \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/07c242e8/.idea/.name ---------------------------------------------------------------------- diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 773ee9a..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -kylin \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/07c242e8/.idea/codeStyleSettings.xml ---------------------------------------------------------------------- diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index 11db1c3..0000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ProjectCodeStyleSettingsManager"> - <option name="PER_PROJECT_SETTINGS"> - <value> - <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" /> - <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" /> - <MarkdownNavigatorCodeStyleSettings> - <option name="RIGHT_MARGIN" value="72" /> - </MarkdownNavigatorCodeStyleSettings> - </value> - </option> - <option name="USE_PER_PROJECT_SETTINGS" value="true" /> - </component> -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/07c242e8/.idea/compiler.xml ---------------------------------------------------------------------- diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 2cb50c6..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,192 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="CompilerConfiguration"> - <resourceExtensions /> - <wildcardResourcePatterns> - <entry name="!?*.java" /> - <entry name="!?*.form" /> - <entry name="!?*.class" /> - <entry name="!?*.groovy" /> - <entry name="!?*.scala" /> - <entry name="!?*.flex" /> - <entry name="!?*.kt" /> - <entry name="!?*.clj" /> - </wildcardResourcePatterns> - <annotationProcessing> - <profile default="true" name="Default" enabled="false"> - <processorPath useClasspath="true" /> - </profile> - <profile default="false" name="Annotation profile for atopcalcite" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="atopcalcite" /> - </profile> - <profile default="false" name="Annotation profile for kylin-invertedindex" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-invertedindex" /> - </profile> - <profile default="false" name="Annotation profile for kylin-core-common" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-core-common" /> - </profile> - <profile default="false" name="Annotation profile for kylin-assembly" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-assembly" /> - </profile> - <profile default="false" name="Annotation profile for kylin-core-metadata" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-core-metadata" /> - </profile> - <profile default="false" name="Annotation profile for kylin-tool" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-tool" /> - </profile> - <profile default="false" name="Annotation profile for kylin-core-dictionary" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-core-dictionary" /> - </profile> - <profile default="false" name="Annotation profile for kylin-it" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-it" /> - </profile> - <profile default="false" name="Annotation profile for kylin-storage-hbase" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-storage-hbase" /> - </profile> - <profile default="false" name="Annotation profile for kylin-query" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-query" /> - </profile> - <profile default="false" name="Annotation profile for kylin-server" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-server" /> - </profile> - <profile default="false" name="Annotation profile for kylin-jdbc" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-jdbc" /> - </profile> - <profile default="false" name="Annotation profile for kylin-engine-streaming" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-engine-streaming" /> - </profile> - <profile default="false" name="Annotation profile for kylin-engine-spark" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-engine-spark" /> - </profile> - <profile default="false" name="Annotation profile for kylin-source-hive" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-source-hive" /> - </profile> - <profile default="false" name="Annotation profile for kylin-source-kafka" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-source-kafka" /> - </profile> - <profile default="false" name="Annotation profile for kylin-core-cube" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-core-cube" /> - </profile> - <profile default="false" name="Annotation profile for kylin-core-job" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-core-job" /> - </profile> - <profile default="false" name="Annotation profile for kylin-server-base" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-server-base" /> - </profile> - <profile default="false" name="Annotation profile for kylin-core-storage" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-core-storage" /> - </profile> - <profile default="false" name="Annotation profile for kylin-engine-mr" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <processorPath useClasspath="true" /> - <module name="kylin-engine-mr" /> - </profile> - </annotationProcessing> - <bytecodeTargetLevel> - <module name="atopcalcite" target="1.7" /> - <module name="kylin" target="1.7" /> - <module name="kylin-assembly" target="1.7" /> - <module name="kylin-core-common" target="1.7" /> - <module name="kylin-core-cube" target="1.7" /> - <module name="kylin-core-dictionary" target="1.7" /> - <module name="kylin-core-job" target="1.7" /> - <module name="kylin-core-metadata" target="1.7" /> - <module name="kylin-core-storage" target="1.7" /> - <module name="kylin-engine-mr" target="1.7" /> - <module name="kylin-engine-spark" target="1.7" /> - <module name="kylin-engine-streaming" target="1.7" /> - <module name="kylin-invertedindex" target="1.7" /> - <module name="kylin-it" target="1.7" /> - <module name="kylin-jdbc" target="1.7" /> - <module name="kylin-query" target="1.7" /> - <module name="kylin-server" target="1.7" /> - <module name="kylin-server-base" target="1.7" /> - <module name="kylin-source-hive" target="1.7" /> - <module name="kylin-source-kafka" target="1.7" /> - <module name="kylin-storage-hbase" target="1.7" /> - <module name="kylin-tool" target="1.7" /> - </bytecodeTargetLevel> - </component> -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/07c242e8/.idea/copyright/apache.xml ---------------------------------------------------------------------- diff --git a/.idea/copyright/apache.xml b/.idea/copyright/apache.xml deleted file mode 100644 index 956fc57..0000000 --- a/.idea/copyright/apache.xml +++ /dev/null @@ -1,6 +0,0 @@ -<component name="CopyrightManager"> - <copyright> - <option name="myName" value="apache" /> - <option name="notice" value="/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you 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. */" /> - </copyright> -</component> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/07c242e8/.idea/copyright/profiles_settings.xml ---------------------------------------------------------------------- diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index ace2e99..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ -<component name="CopyrightManager"> - <settings default="apache"> - <module2copyright> - <element module="All" copyright="apache" /> - </module2copyright> - </settings> -</component> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/07c242e8/.idea/encodings.xml ---------------------------------------------------------------------- diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 7b1a5a8..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="Encoding"> - <file url="file://$PROJECT_DIR$" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/assembly" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/atopcalcite" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/core-common" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/core-cube" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/core-dictionary" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/core-job" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/core-metadata" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/core-storage" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/engine-mr" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/engine-spark" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/engine-streaming" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/invertedindex" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/jdbc" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/kylin-it" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/query" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/server" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/server-base" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/source-hive" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/source-kafka" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/storage-hbase" charset="UTF-8" /> - <file url="file://$PROJECT_DIR$/tool" charset="UTF-8" /> - <file url="PROJECT" charset="UTF-8" /> - </component> -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/07c242e8/.idea/misc.xml ---------------------------------------------------------------------- diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 1c57775..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,129 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="EclipseCodeFormatter"> - <option name="defaultSettings" value="true" /> - <option name="id" value="1457598148058" /> - <option name="importOrderConfigFilePath" value="$USER_HOME$/Kylin/core-common/.settings/org.eclipse.jdt.ui.prefs" /> - <option name="importOrderFromFile" value="true" /> - <option name="name" value="default" /> - <option name="pathToConfigFileJava" value="$USER_HOME$/kap/kylin/core-common/.settings/org.eclipse.jdt.core.prefs" /> - </component> - <component name="FrameworkDetectionExcludesConfiguration"> - <file type="web" url="file://$PROJECT_DIR$/server" /> - </component> - <component name="MavenProjectsManager"> - <option name="originalFiles"> - <list> - <option value="$PROJECT_DIR$/pom.xml" /> - </list> - </option> - </component> - <component name="ProjectInspectionProfilesVisibleTreeState"> - <entry key="Project Default"> - <profile-state> - <expanded-state> - <State> - <id /> - </State> - <State> - <id>Android Lint</id> - </State> - <State> - <id>Plugin DevKit</id> - </State> - </expanded-state> - <selected-state> - <State> - <id>Android</id> - </State> - </selected-state> - </profile-state> - </entry> - </component> - <component name="ProjectLevelVcsManager" settingsEditedManually="false"> - <OptionsSetting value="true" id="Add" /> - <OptionsSetting value="true" id="Remove" /> - <OptionsSetting value="true" id="Checkout" /> - <OptionsSetting value="true" id="Update" /> - <OptionsSetting value="true" id="Status" /> - <OptionsSetting value="true" id="Edit" /> - <ConfirmationsSetting value="0" id="Add" /> - <ConfirmationsSetting value="0" id="Remove" /> - </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK"> - <output url="file://$PROJECT_DIR$/out" /> - </component> - <component name="masterDetails"> - <states> - <state key="Copyright.UI"> - <settings> - <last-edited>apache</last-edited> - <splitter-proportions> - <option name="proportions"> - <list> - <option value="0.2" /> - </list> - </option> - </splitter-proportions> - </settings> - </state> - <state key="GlobalLibrariesConfigurable.UI"> - <settings> - <splitter-proportions> - <option name="proportions"> - <list> - <option value="0.2" /> - </list> - </option> - </splitter-proportions> - </settings> - </state> - <state key="JdkListConfigurable.UI"> - <settings> - <last-edited>1.7</last-edited> - <splitter-proportions> - <option name="proportions"> - <list> - <option value="0.2" /> - </list> - </option> - </splitter-proportions> - </settings> - </state> - <state key="ProjectJDKs.UI"> - <settings> - <last-edited>1.7</last-edited> - <splitter-proportions> - <option name="proportions"> - <list> - <option value="0.2" /> - </list> - </option> - </splitter-proportions> - </settings> - </state> - <state key="ProjectLibrariesConfigurable.UI"> - <settings> - <splitter-proportions> - <option name="proportions"> - <list> - <option value="0.2" /> - </list> - </option> - </splitter-proportions> - </settings> - </state> - <state key="ScopeChooserConfigurable.UI"> - <settings> - <splitter-proportions> - <option name="proportions"> - <list> - <option value="0.2" /> - </list> - </option> - </splitter-proportions> - </settings> - </state> - </states> - </component> -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/07c242e8/.idea/modules.xml ---------------------------------------------------------------------- diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 8174d52..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ProjectModuleManager"> - <modules> - <module fileurl="file://$PROJECT_DIR$/atopcalcite/atopcalcite.iml" filepath="$PROJECT_DIR$/atopcalcite/atopcalcite.iml" /> - <module fileurl="file://$PROJECT_DIR$/kylin.iml" filepath="$PROJECT_DIR$/kylin.iml" /> - <module fileurl="file://$PROJECT_DIR$/assembly/kylin-assembly.iml" filepath="$PROJECT_DIR$/assembly/kylin-assembly.iml" /> - <module fileurl="file://$PROJECT_DIR$/core-common/kylin-core-common.iml" filepath="$PROJECT_DIR$/core-common/kylin-core-common.iml" /> - <module fileurl="file://$PROJECT_DIR$/core-cube/kylin-core-cube.iml" filepath="$PROJECT_DIR$/core-cube/kylin-core-cube.iml" /> - <module fileurl="file://$PROJECT_DIR$/core-dictionary/kylin-core-dictionary.iml" filepath="$PROJECT_DIR$/core-dictionary/kylin-core-dictionary.iml" /> - <module fileurl="file://$PROJECT_DIR$/core-job/kylin-core-job.iml" filepath="$PROJECT_DIR$/core-job/kylin-core-job.iml" /> - <module fileurl="file://$PROJECT_DIR$/core-metadata/kylin-core-metadata.iml" filepath="$PROJECT_DIR$/core-metadata/kylin-core-metadata.iml" /> - <module fileurl="file://$PROJECT_DIR$/core-storage/kylin-core-storage.iml" filepath="$PROJECT_DIR$/core-storage/kylin-core-storage.iml" /> - <module fileurl="file://$PROJECT_DIR$/engine-mr/kylin-engine-mr.iml" filepath="$PROJECT_DIR$/engine-mr/kylin-engine-mr.iml" /> - <module fileurl="file://$PROJECT_DIR$/engine-spark/kylin-engine-spark.iml" filepath="$PROJECT_DIR$/engine-spark/kylin-engine-spark.iml" /> - <module fileurl="file://$PROJECT_DIR$/engine-streaming/kylin-engine-streaming.iml" filepath="$PROJECT_DIR$/engine-streaming/kylin-engine-streaming.iml" /> - <module fileurl="file://$PROJECT_DIR$/invertedindex/kylin-invertedindex.iml" filepath="$PROJECT_DIR$/invertedindex/kylin-invertedindex.iml" /> - <module fileurl="file://$PROJECT_DIR$/kylin-it/kylin-it.iml" filepath="$PROJECT_DIR$/kylin-it/kylin-it.iml" /> - <module fileurl="file://$PROJECT_DIR$/jdbc/kylin-jdbc.iml" filepath="$PROJECT_DIR$/jdbc/kylin-jdbc.iml" /> - <module fileurl="file://$PROJECT_DIR$/query/kylin-query.iml" filepath="$PROJECT_DIR$/query/kylin-query.iml" /> - <module fileurl="file://$PROJECT_DIR$/server/kylin-server.iml" filepath="$PROJECT_DIR$/server/kylin-server.iml" /> - <module fileurl="file://$PROJECT_DIR$/server-base/kylin-server-base.iml" filepath="$PROJECT_DIR$/server-base/kylin-server-base.iml" /> - <module fileurl="file://$PROJECT_DIR$/source-hive/kylin-source-hive.iml" filepath="$PROJECT_DIR$/source-hive/kylin-source-hive.iml" /> - <module fileurl="file://$PROJECT_DIR$/source-kafka/kylin-source-kafka.iml" filepath="$PROJECT_DIR$/source-kafka/kylin-source-kafka.iml" /> - <module fileurl="file://$PROJECT_DIR$/storage-hbase/kylin-storage-hbase.iml" filepath="$PROJECT_DIR$/storage-hbase/kylin-storage-hbase.iml" /> - <module fileurl="file://$PROJECT_DIR$/tool/kylin-tool.iml" filepath="$PROJECT_DIR$/tool/kylin-tool.iml" /> - </modules> - </component> -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/07c242e8/.idea/vcs.xml ---------------------------------------------------------------------- diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="VcsDirectoryMappings"> - <mapping directory="$PROJECT_DIR$" vcs="Git" /> - </component> -</project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/07c242e8/.idea/workspace.xml ---------------------------------------------------------------------- diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index d216822..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,308 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ChangeListManager"> - <list default="true" id="c2e383e4-3e86-4058-b83d-9eabb9234fb7" name="Default" comment=""> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/.name" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/codeStyleSettings.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/compiler.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/copyright/apache.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/copyright/profiles_settings.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/encodings.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" /> - </list> - <ignored path="kylin.iws" /> - <ignored path=".idea/workspace.xml" /> - <ignored path="$PROJECT_DIR$/engine-streaming/target/" /> - <ignored path="$PROJECT_DIR$/core-common/target/" /> - <ignored path="$PROJECT_DIR$/source-kafka/target/" /> - <ignored path="$PROJECT_DIR$/core-job/target/" /> - <ignored path="$PROJECT_DIR$/server-base/target/" /> - <ignored path="$PROJECT_DIR$/tool/target/" /> - <ignored path="$PROJECT_DIR$/core-dictionary/target/" /> - <ignored path="$PROJECT_DIR$/storage-hbase/target/" /> - <ignored path="$PROJECT_DIR$/core-storage/target/" /> - <ignored path="$PROJECT_DIR$/kylin-it/target/" /> - <ignored path="$PROJECT_DIR$/engine-spark/target/" /> - <ignored path="$PROJECT_DIR$/core-metadata/target/" /> - <ignored path="$PROJECT_DIR$/source-hive/target/" /> - <ignored path="$PROJECT_DIR$/jdbc/target/" /> - <ignored path="$PROJECT_DIR$/invertedindex/target/" /> - <ignored path="$PROJECT_DIR$/server/target/" /> - <ignored path="$PROJECT_DIR$/atopcalcite/target/" /> - <ignored path="$PROJECT_DIR$/target/" /> - <ignored path="$PROJECT_DIR$/query/target/" /> - <ignored path="$PROJECT_DIR$/engine-mr/target/" /> - <ignored path="$PROJECT_DIR$/core-cube/target/" /> - <ignored path="$PROJECT_DIR$/assembly/target/" /> - <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> - <option name="TRACKING_ENABLED" value="true" /> - <option name="SHOW_DIALOG" value="false" /> - <option name="HIGHLIGHT_CONFLICTS" value="true" /> - <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> - <option name="LAST_RESOLUTION" value="IGNORE" /> - </component> - <component name="ChangesViewManager" flattened_view="true" show_ignored="false" /> - <component name="CreatePatchCommitExecutor"> - <option name="PATCH_PATH" value="" /> - </component> - <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> - <component name="FavoritesManager"> - <favorites_list name="kylin" /> - </component> - <component name="Git.Settings"> - <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> - </component> - <component name="GradleLocalSettings"> - <option name="modificationStamps"> - <map> - <entry key="$USER_HOME$/work/opensrc/kafka" value="4302046574000" /> - </map> - </option> - <option name="externalProjectsViewState"> - <projects_view /> - </option> - </component> - <component name="JsBuildToolGruntFileManager" detection-done="true" /> - <component name="JsBuildToolPackageJson" detection-done="true" /> - <component name="JsGulpfileManager"> - <detection-done>true</detection-done> - </component> - <component name="MavenImportPreferences"> - <option name="generalSettings"> - <MavenGeneralSettings> - <option name="mavenHome" value="Bundled (Maven 3)" /> - </MavenGeneralSettings> - </option> - <option name="importingSettings"> - <MavenImportingSettings> - <option name="importAutomatically" value="true" /> - </MavenImportingSettings> - </option> - </component> - <component name="ProjectFrameBounds"> - <option name="x" value="26" /> - <option name="y" value="44" /> - <option name="width" value="1440" /> - <option name="height" value="817" /> - </component> - <component name="ProjectLevelVcsManager" settingsEditedManually="false"> - <OptionsSetting value="true" id="Add" /> - <OptionsSetting value="true" id="Remove" /> - <OptionsSetting value="true" id="Checkout" /> - <OptionsSetting value="true" id="Update" /> - <OptionsSetting value="true" id="Status" /> - <OptionsSetting value="true" id="Edit" /> - <ConfirmationsSetting value="0" id="Add" /> - <ConfirmationsSetting value="0" id="Remove" /> - </component> - <component name="ProjectView"> - <navigator currentView="ProjectPane" proportions="" version="1"> - <flattenPackages /> - <showMembers /> - <showModules /> - <showLibraryContents /> - <hideEmptyPackages /> - <abbreviatePackageNames /> - <autoscrollToSource /> - <autoscrollFromSource /> - <sortByType /> - <manualOrder /> - <foldersAlwaysOnTop value="true" /> - </navigator> - <panes> - <pane id="Scratches" /> - <pane id="Scope" /> - <pane id="PackagesPane" /> - <pane id="ProjectPane"> - <subPane> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="kylin" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="kylin" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="kylin" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - </subPane> - </pane> - </panes> - </component> - <component name="PropertiesComponent"> - <property name="GoToClass.includeLibraries" value="false" /> - <property name="GoToClass.toSaveIncludeLibraries" value="false" /> - <property name="GoToFile.includeJavaFiles" value="false" /> - <property name="MemberChooser.sorted" value="false" /> - <property name="MemberChooser.showClasses" value="true" /> - <property name="MemberChooser.copyJavadoc" value="false" /> - <property name="options.lastSelected" value="Errors" /> - <property name="options.splitter.main.proportions" value="0.3" /> - <property name="options.splitter.details.proportions" value="0.2" /> - <property name="options.searchVisible" value="true" /> - <property name="last_opened_file_path" value="/Library/Java/JavaVirtualMachines/jdk1.7.0_80.jdk/Contents/Home/bin/jvisualvm" /> - <property name="settings.editor.selected.configurable" value="preferences.sourceCode.Java" /> - <property name="settings.editor.splitter.proportion" value="0.2" /> - <property name="project.structure.last.edited" value="Project" /> - <property name="project.structure.proportion" value="0.0" /> - <property name="project.structure.side.proportion" value="0.0" /> - <property name="aspect.path.notification.shown" value="true" /> - <property name="WebServerToolWindowFactoryState" value="false" /> - </component> - <component name="RunManager"> - <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin"> - <module name="" /> - <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" /> - <option name="PROGRAM_PARAMETERS" /> - <method /> - </configuration> - <configuration default="true" type="Applet" factoryName="Applet"> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> - <module /> - <method /> - </configuration> - <configuration default="true" type="Application" factoryName="Application"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <module name="" /> - <envs /> - <method /> - </configuration> - <configuration default="true" type="JUnit" factoryName="JUnit"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" value="-ea" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="singleModule" /> - </option> - <envs /> - <patterns /> - <method /> - </configuration> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - <method /> - </configuration> - <configuration default="true" type="TestNG" factoryName="TestNG"> - <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> - <module name="" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="SUITE_NAME" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="GROUP_NAME" /> - <option name="TEST_OBJECT" value="CLASS" /> - <option name="VM_PARAMETERS" value="-ea" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" /> - <option name="OUTPUT_DIRECTORY" /> - <option name="ANNOTATION_TYPE" /> - <option name="ENV_VARIABLES" /> - <option name="PASS_PARENT_ENVS" value="true" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="singleModule" /> - </option> - <option name="USE_DEFAULT_REPORTERS" value="false" /> - <option name="PROPERTIES_FILE" /> - <envs /> - <properties /> - <listeners /> - <method /> - </configuration> - </component> - <component name="SbtLocalSettings"> - <option name="externalProjectsViewState"> - <projects_view /> - </option> - </component> - <component name="ShelveChangesManager" show_recycled="false" /> - <component name="TaskManager"> - <task active="true" id="Default" summary="Default task"> - <changelist id="c2e383e4-3e86-4058-b83d-9eabb9234fb7" name="Default" comment="" /> - <created>1466995796639</created> - <option name="number" value="Default" /> - <updated>1466995796639</updated> - <workItem from="1466995799442" duration="416000" /> - </task> - <servers /> - </component> - <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="416000" /> - </component> - <component name="ToolWindowManager"> - <frame x="26" y="44" width="1440" height="817" extended-state="0" /> - <editor active="false" /> - <layout> - <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="CheckStyle" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> - <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> - <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> - <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> - </layout> - </component> - <component name="VcsContentAnnotationSettings"> - <option name="myLimit" value="2678400000" /> - </component> - <component name="XDebuggerManager"> - <breakpoint-manager /> - <watches-manager /> - </component> -</project> \ No newline at end of file
