kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaofeng...@apache.org
Subject [1/3] incubator-kylin git commit: KYLIN-893 Remove the dependency on quartz and metrics
Date Wed, 15 Jul 2015 07:53:44 GMT
Repository: incubator-kylin
Updated Branches:
  refs/heads/0.8 d109e27bb -> fb73fa5a4


KYLIN-893 Remove the dependency on quartz and metrics

Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/8502fc38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/8502fc38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/8502fc38

Branch: refs/heads/0.8
Commit: 8502fc3874ed36c5597c6234a91a35061501a933
Parents: d109e27
Author: shaofengshi <shaofengshi@apache.org>
Authored: Wed Jul 15 15:40:01 2015 +0800
Committer: shaofengshi <shaofengshi@apache.org>
Committed: Wed Jul 15 15:40:01 2015 +0800

----------------------------------------------------------------------
 pom.xml                                |  9 +++++-
 script/package.sh                      | 19 ++++++++++-
 server/pom.xml                         | 25 ---------------
 server/src/main/webapp/WEB-INF/web.xml | 49 +----------------------------
 4 files changed, 27 insertions(+), 75 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/8502fc38/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8276824..c64cd87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -466,7 +466,14 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>2.0.2</version>
+                    <version>2.6</version>
+                    <configuration>
+                        <packagingExcludes>
+                            WEB-INF/lib/servlet-api-*.jar,
+                            WEB-INF/lib/zookeeper-*.jar,
+                            WEB-INF/lib/metrics-*.jar
+                        </packagingExcludes>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/8502fc38/script/package.sh
----------------------------------------------------------------------
diff --git a/script/package.sh b/script/package.sh
index 648caa0..a4bda3f 100755
--- a/script/package.sh
+++ b/script/package.sh
@@ -36,7 +36,24 @@ echo "kylin version: ${version}"
 export version
 
 #commit id
-git rev-parse HEAD > commit_SHA1
+cat << EOF > commit_SHA1
+# 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.
+#
+EOF
+git rev-parse HEAD >> commit_SHA1
 
 sh script/download-tomcat.sh || { exit 1; }
 sh script/build.sh || { exit 1; }

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/8502fc38/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 1578c62..bacd39d 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -200,31 +200,6 @@
             <version>2.8.1</version>
         </dependency>
         <dependency>
-            <groupId>com.codahale.metrics</groupId>
-            <artifactId>metrics-core</artifactId>
-            <version>${metrics.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.codahale.metrics</groupId>
-            <artifactId>metrics-servlets</artifactId>
-            <version>${metrics.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.codahale.metrics</groupId>
-            <artifactId>metrics-servlet</artifactId>
-            <version>${metrics.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.codahale.metrics</groupId>
-            <artifactId>metrics-ganglia</artifactId>
-            <version>${metrics.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.ryantenney.metrics</groupId>
-            <artifactId>metrics-spring</artifactId>
-            <version>3.0.0</version>
-        </dependency>
-        <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib</artifactId>
             <version>2.2.2</version>

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/8502fc38/server/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/server/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml
index bd6bded..f41dcbc 100644
--- a/server/src/main/webapp/WEB-INF/web.xml
+++ b/server/src/main/webapp/WEB-INF/web.xml
@@ -36,14 +36,6 @@
     <listener>
         <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
     </listener>
-    
-    <listener>
-    	<listener-class>com.ryantenney.metrics.spring.servlets.MetricsServletsContextListener</listener-class>
-    </listener>
-    <listener>
-    	<listener-class>org.apache.kylin.rest.metrics.KylinInstrumentedFilterContextListener</listener-class>
-    </listener>
-
 	<listener>
 		<listener-class>
 			org.springframework.security.web.session.HttpSessionEventPublisher
@@ -84,15 +76,6 @@
         <url-pattern>/*</url-pattern>
     </filter-mapping>
 
-	<filter>
-	    <filter-name>instrumentedFilter</filter-name>
-	    <filter-class>com.codahale.metrics.servlet.InstrumentedFilter</filter-class>
-	</filter>
-	<filter-mapping>
-	    <filter-name>instrumentedFilter</filter-name>
-	    <url-pattern>/*</url-pattern>
-	</filter-mapping>
-
     <!--request log filter-->
     <filter>
         <filter-name>requestLoggingFilter</filter-name>
@@ -129,36 +112,6 @@
         <servlet-name>kylin</servlet-name>
         <url-pattern>/api/*</url-pattern>
     </servlet-mapping>
-    <servlet>
-        <servlet-name>metricsservlet</servlet-name>
-        <servlet-class>com.codahale.metrics.servlets.MetricsServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>metricsservlet</servlet-name>
-        <url-pattern>/metrics/*</url-pattern>
-    </servlet-mapping>
-    
-    <servlet>
-        <servlet-name>metricsadminservlet</servlet-name>
-        <servlet-class>com.codahale.metrics.servlets.AdminServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>metricsadminservlet</servlet-name>
-        <url-pattern>/metricsadmin/*</url-pattern>
-    </servlet-mapping>
-    
-	<!-- 
-	<servlet>
-        <servlet-name>matricsadmin</servlet-name>
-        <servlet-class>com.codahale.metrics.servlets.MetricsServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>matricsadmin</servlet-name>
-        <url-pattern>/matrics/*</url-pattern>
-    </servlet-mapping>
-     -->
+
     <distributable />
 </web-app>


Mime
View raw message