mirror of
https://github.com/dianping/camel.git
synced 2024-09-20 15:06:06 +08:00
add unidal 2.0.3 dependency
This commit is contained in:
leon.li
parent
b626dec4c7
commit
743ff85b06
Binary file not shown.
|
|
@ -0,0 +1 @@
|
|||
76bfc65e153893603f635309235bbbab7b1685f5
|
||||
|
|
@ -0,0 +1,55 @@
|
|||
<?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">
|
||||
<parent>
|
||||
<groupId>org.unidal.framework</groupId>
|
||||
<artifactId>parent</artifactId>
|
||||
<version>2.0.3</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.unidal.framework</groupId>
|
||||
<artifactId>foundation-service</artifactId>
|
||||
<version>2.0.3</version>
|
||||
<name>Foundation Service</name>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.8.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.plexus</groupId>
|
||||
<artifactId>plexus-container-default</artifactId>
|
||||
<version>1.5.5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.plexus</groupId>
|
||||
<artifactId>plexus-utils</artifactId>
|
||||
<version>3.0.8</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.aspectj</groupId>
|
||||
<artifactId>aspectjrt</artifactId>
|
||||
<version>1.5.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.jboss.netty</groupId>
|
||||
<artifactId>netty</artifactId>
|
||||
<version>3.2.7.Final</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
<version>14.0.1</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jgit</groupId>
|
||||
<artifactId>org.eclipse.jgit.http.server</artifactId>
|
||||
<version>2.3.1.201302201838-r</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
@ -0,0 +1 @@
|
|||
ad479dbe4e9792b154499ec961eb376693270cde
|
||||
|
|
@ -0,0 +1,118 @@
|
|||
<?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.unidal.framework</groupId>
|
||||
<artifactId>parent</artifactId>
|
||||
<version>2.0.3</version>
|
||||
<name>parent</name>
|
||||
<packaging>pom</packaging>
|
||||
<modules>
|
||||
<module>eunit-testfwk</module>
|
||||
<module>java-fragment</module>
|
||||
<module>type-converter</module>
|
||||
<module>foundation-service</module>
|
||||
<module>dal-jdbc</module>
|
||||
<module>test-framework</module>
|
||||
<module>web-framework</module>
|
||||
<module>spring-support</module>
|
||||
</modules>
|
||||
<build>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>2.5.1</version>
|
||||
<configuration>
|
||||
<source>1.6</source>
|
||||
<target>1.6</target>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>2.12.4</version>
|
||||
<configuration>
|
||||
<!-- use -Dmaven.surefire.debug for remote debug -->
|
||||
<includes>
|
||||
<include>**/AllTests.java</include>
|
||||
</includes>
|
||||
</configuration>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.apache.maven.surefire</groupId>
|
||||
<artifactId>surefire-junit47</artifactId>
|
||||
<version>2.12.4</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-war-plugin</artifactId>
|
||||
<version>2.3</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>2.4</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<version>2.5.1</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-eclipse-plugin</artifactId>
|
||||
<version>2.9</version>
|
||||
<configuration>
|
||||
<downloadSources>true</downloadSources>
|
||||
<ajdtVersion>none</ajdtVersion>
|
||||
<additionalConfig>
|
||||
<file>
|
||||
<name>.settings/org.eclipse.jdt.core.prefs</name>
|
||||
<content><![CDATA[
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.source=1.6
|
||||
org.eclipse.jdt.core.compiler.compliance=1.6
|
||||
]]></content>
|
||||
</file>
|
||||
</additionalConfig>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-release-plugin</artifactId>
|
||||
<version>2.3.2</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-source-plugin</artifactId>
|
||||
<version>2.2.1</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<artifactId>maven-source-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-sources</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>jar-no-fork</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>dianping.repo</id>
|
||||
<url>http://mvn.dianpingoa.com/dianping-releases</url>
|
||||
</repository>
|
||||
<snapshotRepository>
|
||||
<id>dianping.repo.snapshots</id>
|
||||
<url>http://mvn.dianpingoa.com/dianping-snapshots</url>
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
<properties>
|
||||
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
</project>
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
801e443f8d3bbe717374348c065cab5227c653ca
|
||||
|
|
@ -7,11 +7,11 @@ import com.dianping.phoenix.lb.model.entity.SlbPool;
|
|||
import com.dianping.phoenix.lb.utils.ElementAdded;
|
||||
import com.dianping.phoenix.lb.utils.ElementModified;
|
||||
import com.dianping.phoenix.lb.utils.ElementRemoved;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.commons.lang.Validate;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.unidal.lookup.util.StringUtils;
|
||||
|
||||
import javax.annotation.PostConstruct;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -120,7 +120,7 @@ public class ReqStatusContainer extends AbstractContainer implements Startable,
|
|||
/**
|
||||
* 删除针对pool的监控
|
||||
*
|
||||
* @param string
|
||||
* @param poolName
|
||||
*/
|
||||
private void removePool(String poolName) {
|
||||
|
||||
|
|
@ -152,7 +152,6 @@ public class ReqStatusContainer extends AbstractContainer implements Startable,
|
|||
* 全局数据，所有Dengine节点的qps值取平均
|
||||
*
|
||||
* @param duration 获取数据的时间长度
|
||||
* @param interval 采样间隔
|
||||
*/
|
||||
public List<DataWrapper> getTotalData(int duration, int viewCount, long viewEndTime) {
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue