You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/07/30 15:01:01 UTC
[18/34] git commit: CAMEL-7554 - camel-metrics
CAMEL-7554 - camel-metrics
* Preparing for the pull request
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b11d68a8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b11d68a8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b11d68a8
Branch: refs/heads/master
Commit: b11d68a86f8bdb814a15a3f20a3f8c26a36ea00a
Parents: 641de09
Author: Lauri Kimmel <la...@gmx.com>
Authored: Thu Jul 3 08:29:51 2014 +1000
Committer: Lauri Kimmel <la...@gmx.com>
Committed: Thu Jul 3 08:29:51 2014 +1000
----------------------------------------------------------------------
components/camel-metrics/.gitignore | 8 --
components/camel-metrics/.travis.yml | 9 --
components/camel-metrics/pom.xml | 205 ++++++++++++------------------
components/pom.xml | 1 +
4 files changed, 80 insertions(+), 143 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b11d68a8/components/camel-metrics/.gitignore
----------------------------------------------------------------------
diff --git a/components/camel-metrics/.gitignore b/components/camel-metrics/.gitignore
deleted file mode 100644
index 9365f3c..0000000
--- a/components/camel-metrics/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Maven
-target
-
-# Eclipse
-
-.classpath
-.project
-.settings/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/b11d68a8/components/camel-metrics/.travis.yml
----------------------------------------------------------------------
diff --git a/components/camel-metrics/.travis.yml b/components/camel-metrics/.travis.yml
deleted file mode 100644
index 5cf3ef3..0000000
--- a/components/camel-metrics/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: java
-jdk:
- - oraclejdk7
- - openjdk7
- - openjdk6
-
-branches:
- only:
- - master
http://git-wip-us.apache.org/repos/asf/camel/blob/b11d68a8/components/camel-metrics/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml
index 0f65ab5..db89694 100644
--- a/components/camel-metrics/pom.xml
+++ b/components/camel-metrics/pom.xml
@@ -1,137 +1,90 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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>
-
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-metrics</artifactId>
- <packaging>bundle</packaging>
- <version>2.13.0</version>
-
- <name>Camel Metrics Component</name>
- <url>http://camel.apache.org</url>
+<!--
+ 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
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <version>2.13.0</version>
- </dependency>
- <dependency>
- <groupId>com.codahale.metrics</groupId>
- <artifactId>metrics-core</artifactId>
- <version>3.0.1</version>
- </dependency>
-
- <!-- logging -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.6</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.6</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- <scope>test</scope>
- </dependency>
-
- <!-- testing -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
- <version>2.13.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- <version>2.13.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-javaconfig</artifactId>
- <version>2.13.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
- <version>2.13.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>1.9.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
+ 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>
- </dependencies>
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>components</artifactId>
+ <version>2.14-SNAPSHOT</version>
+ </parent>
- <build>
- <defaultGoal>install</defaultGoal>
+ <artifactId>camel-metrics</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Metrics</name>
+ <description>Camel Metrics based monitoring component</description>
- <plugins>
+ <properties>
+ <camel.osgi.export.pkg>
+ org.apache.camel.component.metrics.*
+ </camel.osgi.export.pkg>
+ <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=metrics</camel.osgi.export.service>
+ </properties>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.5.1</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.codahale.metrics</groupId>
+ <artifactId>metrics-core</artifactId>
+ <version>3.0.1</version>
+ </dependency>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-javaconfig</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test-spring</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
- <!-- to generate the MANIFEST-FILE of the bundle -->
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.apache.camel.camel-metrics</Bundle-SymbolicName>
- <Export-Service>org.apache.camel.spi.ComponentResolver;component=metrics</Export-Service>
- </instructions>
- </configuration>
- </plugin>
+ <!-- logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
- </plugins>
- </build>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/b11d68a8/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index 108ecc6..002dc91 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -130,6 +130,7 @@
<module>camel-leveldb</module>
<module>camel-lucene</module>
<module>camel-mail</module>
+ <module>camel-metrics</module>
<module>camel-mina</module>
<module>camel-mina2</module>
<module>camel-mongodb</module>