reformat code
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e3b8be38 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e3b8be38 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e3b8be38 Branch: refs/heads/master Commit: e3b8be38c855ee1395fd4765462702215efe76bb Parents: 48180ec Author: Jason <jiat...@163.com> Authored: Tue Jul 12 16:28:29 2016 +0800 Committer: Jason <jiat...@163.com> Committed: Tue Jul 12 20:25:25 2016 +0800 ---------------------------------------------------------------------- assembly/pom.xml | 5 +- atopcalcite/pom.xml | 5 +- build/conf/kylin_job_conf.xml | 54 +-- build/conf/kylin_job_conf_inmem.xml | 98 ++-- build/deploy/server.xml | 20 +- checkstyle-suppressions.xml | 10 +- checkstyle.xml | 6 +- core-common/pom.xml | 9 +- core-cube/pom.xml | 3 +- core-dictionary/pom.xml | 5 +- core-job/pom.xml | 5 +- core-metadata/pom.xml | 7 +- core-storage/pom.xml | 5 +- engine-mr/pom.xml | 3 +- engine-spark/pom.xml | 9 +- engine-streaming/pom.xml | 4 +- jdbc/pom.xml | 3 +- pom.xml | 25 +- query/pom.xml | 5 +- server-base/pom.xml | 5 +- server/pom.xml | 9 +- source-hive/pom.xml | 5 +- source-kafka/pom.xml | 3 +- storage-hbase/pom.xml | 6 +- webapp/.jshintrc | 1 - webapp/Gruntfile.js | 524 ++++++++++---------- webapp/app/css/AdminLTE.css | 787 +++++++++++++++++++++++++++++-- webapp/app/index.html | 118 ++--- webapp/app/js/app.js | 4 +- webapp/app/js/config.js | 102 ++-- webapp/app/js/listeners.js | 20 +- webapp/app/less/app.less | 20 +- webapp/app/less/build.less | 1 - webapp/app/less/component.less | 284 ++++++++--- webapp/app/less/home.less | 6 +- webapp/app/less/layout.less | 5 +- webapp/app/less/navbar.less | 80 ++-- webapp/app/partials/footer.html | 9 +- webapp/app/partials/header.html | 113 ++--- webapp/app/partials/home.html | 70 +-- webapp/app/partials/login.html | 64 +-- webapp/app/routes.json | 194 ++++---- webapp/bower.json | 2 +- webapp/grunt.json | 148 +++--- webapp/package.json | 40 +- 45 files changed, 1923 insertions(+), 978 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index fc1ef63..4442e14 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <parent> <artifactId>kylin</artifactId> <groupId>org.apache.kylin</groupId> @@ -220,7 +221,7 @@ </activation> <build> <plugins> - + </plugins> </build> </profile> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/atopcalcite/pom.xml ---------------------------------------------------------------------- diff --git a/atopcalcite/pom.xml b/atopcalcite/pom.xml index be28f1c..b208ea1 100644 --- a/atopcalcite/pom.xml +++ b/atopcalcite/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <artifactId>atopcalcite</artifactId> @@ -32,7 +33,7 @@ <properties> </properties> - + <dependencies> <dependency> <groupId>org.apache.calcite</groupId> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/build/conf/kylin_job_conf.xml ---------------------------------------------------------------------- diff --git a/build/conf/kylin_job_conf.xml b/build/conf/kylin_job_conf.xml index 19c8847..877e82f 100644 --- a/build/conf/kylin_job_conf.xml +++ b/build/conf/kylin_job_conf.xml @@ -25,37 +25,37 @@ </description> </property> - <property> - <name>mapred.compress.map.output</name> - <value>true</value> - <description>Compress map outputs</description> - </property> + <property> + <name>mapred.compress.map.output</name> + <value>true</value> + <description>Compress map outputs</description> + </property> - <property> - <name>mapred.map.output.compression.codec</name> - <value>org.apache.hadoop.io.compress.SnappyCodec</value> - <description>The compression codec to use for map outputs - </description> - </property> + <property> + <name>mapred.map.output.compression.codec</name> + <value>org.apache.hadoop.io.compress.SnappyCodec</value> + <description>The compression codec to use for map outputs + </description> + </property> - <property> - <name>mapred.output.compress</name> - <value>true</value> - <description>Compress the output of a MapReduce job</description> - </property> + <property> + <name>mapred.output.compress</name> + <value>true</value> + <description>Compress the output of a MapReduce job</description> + </property> - <property> - <name>mapred.output.compression.codec</name> - <value>org.apache.hadoop.io.compress.SnappyCodec</value> - <description>The compression codec to use for job outputs - </description> - </property> + <property> + <name>mapred.output.compression.codec</name> + <value>org.apache.hadoop.io.compress.SnappyCodec</value> + <description>The compression codec to use for job outputs + </description> + </property> - <property> - <name>mapred.output.compression.type</name> - <value>BLOCK</value> - <description>The compression type to use for job outputs</description> - </property> + <property> + <name>mapred.output.compression.type</name> + <value>BLOCK</value> + <description>The compression type to use for job outputs</description> + </property> <property> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/build/conf/kylin_job_conf_inmem.xml ---------------------------------------------------------------------- diff --git a/build/conf/kylin_job_conf_inmem.xml b/build/conf/kylin_job_conf_inmem.xml index 55bf9ed..1cd809d 100644 --- a/build/conf/kylin_job_conf_inmem.xml +++ b/build/conf/kylin_job_conf_inmem.xml @@ -25,37 +25,37 @@ </description> </property> - <property> - <name>mapred.compress.map.output</name> - <value>true</value> - <description>Compress map outputs</description> - </property> - - <property> - <name>mapred.map.output.compression.codec</name> - <value>org.apache.hadoop.io.compress.SnappyCodec</value> - <description>The compression codec to use for map outputs - </description> - </property> - - <property> - <name>mapred.output.compress</name> - <value>true</value> - <description>Compress the output of a MapReduce job</description> - </property> - - <property> - <name>mapred.output.compression.codec</name> - <value>org.apache.hadoop.io.compress.SnappyCodec</value> - <description>The compression codec to use for job outputs - </description> - </property> - - <property> - <name>mapred.output.compression.type</name> - <value>BLOCK</value> - <description>The compression type to use for job outputs</description> - </property> + <property> + <name>mapred.compress.map.output</name> + <value>true</value> + <description>Compress map outputs</description> + </property> + + <property> + <name>mapred.map.output.compression.codec</name> + <value>org.apache.hadoop.io.compress.SnappyCodec</value> + <description>The compression codec to use for map outputs + </description> + </property> + + <property> + <name>mapred.output.compress</name> + <value>true</value> + <description>Compress the output of a MapReduce job</description> + </property> + + <property> + <name>mapred.output.compression.codec</name> + <value>org.apache.hadoop.io.compress.SnappyCodec</value> + <description>The compression codec to use for job outputs + </description> + </property> + + <property> + <name>mapred.output.compression.type</name> + <value>BLOCK</value> + <description>The compression type to use for job outputs</description> + </property> <property> @@ -76,23 +76,23 @@ <description>Set task timeout to 1 hour</description> </property> - <!--Additional config for in-mem cubing, giving mapper more memory --> - <property> - <name>mapreduce.map.memory.mb</name> - <value>3072</value> - <description></description> - </property> - - <property> - <name>mapreduce.map.java.opts</name> - <value>-Xmx2700m</value> - <description></description> - </property> - - <property> - <name>mapreduce.task.io.sort.mb</name> - <value>200</value> - <description></description> - </property> + <!--Additional config for in-mem cubing, giving mapper more memory --> + <property> + <name>mapreduce.map.memory.mb</name> + <value>3072</value> + <description></description> + </property> + + <property> + <name>mapreduce.map.java.opts</name> + <value>-Xmx2700m</value> + <description></description> + </property> + + <property> + <name>mapreduce.task.io.sort.mb</name> + <value>200</value> + <description></description> + </property> </configuration> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/build/deploy/server.xml ---------------------------------------------------------------------- diff --git a/build/deploy/server.xml b/build/deploy/server.xml index 2a78368..72a87d0 100644 --- a/build/deploy/server.xml +++ b/build/deploy/server.xml @@ -24,13 +24,13 @@ <Listener className="org.apache.catalina.security.SecurityListener" /> --> <!--APR library loader. Documentation at /docs/apr.html --> - <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" /> + <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on"/> <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html --> - <Listener className="org.apache.catalina.core.JasperListener" /> + <Listener className="org.apache.catalina.core.JasperListener"/> <!-- Prevent memory leaks due to use of particular java/javax APIs--> - <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" /> - <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" /> - <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" /> + <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener"/> + <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/> + <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener"/> <!-- Global JNDI resources Documentation at /docs/jndi-resources-howto.html @@ -43,7 +43,7 @@ type="org.apache.catalina.UserDatabase" description="User database that can be updated and saved" factory="org.apache.catalina.users.MemoryUserDatabaseFactory" - pathname="conf/tomcat-users.xml" /> + pathname="conf/tomcat-users.xml"/> </GlobalNamingResources> <!-- A "Service" is a collection of one or more "Connectors" that share @@ -74,7 +74,7 @@ compressionMinSize="2048" noCompressionUserAgents="gozilla,traviata" compressableMimeType="text/html,text/xml,text/javascript,application/javascript,application/json,text/css,text/plain" - /> + /> <!-- A "Connector" using the shared thread pool--> <!-- <Connector executor="tomcatThreadPool" @@ -96,7 +96,7 @@ --> <!-- Define an AJP 1.3 Connector on port 8009 --> - <Connector port="9009" protocol="AJP/1.3" redirectPort="9443" /> + <Connector port="9009" protocol="AJP/1.3" redirectPort="9443"/> <!-- An Engine represents the entry point (within Catalina) that processes @@ -128,7 +128,7 @@ resourceName="UserDatabase"/> </Realm> - <Host name="localhost" appBase="webapps" + <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true"> <!-- SingleSignOn valve, share authentication between web applications @@ -142,7 +142,7 @@ Note: The pattern used is equivalent to using pattern="common" --> <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs" prefix="localhost_access_log." suffix=".txt" - pattern="%h %l %u %t "%r" %s %b" /> + pattern="%h %l %u %t "%r" %s %b"/> </Host> </Engine> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/checkstyle-suppressions.xml ---------------------------------------------------------------------- diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml index fbb8667..06de625 100644 --- a/checkstyle-suppressions.xml +++ b/checkstyle-suppressions.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE suppressions PUBLIC - "-//Puppy Crawl//DTD Suppressions 1.0//EN" - "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd";> + "-//Puppy Crawl//DTD Suppressions 1.0//EN" + "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd";> <!-- /** * Licensed to the Apache Software Foundation (ASF) under one @@ -22,7 +22,7 @@ */ --> <suppressions> - <suppress checks="." files=".*[/\\]generated[/\\].*\.java"/> - <suppress checks="." files=".*[/\\]org[/\\]apache[/\\]calcite[/\\].*\.java"/> - <suppress checks="MagicNumberCheck" files=".*Test\.java"/> + <suppress checks="." files=".*[/\\]generated[/\\].*\.java"/> + <suppress checks="." files=".*[/\\]org[/\\]apache[/\\]calcite[/\\].*\.java"/> + <suppress checks="MagicNumberCheck" files=".*Test\.java"/> </suppressions> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/checkstyle.xml ---------------------------------------------------------------------- diff --git a/checkstyle.xml b/checkstyle.xml index 682186f..3c5b83f 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -21,12 +21,12 @@ "http://www.puppycrawl.com/dtds/configuration_1_3.dtd";> <module name="Checker"> <module name="FileTabCharacter"/> - <module name="SuppressWarningsFilter" /> + <module name="SuppressWarningsFilter"/> <module name="TreeWalker"> <module name="AvoidStarImport"/> <module name="RedundantImport"/> <module name="UnusedImports"> - <property name="processJavadoc" value="true"/> + <property name="processJavadoc" value="true"/> </module> <module name="LineLength"> <property name="max" value="1000"/> @@ -57,6 +57,6 @@ <module name="WhitespaceAfter"> <property name="tokens" value="COMMA"/> </module> - <module name="SuppressWarningsHolder" /> + <module name="SuppressWarningsHolder"/> </module> </module> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/core-common/pom.xml ---------------------------------------------------------------------- diff --git a/core-common/pom.xml b/core-common/pom.xml index ca4c7a9..8f3fcbc 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-core-common</artifactId> @@ -65,8 +66,8 @@ <artifactId>commons-email</artifactId> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -100,7 +101,7 @@ </dependency> <!-- Env & Test --> - + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/core-cube/pom.xml ---------------------------------------------------------------------- diff --git a/core-cube/pom.xml b/core-cube/pom.xml index 0fc2875..cd65237 100644 --- a/core-cube/pom.xml +++ b/core-cube/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-core-cube</artifactId> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/core-dictionary/pom.xml ---------------------------------------------------------------------- diff --git a/core-dictionary/pom.xml b/core-dictionary/pom.xml index b0f400e..69209d0 100644 --- a/core-dictionary/pom.xml +++ b/core-dictionary/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-core-dictionary</artifactId> @@ -60,7 +61,7 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - + </dependencies> </project> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/core-job/pom.xml ---------------------------------------------------------------------- diff --git a/core-job/pom.xml b/core-job/pom.xml index 8a1211f..a3c1d82 100644 --- a/core-job/pom.xml +++ b/core-job/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-core-job</artifactId> @@ -35,7 +36,7 @@ </properties> <dependencies> - + <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-core-cube</artifactId> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/core-metadata/pom.xml ---------------------------------------------------------------------- diff --git a/core-metadata/pom.xml b/core-metadata/pom.xml index 0a7cb40..6f0d91e 100644 --- a/core-metadata/pom.xml +++ b/core-metadata/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-core-metadata</artifactId> @@ -28,14 +29,14 @@ <groupId>org.apache.kylin</groupId> <artifactId>kylin</artifactId> <version>1.5.3-SNAPSHOT</version> - + </parent> <properties> </properties> <dependencies> - + <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-core-common</artifactId> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/core-storage/pom.xml ---------------------------------------------------------------------- diff --git a/core-storage/pom.xml b/core-storage/pom.xml index 27ee61c..d8c1a29 100644 --- a/core-storage/pom.xml +++ b/core-storage/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-core-storage</artifactId> @@ -35,7 +36,7 @@ </properties> <dependencies> - + <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-core-cube</artifactId> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/engine-mr/pom.xml ---------------------------------------------------------------------- diff --git a/engine-mr/pom.xml b/engine-mr/pom.xml index 12a6b73..2f6ca79 100644 --- a/engine-mr/pom.xml +++ b/engine-mr/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-engine-mr</artifactId> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/engine-spark/pom.xml ---------------------------------------------------------------------- diff --git a/engine-spark/pom.xml b/engine-spark/pom.xml index 207fc4d..004549d 100644 --- a/engine-spark/pom.xml +++ b/engine-spark/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.kylin</groupId> @@ -41,7 +42,7 @@ <artifactId>kylin-storage-hbase</artifactId> <version>${project.parent.version}</version> </dependency> - + <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-core-job</artifactId> @@ -98,7 +99,7 @@ <scope>test</scope> <version>${project.parent.version}</version> </dependency> - + <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-core-common</artifactId> @@ -120,7 +121,6 @@ </dependency> - </dependencies> <build> @@ -158,5 +158,4 @@ </build> - </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/engine-streaming/pom.xml ---------------------------------------------------------------------- diff --git a/engine-streaming/pom.xml b/engine-streaming/pom.xml index 7110377..85f2750 100644 --- a/engine-streaming/pom.xml +++ b/engine-streaming/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-engine-streaming</artifactId> @@ -116,5 +117,4 @@ </dependencies> - </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/jdbc/pom.xml ---------------------------------------------------------------------- diff --git a/jdbc/pom.xml b/jdbc/pom.xml index a663fb3..890a4c0 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-jdbc</artifactId> <packaging>jar</packaging> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4b9c7c0..806c16b 100644 --- a/pom.xml +++ b/pom.xml @@ -17,14 +17,15 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> <version>16</version> - <relativePath /> + <relativePath/> <!-- no parent resolution --> </parent> @@ -168,8 +169,8 @@ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/kylin.git</connection> <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/kylin.git</developerConnection> <url>https://git-wip-us.apache.org/repos/asf/kylin.git</url> - <tag>HEAD</tag> - </scm> + <tag>HEAD</tag> + </scm> <dependencyManagement> <dependencies> @@ -486,12 +487,12 @@ </repositories> <build> - + <pluginManagement> - + <plugins> - - + + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> @@ -803,12 +804,12 @@ <exclude>lib/**</exclude> <exclude>dist/**</exclude> <exclude>website/**</exclude> - + <!-- text files without comments --> <exclude>**/*.csv</exclude> <exclude>**/*.json</exclude> <exclude>**/*.md</exclude> - + <!-- binary files --> <exclude>**/*.dict</exclude> <exclude>**/*.dic</exclude> @@ -818,13 +819,13 @@ <exclude>**/*.doc</exclude> <exclude>**/*.txt</exclude> <exclude>**/.checkstyle</exclude> - + <!-- Kylin's website content --> <exclude>**/.sass-cache/**</exclude> <!-- tomcat package --> <exclude>tomcat/**</exclude> - + <!-- front end libary and generated files --> <exclude>webapp/node_modules/**</exclude> <exclude>webapp/dist/**</exclude> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/query/pom.xml ---------------------------------------------------------------------- diff --git a/query/pom.xml b/query/pom.xml index a0b8d94..0dff0c3 100644 --- a/query/pom.xml +++ b/query/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <!-- The basics. --> <artifactId>kylin-query</artifactId> @@ -245,5 +246,5 @@ </build> </profile> </profiles> - + </project> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/server-base/pom.xml ---------------------------------------------------------------------- diff --git a/server-base/pom.xml b/server-base/pom.xml index e6a4cc5..c0d48c9 100644 --- a/server-base/pom.xml +++ b/server-base/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-server-base</artifactId> @@ -141,7 +142,7 @@ <artifactId>spring-test</artifactId> <version>${spring.framework.version}</version> </dependency> - + <!-- Spring Security --> <dependency> <groupId>org.springframework.security</groupId> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index e662909..602dcad 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-server</artifactId> @@ -105,7 +106,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> - + <!-- Test & Env --> <dependency> <groupId>org.apache.kylin</groupId> @@ -128,7 +129,7 @@ <scope>test</scope> <version>${project.parent.version}</version> </dependency> - + <!-- depends on kylin-jdbc just for running jdbc test cases in server module --> <dependency> <groupId>org.apache.kylin</groupId> @@ -266,7 +267,7 @@ </exclusion> </exclusions> </dependency> - + <!-- Tomcat Env --> <dependency> <groupId>org.apache.tomcat</groupId> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/source-hive/pom.xml ---------------------------------------------------------------------- diff --git a/source-hive/pom.xml b/source-hive/pom.xml index a7c68eb..631e43e 100644 --- a/source-hive/pom.xml +++ b/source-hive/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-source-hive</artifactId> @@ -35,7 +36,7 @@ </properties> <dependencies> - + <dependency> <groupId>org.apache.kylin</groupId> <artifactId>kylin-engine-mr</artifactId> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/source-kafka/pom.xml ---------------------------------------------------------------------- diff --git a/source-kafka/pom.xml b/source-kafka/pom.xml index cf92762..228b956 100644 --- a/source-kafka/pom.xml +++ b/source-kafka/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-source-kafka</artifactId> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/storage-hbase/pom.xml ---------------------------------------------------------------------- diff --git a/storage-hbase/pom.xml b/storage-hbase/pom.xml index 0cb42db..4c1cfdc 100644 --- a/storage-hbase/pom.xml +++ b/storage-hbase/pom.xml @@ -17,7 +17,8 @@ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <artifactId>kylin-storage-hbase</artifactId> @@ -122,7 +123,8 @@ <shadedArtifactAttached>true</shadedArtifactAttached> <shadedClassifierName>coprocessor</shadedClassifierName> <transformers> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> + <transformer + implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> </transformers> <artifactSet> <includes> http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/webapp/.jshintrc ---------------------------------------------------------------------- diff --git a/webapp/.jshintrc b/webapp/.jshintrc index 0839b6b..2963d51 100644 --- a/webapp/.jshintrc +++ b/webapp/.jshintrc @@ -14,7 +14,6 @@ "strict": false, "trailing": true, "undef": true, - "globals": { "angular": true, "Config": true http://git-wip-us.apache.org/repos/asf/kylin/blob/e3b8be38/webapp/Gruntfile.js ---------------------------------------------------------------------- diff --git a/webapp/Gruntfile.js b/webapp/Gruntfile.js index fc45b91..d871f4f 100644 --- a/webapp/Gruntfile.js +++ b/webapp/Gruntfile.js @@ -14,284 +14,284 @@ * 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. -*/ + */ 'use strict'; module.exports = function (grunt) { - // Project configuration. - grunt.config.init({ - buildEnv: grunt.option('buildEnv') || 'prod', - buildNumber: grunt.option('buildNumber') || '0', - pkg: grunt.file.readJSON('package.json'), - config: grunt.file.readJSON('grunt.json'), - bump: { - options: { - files: '<%= config.bump.options.files %>', - commit: true, - commitFiles: '<%= config.bump.options.commitFiles %>', - commitMessage: 'Release v%VERSION%', - createTag: false, - tagName: 'v%VERSION%', - tagMessage: 'Version %VERSION%', - push: false + // Project configuration. + grunt.config.init({ + buildEnv: grunt.option('buildEnv') || 'prod', + buildNumber: grunt.option('buildNumber') || '0', + pkg: grunt.file.readJSON('package.json'), + config: grunt.file.readJSON('grunt.json'), + bump: { + options: { + files: '<%= config.bump.options.files %>', + commit: true, + commitFiles: '<%= config.bump.options.commitFiles %>', + commitMessage: 'Release v%VERSION%', + createTag: false, + tagName: 'v%VERSION%', + tagMessage: 'Version %VERSION%', + push: false + } + }, + changelog: { + options: { + dest: 'CHANGELOG.md', + prepend: true + } + }, + clean: { + build: ['dist/', 'tmp/'], + tmp: ['tmp/'] + }, + concat: { + app: { + src: [ + 'tmp/js/templates.js', + 'app/js/**/*.js' + ], + dest: 'tmp/js/scripts.js' + }, + components: '<%= config.concat.components %>', + css: '<%= config.concat.css %>' + }, + copy: { + tmp: { + files: [ + { + expand: true, + cwd: 'app/', + src: ['**'], + dest: 'tmp/' + } + ] + }, + build: { + files: [ + { + expand: true, + cwd: 'tmp/', + src: ['index.html', 'js/scripts.min.js', 'image/**', 'css/styles.min.css', 'routes.json'], + dest: 'dist/', + rename: function (desc, src) { + return desc + src.replace('min.', 'min.<%= buildNumber %>.') } - }, - changelog: { - options: { - dest: 'CHANGELOG.md', - prepend: true - } - }, - clean: { - build: ['dist/', 'tmp/'], - tmp: ['tmp/'] - }, - concat: { - app: { - src: [ - 'tmp/js/templates.js', - 'app/js/**/*.js' - ], - dest: 'tmp/js/scripts.js' - }, - components: '<%= config.concat.components %>', - css: '<%= config.concat.css %>' - }, - copy: { - tmp: { - files: [ - { - expand: true, - cwd: 'app/', - src: ['**'], - dest: 'tmp/' - } - ] - }, - build: { - files: [ - { - expand: true, - cwd: 'tmp/', - src: ['index.html', 'js/scripts.min.js', 'image/**', 'css/styles.min.css', 'routes.json'], - dest: 'dist/', - rename: function (desc, src) { - return desc + src.replace('min.', 'min.<%= buildNumber %>.') - } - }, - { - expand: true, - cwd: 'tmp/', - src: ['htaccess.dist'], - dest: 'dist/', - rename: function (dest, src) { - console.log(src); - if (src == 'htaccess.dist') { - return dest + '.htaccess'; - } - } - }, - { - expand: true, - cwd: 'app/components/font-awesome/', - src: ['fonts/*'], - dest: 'dist/' - }, - { - expand: true, - cwd: 'app/components/bootstrap/dist/', - src: ['fonts/*'], - dest: 'dist/' - }, - { - expand: true, - cwd: 'app/components/ace/', - src: ['fonts/*'], - dest: 'dist/' - }, - { - expand: true, - cwd: 'app/components/angular-tree-control/images/', - src: ['*'], - dest: 'dist/images' - }, - { - expand: true, - cwd: 'app/components/chosen/', - src: ['*.png'], - dest: 'dist/css' - }, - { - expand: true, - cwd: 'app/components/angular-ui-grid/', - src: ['ui-grid.eot', 'ui-grid.svg', 'ui-grid.ttf', 'ui-grid.woff'], - dest: 'dist/css' - }, - { - expand: true, - cwd: 'app/components/ace-builds/', - src: ['src-min-noconflict/worker-json.js'], - flatten: true, - dest: 'dist/' - } - ] - } - }, - html2js: { - partials: { - src: ['app/partials/**/*.html'], - dest: 'tmp/js/templates.js', - module: 'templates', - options: { - base: 'app/' - } - } - }, - htmlrefs: { - dist: { - src: 'tmp/index.html', - dest: 'tmp/' - }, - options: { - buildNumber: '<%= buildNumber %>' - } - }, - jshint: { - files: ['app/js/**/*.js', '!app/components/**'], - options: { - jshintrc: '.jshintrc' - } - }, - less: { - prod: { - options: { - compress: true, - yuicompress: true - }, - files: { - 'tmp/css/styles.css': 'tmp/less/build.less' - } - } - }, - lesslint: { - src: ['app/less/**.less'] - }, - manifest: { - build: { - options: { - basePath: 'dist/', - timestamp: true - }, - src: ['**/**.**'], - dest: 'dist/manifest.appcache' + }, + { + expand: true, + cwd: 'tmp/', + src: ['htaccess.dist'], + dest: 'dist/', + rename: function (dest, src) { + console.log(src); + if (src == 'htaccess.dist') { + return dest + '.htaccess'; + } } + }, + { + expand: true, + cwd: 'app/components/font-awesome/', + src: ['fonts/*'], + dest: 'dist/' + }, + { + expand: true, + cwd: 'app/components/bootstrap/dist/', + src: ['fonts/*'], + dest: 'dist/' + }, + { + expand: true, + cwd: 'app/components/ace/', + src: ['fonts/*'], + dest: 'dist/' + }, + { + expand: true, + cwd: 'app/components/angular-tree-control/images/', + src: ['*'], + dest: 'dist/images' + }, + { + expand: true, + cwd: 'app/components/chosen/', + src: ['*.png'], + dest: 'dist/css' + }, + { + expand: true, + cwd: 'app/components/angular-ui-grid/', + src: ['ui-grid.eot', 'ui-grid.svg', 'ui-grid.ttf', 'ui-grid.woff'], + dest: 'dist/css' + }, + { + expand: true, + cwd: 'app/components/ace-builds/', + src: ['src-min-noconflict/worker-json.js'], + flatten: true, + dest: 'dist/' + } + ] + } + }, + html2js: { + partials: { + src: ['app/partials/**/*.html'], + dest: 'tmp/js/templates.js', + module: 'templates', + options: { + base: 'app/' + } + } + }, + htmlrefs: { + dist: { + src: 'tmp/index.html', + dest: 'tmp/' + }, + options: { + buildNumber: '<%= buildNumber %>' + } + }, + jshint: { + files: ['app/js/**/*.js', '!app/components/**'], + options: { + jshintrc: '.jshintrc' + } + }, + less: { + prod: { + options: { + compress: true, + yuicompress: true }, - 'regex-replace': { - strict: { - src: ['tmp/js/scripts.js'], - actions: [ - { - name: 'use strict', - search: '\\\'use strict\\\';', - replace: '', - flags: 'gmi' - } - ] - }, - manifest: { - src: ['tmp/index.html'], - actions: [ - { - name: 'manifest', - search: '<html>', - replace: '<html manifest="manifest.appcache">' - } - ] - }, - templates: { - src: ['tmp/js/scripts.js'], - actions: [ - { - name: 'templates', - search: /kylin\', \[/, - replace: 'kylin\', [\'templates\',', - flags: 'gmi' - } - ] - } + files: { + 'tmp/css/styles.css': 'tmp/less/build.less' + } + } + }, + lesslint: { + src: ['app/less/**.less'] + }, + manifest: { + build: { + options: { + basePath: 'dist/', + timestamp: true }, - uglify: { - app: { - options: { - mangle: false - }, - files: { - 'tmp/js/scripts.js': 'tmp/js/scripts.js' - } - } + src: ['**/**.**'], + dest: 'dist/manifest.appcache' + } + }, + 'regex-replace': { + strict: { + src: ['tmp/js/scripts.js'], + actions: [ + { + name: 'use strict', + search: '\\\'use strict\\\';', + replace: '', + flags: 'gmi' + } + ] + }, + manifest: { + src: ['tmp/index.html'], + actions: [ + { + name: 'manifest', + search: '<html>', + replace: '<html manifest="manifest.appcache">' + } + ] + }, + templates: { + src: ['tmp/js/scripts.js'], + actions: [ + { + name: 'templates', + search: /kylin\', \[/, + replace: 'kylin\', [\'templates\',', + flags: 'gmi' + } + ] + } + }, + uglify: { + app: { + options: { + mangle: false }, - karma: { - unit: { - configFile: 'karma.unit.conf.js' - }, - e2e: { - configFile: 'karma.e2e.conf.js' - } + files: { + 'tmp/js/scripts.js': 'tmp/js/scripts.js' } - }); + } + }, + karma: { + unit: { + configFile: 'karma.unit.conf.js' + }, + e2e: { + configFile: 'karma.e2e.conf.js' + } + } + }); - // Additional task plugins - grunt.loadNpmTasks('grunt-contrib'); - grunt.loadNpmTasks('grunt-conventional-changelog'); - grunt.loadNpmTasks('grunt-bump'); - grunt.loadNpmTasks('grunt-html2js'); - grunt.loadNpmTasks('grunt-htmlrefs'); - grunt.loadNpmTasks('grunt-lesslint'); - grunt.loadNpmTasks('grunt-manifest'); - grunt.loadNpmTasks('grunt-regex-replace'); - grunt.loadNpmTasks('grunt-karma'); + // Additional task plugins + grunt.loadNpmTasks('grunt-contrib'); + grunt.loadNpmTasks('grunt-conventional-changelog'); + grunt.loadNpmTasks('grunt-bump'); + grunt.loadNpmTasks('grunt-html2js'); + grunt.loadNpmTasks('grunt-htmlrefs'); + grunt.loadNpmTasks('grunt-lesslint'); + grunt.loadNpmTasks('grunt-manifest'); + grunt.loadNpmTasks('grunt-regex-replace'); + grunt.loadNpmTasks('grunt-karma'); - grunt.registerTask('test', ['jshint', 'lesslint']); + grunt.registerTask('test', ['jshint', 'lesslint']); - grunt.registerTask('prod', [ + grunt.registerTask('prod', [ // 'test', - 'clean:build', - 'copy:tmp', - 'html2js', - 'concat:app', - 'regex-replace:strict', - 'regex-replace:templates', - 'uglify', - 'regex-replace:manifest', - 'concat:components', - 'less', - 'concat:css', - 'htmlrefs', - 'copy:build', - 'clean:tmp', - 'manifest', - 'changelog' - ]); + 'clean:build', + 'copy:tmp', + 'html2js', + 'concat:app', + 'regex-replace:strict', + 'regex-replace:templates', + 'uglify', + 'regex-replace:manifest', + 'concat:components', + 'less', + 'concat:css', + 'htmlrefs', + 'copy:build', + 'clean:tmp', + 'manifest', + 'changelog' + ]); - grunt.registerTask('dev', [ + grunt.registerTask('dev', [ // 'test', - 'clean:build', - 'copy:tmp', - 'html2js', - 'concat:app', - 'regex-replace:strict', - 'regex-replace:templates', + 'clean:build', + 'copy:tmp', + 'html2js', + 'concat:app', + 'regex-replace:strict', + 'regex-replace:templates', // 'uglify', - 'regex-replace:manifest', - 'concat:components', - 'less', - 'concat:css', - 'htmlrefs', - 'copy:build', - 'clean:tmp', - 'manifest', - 'changelog' - ]); + 'regex-replace:manifest', + 'concat:components', + 'less', + 'concat:css', + 'htmlrefs', + 'copy:build', + 'clean:tmp', + 'manifest', + 'changelog' + ]); };
