modify the datasource config

cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/DomainManager.java

@@ -67,8 +67,10 @@ public class DomainManager implements Initializable, LogEnabled {
 			project = m_cmdbs.get(ip);
 
 			if (project == null) {
-				m_unknownIps.put(ip, ip);
-				m_logger.info("add ip to unknown list,ip:" + ip);
+				if (!m_unknownIps.containsKey(ip)) {
+					m_logger.info("add ip to unknown list,ip:" + ip);
+					m_unknownIps.put(ip, ip);
+				}
 				return UNKNOWN_PROJECT;
 			}
 		}

cat-consumer-advanced/src/main/java/com/dianping/cat/consumer/build/CatAdvancedDatabaseConfigurator.java

@@ -11,9 +11,6 @@ final class CatAdvancedDatabaseConfigurator extends AbstractJdbcResourceConfigur
    public List<Component> defineComponents() {
       List<Component> all = new ArrayList<Component>();
 
-      all.add(defineJdbcDataSourceConfigurationManagerComponent("datasources.xml"));
-      all.add(defineJdbcDataSourceComponent("cat", "com.mysql.jdbc.Driver", "jdbc:mysql://192.168.7.43:3306/cat", "dpcom_cat", "password", "<![CDATA[useUnicode=true&autoReconnect=true]]>"));
-
       defineSimpleTableProviderComponents(all, "cat", com.dianping.cat.consumer.advanced.dal._INDEX.getEntityClasses());
       defineDaoComponents(all, com.dianping.cat.consumer.advanced.dal._INDEX.getDaoClasses());
 

cat-consumer-advanced/src/main/resources/META-INF/plexus/components.xml

@@ -149,37 +149,6 @@
 				<datasourceFile>/data/appdatas/cat/datasources.xml</datasourceFile>
 			</configuration>
 		</component>
-		<component>
-			<role>org.unidal.dal.jdbc.datasource.JdbcDataSourceConfigurationManager</role>
-			<implementation>org.unidal.dal.jdbc.datasource.JdbcDataSourceConfigurationManager</implementation>
-			<configuration>
-				<datasourceFile>datasources.xml</datasourceFile>
-			</configuration>
-		</component>
-		<component>
-			<role>org.unidal.dal.jdbc.datasource.DataSource</role>
-			<role-hint>cat</role-hint>
-			<implementation>org.unidal.dal.jdbc.datasource.JdbcDataSource</implementation>
-			<configuration>
-				<id>cat</id>
-				<maximum-pool-size>3</maximum-pool-size>
-				<connection-timeout>1s</connection-timeout>
-				<idle-timeout>10m</idle-timeout>
-				<statement-cache-size>1000</statement-cache-size>
-				<properties>
-					<driver>com.mysql.jdbc.Driver</driver>
-					<URL>jdbc:mysql://192.168.7.43:3306/cat</URL>
-					<user>dpcom_cat</user>
-					<password>password</password>
-					<connectionProperties><![CDATA[useUnicode=true&autoReconnect=true]]></connectionProperties>
-				</properties>
-			</configuration>
-			<requirements>
-				<requirement>
-					<role>org.unidal.dal.jdbc.datasource.JdbcDataSourceConfigurationManager</role>
-				</requirement>
-			</requirements>
-		</component>
 		<component>
 			<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
 			<role-hint>business-report</role-hint>

cat-consumer-advanced/src/main/resources/META-INF/wizard/jdbc/wizard.xml

 <wizard package="com.dianping.cat.consumer">
-   <jdbc package="com.dainping.cat.consumer.dal" name="CatAdvanced">
+   <jdbc package="com.dainping.cat.consumer.dal" name="cat">
       <datasource>
          <driver>com.mysql.jdbc.Driver</driver>
          <url>jdbc:mysql://192.168.7.43:3306/cat</url>

cat-consumer/src/main/java/com/dianping/cat/consumer/build/CatCoreDatabaseConfigurator.java

@@ -11,12 +11,10 @@ final class CatCoreDatabaseConfigurator extends AbstractJdbcResourceConfigurator
    public List<Component> defineComponents() {
       List<Component> all = new ArrayList<Component>();
 
-      all.add(defineJdbcDataSourceComponent("CatCore", "com.mysql.jdbc.Driver", "jdbc:mysql://192.168.7.43:3306/cat", "dpcom_cat", "password", "<![CDATA[useUnicode=true&autoReconnect=true]]>"));
-
-      defineSimpleTableProviderComponents(all, "CatCore", com.dianping.cat.consumer.core.config._INDEX.getEntityClasses());
+      defineSimpleTableProviderComponents(all, "cat", com.dianping.cat.consumer.core.config._INDEX.getEntityClasses());
       defineDaoComponents(all, com.dianping.cat.consumer.core.config._INDEX.getDaoClasses());
 
-      defineSimpleTableProviderComponents(all, "CatCore", com.dianping.cat.consumer.core.dal._INDEX.getEntityClasses());
+      defineSimpleTableProviderComponents(all, "cat", com.dianping.cat.consumer.core.dal._INDEX.getEntityClasses());
       defineDaoComponents(all, com.dianping.cat.consumer.core.dal._INDEX.getDaoClasses());
 
       return all;

cat-consumer/src/main/resources/META-INF/plexus/components.xml

@@ -207,30 +207,6 @@
 				<datasourceFile>/data/appdatas/cat/datasources.xml</datasourceFile>
 			</configuration>
 		</component>
-		<component>
-			<role>org.unidal.dal.jdbc.datasource.DataSource</role>
-			<role-hint>CatCore</role-hint>
-			<implementation>org.unidal.dal.jdbc.datasource.JdbcDataSource</implementation>
-			<configuration>
-				<id>CatCore</id>
-				<maximum-pool-size>3</maximum-pool-size>
-				<connection-timeout>1s</connection-timeout>
-				<idle-timeout>10m</idle-timeout>
-				<statement-cache-size>1000</statement-cache-size>
-				<properties>
-					<driver>com.mysql.jdbc.Driver</driver>
-					<URL>jdbc:mysql://192.168.7.43:3306/cat</URL>
-					<user>dpcom_cat</user>
-					<password>password</password>
-					<connectionProperties><![CDATA[useUnicode=true&autoReconnect=true]]></connectionProperties>
-				</properties>
-			</configuration>
-			<requirements>
-				<requirement>
-					<role>org.unidal.dal.jdbc.datasource.JdbcDataSourceConfigurationManager</role>
-				</requirement>
-			</requirements>
-		</component>
 		<component>
 			<role>org.unidal.dal.jdbc.mapping.TableProvider</role>
 			<role-hint>config</role-hint>
@@ -238,7 +214,7 @@
 			<configuration>
 				<logical-table-name>config</logical-table-name>
 				<physical-table-name>config</physical-table-name>
-				<data-source-name>CatCore</data-source-name>
+				<data-source-name>cat</data-source-name>
 			</configuration>
 		</component>
 		<component>
@@ -257,7 +233,7 @@
 			<configuration>
 				<logical-table-name>hostinfo</logical-table-name>
 				<physical-table-name>hostinfo</physical-table-name>
-				<data-source-name>CatCore</data-source-name>
+				<data-source-name>cat</data-source-name>
 			</configuration>
 		</component>
 		<component>
@@ -267,7 +243,7 @@
 			<configuration>
 				<logical-table-name>project</logical-table-name>
 				<physical-table-name>project</physical-table-name>
-				<data-source-name>CatCore</data-source-name>
+				<data-source-name>cat</data-source-name>
 			</configuration>
 		</component>
 		<component>
@@ -277,7 +253,7 @@
 			<configuration>
 				<logical-table-name>report</logical-table-name>
 				<physical-table-name>report</physical-table-name>
-				<data-source-name>CatCore</data-source-name>
+				<data-source-name>cat</data-source-name>
 			</configuration>
 		</component>
 		<component>
@@ -287,7 +263,7 @@
 			<configuration>
 				<logical-table-name>task</logical-table-name>
 				<physical-table-name>task</physical-table-name>
-				<data-source-name>CatCore</data-source-name>
+				<data-source-name>cat</data-source-name>
 			</configuration>
 		</component>
 		<component>

cat-consumer/src/main/resources/META-INF/wizard/jdbc/wizard.xml

 <?xml version="1.0" encoding="utf-8"?>
 <wizard package="com.dianping.cat.consumer">
-   <jdbc package="com.dainping.cat.consumer.dal" name="CatCore">
+   <jdbc package="com.dainping.cat.consumer.dal" name="cat">
       <datasource>
          <driver>com.mysql.jdbc.Driver</driver>
          <url>jdbc:mysql://192.168.7.43:3306/cat</url>