Merge pull request #138 from yiming187/cat_update

exclude cat in client/config/admin/portal test

apollo-adminservice/pom.xml

@@ -19,6 +19,11 @@
 			<groupId>com.ctrip.apollo</groupId>
 			<artifactId>apollo-biz</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.ctrip.apollo</groupId>
+			<artifactId>apollo-buildtools</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<!-- end of apollo -->
 		<!-- eureka -->
 		<dependency>

apollo-adminservice/src/test/resources/META-INF/plexus/plexus.xml

+<plexus>
+	<components>
+		<component>
+			<role>com.dianping.cat.configuration.ClientConfigManager</role>
+			<implementation>com.ctrip.apollo.cat.NullClientConfigManager
+			</implementation>
+		</component>
+		<component>
+			<role>com.dianping.cat.message.io.TransportManager</role>
+			<implementation>com.ctrip.apollo.cat.NullTransportManager
+			</implementation>
+		</component>
+		<component>
+			<role>com.dianping.cat.message.spi.MessageManager</role>
+			<implementation>com.ctrip.apollo.cat.NullMessageManager
+			</implementation>
+			<requirements>
+				<requirement>
+					<role>com.dianping.cat.message.internal.MessageIdFactory</role>
+				</requirement>
+			</requirements>
+		</component>
+		<component>
+			<role>com.dianping.cat.message.MessageProducer</role>
+			<implementation>com.ctrip.apollo.cat.NullMessageProducer
+			</implementation>
+			<requirements>
+				<requirement>
+					<role>com.dianping.cat.message.spi.MessageManager</role>
+				</requirement>
+				<requirement>
+					<role>com.dianping.cat.message.internal.MessageIdFactory</role>
+				</requirement>
+			</requirements>
+		</component>
+		<component>
+			<role>org.codehaus.plexus.logging.LoggerManager</role>
+			<implementation>com.ctrip.apollo.cat.NullLoggerManager
+			</implementation>
+		</component>
+	</components>
+</plexus>
\ No newline at end of file

apollo-buildtools/pom.xml

@@ -13,4 +13,10 @@
 	<properties>
 		<github.path>${project.artifactId}</github.path>
 	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>com.dianping.cat</groupId>
+			<artifactId>cat-client</artifactId>
+		</dependency>
+	</dependencies>
 </project>

apollo-client/src/test/java/com/ctrip/apollo/cat/NullMessageManager.java → apollo-buildtools/src/main/java/com/ctrip/apollo/cat/NullMessageManager.java

 package com.ctrip.apollo.cat;
 
+import java.io.IOException;
+
 import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 import org.unidal.lookup.ContainerHolder;
+import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.message.Message;
 import com.dianping.cat.message.Transaction;
+import com.dianping.cat.message.internal.MessageIdFactory;
 import com.dianping.cat.message.spi.MessageManager;
 import com.dianping.cat.message.spi.MessageTree;
 
-public class NullMessageManager extends ContainerHolder implements MessageManager, Initializable, LogEnabled{
+public class NullMessageManager extends ContainerHolder
+    implements
+      MessageManager,
+      Initializable,
+      LogEnabled {
+
+  @Inject
+  private MessageIdFactory m_factory;
 
   @Override
   public void enableLogging(Logger logger) {
-    
+
   }
 
   @Override
   public void initialize() throws InitializationException {
-    
+    try {
+      m_factory.initialize("localhost");
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
   }
 
   @Override
   public void add(Message message) {
-    
+
   }
 
   @Override
@@ -65,27 +80,27 @@ public class NullMessageManager extends ContainerHolder implements MessageManage
 
   @Override
   public void reset() {
-    
+
   }
 
   @Override
   public void setTraceMode(boolean traceMode) {
-    
+
   }
 
   @Override
   public void setup() {
-    
+
   }
 
   @Override
   public void start(Transaction transaction, boolean forked) {
-    
+
   }
 
   @Override
   public void bind(String tag, String title) {
-    
+
   }
 
   @Override
@@ -93,4 +108,4 @@ public class NullMessageManager extends ContainerHolder implements MessageManage
     return null;
   }
 
-}
\ No newline at end of file
+}

apollo-client/pom.xml

@@ -20,6 +20,11 @@
 			<groupId>com.ctrip.apollo</groupId>
 			<artifactId>apollo-core</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.ctrip.apollo</groupId>
+			<artifactId>apollo-buildtools</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<!-- end of apollo -->
 		<!-- foundation service -->
 		<dependency>

apollo-client/src/test/java/com/ctrip/apollo/internals/RemoteConfigRepositoryTest.java

@@ -18,7 +18,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;

apollo-client/src/test/resources/META-INF/plexus/plexus.xml

@@ -14,6 +14,11 @@
 			<role>com.dianping.cat.message.spi.MessageManager</role>
 			<implementation>com.ctrip.apollo.cat.NullMessageManager
 			</implementation>
+			<requirements>
+				<requirement>
+					<role>com.dianping.cat.message.internal.MessageIdFactory</role>
+				</requirement>
+			</requirements>
 		</component>
 		<component>
 			<role>com.dianping.cat.message.MessageProducer</role>

apollo-configservice/pom.xml

@@ -19,6 +19,11 @@
 			<groupId>com.ctrip.apollo</groupId>
 			<artifactId>apollo-biz</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.ctrip.apollo</groupId>
+			<artifactId>apollo-buildtools</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<!-- end of apollo -->
 		<!-- eureka -->
 		<dependency>

apollo-configservice/src/test/resources/META-INF/plexus/plexus.xml

+<plexus>
+	<components>
+		<component>
+			<role>com.dianping.cat.configuration.ClientConfigManager</role>
+			<implementation>com.ctrip.apollo.cat.NullClientConfigManager
+			</implementation>
+		</component>
+		<component>
+			<role>com.dianping.cat.message.io.TransportManager</role>
+			<implementation>com.ctrip.apollo.cat.NullTransportManager
+			</implementation>
+		</component>
+		<component>
+			<role>com.dianping.cat.message.spi.MessageManager</role>
+			<implementation>com.ctrip.apollo.cat.NullMessageManager
+			</implementation>
+			<requirements>
+				<requirement>
+					<role>com.dianping.cat.message.internal.MessageIdFactory</role>
+				</requirement>
+			</requirements>
+		</component>
+		<component>
+			<role>com.dianping.cat.message.MessageProducer</role>
+			<implementation>com.ctrip.apollo.cat.NullMessageProducer
+			</implementation>
+			<requirements>
+				<requirement>
+					<role>com.dianping.cat.message.spi.MessageManager</role>
+				</requirement>
+				<requirement>
+					<role>com.dianping.cat.message.internal.MessageIdFactory</role>
+				</requirement>
+			</requirements>
+		</component>
+		<component>
+			<role>org.codehaus.plexus.logging.LoggerManager</role>
+			<implementation>com.ctrip.apollo.cat.NullLoggerManager
+			</implementation>
+		</component>
+	</components>
+</plexus>
\ No newline at end of file

apollo-portal/pom.xml

@@ -18,6 +18,11 @@
 			<groupId>com.ctrip.apollo</groupId>
 			<artifactId>apollo-common</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.ctrip.apollo</groupId>
+			<artifactId>apollo-buildtools</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

apollo-portal/src/test/resources/META-INF/plexus/plexus.xml

+<plexus>
+	<components>
+		<component>
+			<role>com.dianping.cat.configuration.ClientConfigManager</role>
+			<implementation>com.ctrip.apollo.cat.NullClientConfigManager
+			</implementation>
+		</component>
+		<component>
+			<role>com.dianping.cat.message.io.TransportManager</role>
+			<implementation>com.ctrip.apollo.cat.NullTransportManager
+			</implementation>
+		</component>
+		<component>
+			<role>com.dianping.cat.message.spi.MessageManager</role>
+			<implementation>com.ctrip.apollo.cat.NullMessageManager
+			</implementation>
+			<requirements>
+				<requirement>
+					<role>com.dianping.cat.message.internal.MessageIdFactory</role>
+				</requirement>
+			</requirements>
+		</component>
+		<component>
+			<role>com.dianping.cat.message.MessageProducer</role>
+			<implementation>com.ctrip.apollo.cat.NullMessageProducer
+			</implementation>
+			<requirements>
+				<requirement>
+					<role>com.dianping.cat.message.spi.MessageManager</role>
+				</requirement>
+				<requirement>
+					<role>com.dianping.cat.message.internal.MessageIdFactory</role>
+				</requirement>
+			</requirements>
+		</component>
+		<component>
+			<role>org.codehaus.plexus.logging.LoggerManager</role>
+			<implementation>com.ctrip.apollo.cat.NullLoggerManager
+			</implementation>
+		</component>
+	</components>
+</plexus>
\ No newline at end of file

pom.xml

@@ -116,6 +116,11 @@
 				<artifactId>apollo-biz</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.ctrip.apollo</groupId>
+				<artifactId>apollo-buildtools</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.ctrip.framework</groupId>
 				<artifactId>framework-foundation</artifactId>