JAMES-1950 Move metrics-api as toplevel project

apache · Mar 3, 2017 · 4e70111 · 4e70111
1 parent 959cde4
commit 4e70111
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 19 deletions.
diff --git a/server/container/metrics/metrics-api/pom.xml → metrics/metrics-api/pom.xml b/server/container/metrics/metrics-api/pom.xml → metrics/metrics-api/pom.xml
@@ -21,15 +21,14 @@
          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>james-server</artifactId>
+        <artifactId>metrics</artifactId>
         <groupId>org.apache.james</groupId>
         <version>3.0.0-beta6-SNAPSHOT</version>
-        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>james-server-metrics-api</artifactId>
+    <artifactId>metrics-api</artifactId>
 
-    <name>Apache James :: Server :: Metrics :: API</name>
+    <name>Apache James :: Metrics :: API</name>
 
-</project>
+</project>
diff --git a/.../org/apache/james/metrics/api/Metric.java → .../org/apache/james/metrics/api/Metric.java b/.../org/apache/james/metrics/api/Metric.java → .../org/apache/james/metrics/api/Metric.java
diff --git a/...ache/james/metrics/api/MetricFactory.java → ...ache/james/metrics/api/MetricFactory.java b/...ache/james/metrics/api/MetricFactory.java → ...ache/james/metrics/api/MetricFactory.java
diff --git a/metrics/pom.xml b/metrics/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+<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>
+        <artifactId>james-project</artifactId>
+        <groupId>org.apache.james</groupId>
+        <version>3.0.0-beta6-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>metrics</artifactId>
+    <packaging>pom</packaging>
+
+    <name>Apache James :: Metrics</name>
+    <description>Apache James Metrics</description>
+
+    <modules>
+        <module>metrics-api</module>
+    </modules>
+
+</project>
+
diff --git a/pom.xml b/pom.xml
@@ -564,6 +564,7 @@
         <module>backends-common</module>
         <module>mailbox</module>
         <module>mailet</module>
+        <module>metrics</module>
         <module>mpt</module>
         <module>protocols</module>
         <module>server</module>

diff --git a/server/app/pom.xml b/server/app/pom.xml
@@ -253,7 +253,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.james</groupId>
-            <artifactId>james-server-metrics-api</artifactId>
+            <artifactId>metrics-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.james</groupId>

diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml
@@ -193,7 +193,7 @@
                 </dependency>
                 <dependency>
                     <groupId>org.apache.james</groupId>
-                    <artifactId>james-server-metrics-api</artifactId>
+                    <artifactId>metrics-api</artifactId>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.james</groupId>

diff --git a/server/container/metrics/metrics-dropwizard/pom.xml b/server/container/metrics/metrics-dropwizard/pom.xml
@@ -43,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.james</groupId>
-            <artifactId>james-server-metrics-api</artifactId>
+            <artifactId>metrics-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -59,4 +59,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml
@@ -72,7 +72,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.james</groupId>
-            <artifactId>james-server-metrics-api</artifactId>
+            <artifactId>metrics-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.james.protocols</groupId>

diff --git a/server/pom.xml b/server/pom.xml
@@ -63,7 +63,6 @@
         <module>container/jetty</module>
         <module>container/lifecycle-api</module>
         <module>container/mailbox-adapter</module>
-        <module>container/metrics/metrics-api</module>
         <module>container/metrics/metrics-dropwizard</module>
         <module>container/metrics/metrics-es-reporter</module>
         <module>container/spring</module>
@@ -452,6 +451,12 @@
                 </exclusions>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.james</groupId>
+                <artifactId>metrics-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.james.protocols</groupId>
                 <artifactId>protocols-api</artifactId>
@@ -636,11 +641,6 @@
                 <version>${project.version}</version>
                 <type>test-jar</type>
             </dependency>
-            <dependency>
-                <groupId>org.apache.james</groupId>
-                <artifactId>james-server-metrics-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.james</groupId>
                 <artifactId>james-server-metrics-dropwizard</artifactId>

diff --git a/server/protocols/protocols-imap4/pom.xml b/server/protocols/protocols-imap4/pom.xml
@@ -43,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.james</groupId>
-            <artifactId>james-server-metrics-api</artifactId>
+            <artifactId>metrics-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.james.protocols</groupId>

diff --git a/server/protocols/protocols-smtp/pom.xml b/server/protocols/protocols-smtp/pom.xml
@@ -67,7 +67,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.james</groupId>
-            <artifactId>james-server-metrics-api</artifactId>
+            <artifactId>metrics-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.james</groupId>

diff --git a/server/queue/queue-jms/pom.xml b/server/queue/queue-jms/pom.xml
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.james</groupId>
-            <artifactId>james-server-metrics-api</artifactId>
+            <artifactId>metrics-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.james</groupId>