remove used dependency

cat-core/src/main/java/com/dianping/cat/build/ComponentsConfigurator.java

@@ -94,8 +94,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		all.add(C(TransportManager.class, DefaultTransportManager.class) //
 		      .req(ClientConfigManager.class));
 
-		all.add(C(MessageHandler.class, DefaultMessageHandler.class) //
-		      .req(ServerConfigManager.class));
+		all.add(C(MessageHandler.class, DefaultMessageHandler.class));
 		all.add(C(MessageStatistics.class, DefaultMessageStatistics.class));
 		all.add(C(StatusUpdateTask.class) //
 		      .req(MessageStatistics.class, ClientConfigManager.class));
@@ -105,8 +104,7 @@ public class ComponentsConfigurator extends AbstractResourceConfigurator {
 		      .req(MessageCodec.class, PlainTextMessageCodec.ID) //
 		      .req(ChannelBufferManager.class));
 		all.add(C(MessageBucketManager.class, LocalMessageBucketManager.ID, LocalMessageBucketManager.class) //
-		      .req(ServerConfigManager.class, MessagePathBuilder.class)//
-		      .req(MessageCodec.class, ChannelBufferManager.class, ServerStateManager.class));
+		      .req(ServerConfigManager.class, MessagePathBuilder.class, ServerStateManager.class));
 		all.add(C(ChannelBufferManager.class));
 
 		all.add(C(Module.class, CatCoreModule.ID, CatCoreModule.class));

cat-core/src/main/java/com/dianping/cat/message/spi/internal/DefaultMessageHandler.java

@@ -4,19 +4,14 @@ import java.util.List;
 
 import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
+import org.unidal.lookup.ContainerHolder;
 
-import com.dianping.cat.configuration.ServerConfigManager;
 import com.dianping.cat.message.spi.MessageConsumer;
 import com.dianping.cat.message.spi.MessageConsumerRegistry;
 import com.dianping.cat.message.spi.MessageHandler;
 import com.dianping.cat.message.spi.MessageTree;
-import org.unidal.lookup.ContainerHolder;
-import org.unidal.lookup.annotation.Inject;
 
 public class DefaultMessageHandler extends ContainerHolder implements MessageHandler, LogEnabled {
-	@Inject
-	private ServerConfigManager m_configManager;
-
 	private MessageConsumerRegistry m_registry;
 
 	private Logger m_logger;
@@ -26,7 +21,6 @@ public class DefaultMessageHandler extends ContainerHolder implements MessageHan
 		m_logger = logger;
 	}
 
-
 	@Override
 	public void handle(MessageTree tree) {
 		if (m_registry == null) {

cat-core/src/main/java/com/dianping/cat/storage/dump/LocalMessageBucketManager.java

@@ -18,6 +18,13 @@ 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.jboss.netty.buffer.ChannelBuffer;
+import org.unidal.helper.Files;
+import org.unidal.helper.Scanners;
+import org.unidal.helper.Scanners.FileMatcher;
+import org.unidal.helper.Threads;
+import org.unidal.helper.Threads.Task;
+import org.unidal.lookup.ContainerHolder;
+import org.unidal.lookup.annotation.Inject;
 
 import com.dianping.cat.Cat;
 import com.dianping.cat.CatConstants;
@@ -27,18 +34,10 @@ import com.dianping.cat.message.Message;
 import com.dianping.cat.message.MessageProducer;
 import com.dianping.cat.message.Transaction;
 import com.dianping.cat.message.internal.MessageId;
-import com.dianping.cat.message.spi.MessageCodec;
 import com.dianping.cat.message.spi.MessagePathBuilder;
 import com.dianping.cat.message.spi.MessageTree;
 import com.dianping.cat.message.spi.internal.DefaultMessageTree;
 import com.dianping.cat.status.ServerStateManager;
-import org.unidal.helper.Files;
-import org.unidal.helper.Scanners;
-import org.unidal.helper.Scanners.FileMatcher;
-import org.unidal.helper.Threads;
-import org.unidal.helper.Threads.Task;
-import org.unidal.lookup.ContainerHolder;
-import org.unidal.lookup.annotation.Inject;
 
 public class LocalMessageBucketManager extends ContainerHolder implements MessageBucketManager, Initializable,
       LogEnabled {
@@ -54,13 +53,10 @@ public class LocalMessageBucketManager extends ContainerHolder implements Messag
 	private ServerConfigManager m_configManager;
 
 	@Inject
-	private MessageCodec m_codec;
-
-	@Inject
-	private ChannelBufferManager m_bufferManager;
+	private ServerStateManager m_serverStateManager;
 	
 	@Inject
-	private ServerStateManager m_serverStateManager;
+	private MessagePathBuilder m_pathBuilder;
 
 	private int m_error;
 
@@ -74,9 +70,6 @@ public class LocalMessageBucketManager extends ContainerHolder implements Messag
 
 	private BlockingQueue<MessageBlock> m_messageBlocks = new LinkedBlockingQueue<MessageBlock>(1000);
 
-	@Inject
-	private MessagePathBuilder m_pathBuilder;
-
 	public void archive(long startTime) {
 		String path = m_pathBuilder.getPath(new Date(startTime), "");
 		List<String> keys = new ArrayList<String>();

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

@@ -179,11 +179,6 @@
 		<component>
 			<role>com.dianping.cat.message.spi.MessageHandler</role>
 			<implementation>com.dianping.cat.message.spi.internal.DefaultMessageHandler</implementation>
-			<requirements>
-				<requirement>
-					<role>com.dianping.cat.configuration.ServerConfigManager</role>
-				</requirement>
-			</requirements>
 		</component>
 		<component>
 			<role>com.dianping.cat.message.spi.MessageStatistics</role>
@@ -227,12 +222,6 @@
 				<requirement>
 					<role>com.dianping.cat.message.spi.MessagePathBuilder</role>
 				</requirement>
-				<requirement>
-					<role>com.dianping.cat.message.spi.MessageCodec</role>
-				</requirement>
-				<requirement>
-					<role>com.dianping.cat.storage.dump.ChannelBufferManager</role>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.status.ServerStateManager</role>
 				</requirement>

cat-home/src/main/java/com/dianping/cat/build/ServiceComponentConfigurator.java

@@ -3,6 +3,9 @@ package com.dianping.cat.build;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.unidal.lookup.configuration.AbstractResourceConfigurator;
+import org.unidal.lookup.configuration.Component;
+
 import com.dainping.cat.consumer.dal.report.ReportDao;
 import com.dianping.cat.configuration.ServerConfigManager;
 import com.dianping.cat.hadoop.hdfs.HdfsMessageBucketManager;
@@ -45,8 +48,6 @@ import com.dianping.cat.report.page.model.transaction.LocalTransactionService;
 import com.dianping.cat.storage.BucketManager;
 import com.dianping.cat.storage.dump.LocalMessageBucketManager;
 import com.dianping.cat.storage.dump.MessageBucketManager;
-import org.unidal.lookup.configuration.AbstractResourceConfigurator;
-import org.unidal.lookup.configuration.Component;
 
 class ServiceComponentConfigurator extends AbstractResourceConfigurator {
 	@Override
@@ -99,7 +100,7 @@ class ServiceComponentConfigurator extends AbstractResourceConfigurator {
 		      .req(ModelService.class, new String[] { "matrix-historical" }, "m_services"));
 		
 		all.add(C(ModelService.class, "state-local", LocalStateService.class) //
-		      .req(BucketManager.class, ReportDao.class) //
+		      .req(BucketManager.class) //
 		      .req(MessageConsumer.class, "realtime"));
 		all.add(C(ModelService.class, "state-historical", HistoricalStateService.class) //
 		      .req(BucketManager.class, ReportDao.class));

cat-home/src/main/java/com/dianping/cat/report/page/model/state/LocalStateService.java

 package com.dianping.cat.report.page.model.state;
 
-import com.dainping.cat.consumer.dal.report.ReportDao;
+import org.unidal.lookup.annotation.Inject;
+
 import com.dianping.cat.consumer.state.model.entity.StateReport;
 import com.dianping.cat.consumer.state.model.transform.DefaultSaxParser;
 import com.dianping.cat.report.page.model.spi.ModelPeriod;
@@ -8,15 +9,11 @@ import com.dianping.cat.report.page.model.spi.ModelRequest;
 import com.dianping.cat.report.page.model.spi.internal.BaseLocalModelService;
 import com.dianping.cat.storage.Bucket;
 import com.dianping.cat.storage.BucketManager;
-import org.unidal.lookup.annotation.Inject;
 
 public class LocalStateService extends BaseLocalModelService<StateReport> {
 	@Inject
 	private BucketManager m_bucketManager;
 
-	@Inject
-	private ReportDao m_reportDao;
-
 	public LocalStateService() {
 		super("state");
 	}

cat-home/src/main/java/com/dianping/cat/report/page/state/Handler.java

@@ -19,15 +19,11 @@ import com.dianping.cat.report.page.model.spi.ModelRequest;
 import com.dianping.cat.report.page.model.spi.ModelResponse;
 import com.dianping.cat.report.page.model.spi.ModelService;
 import com.dianping.cat.report.service.ReportService;
-import com.dianping.cat.status.ServerStateManager;
 
 public class Handler implements PageHandler<Context> {
 	@Inject
 	private JspViewer m_jspViewer;
 
-	@Inject
-	private ServerStateManager m_serverStateManager;
-
 	@Inject
 	private ReportService m_reportService;
 

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

@@ -779,9 +779,6 @@
 				<requirement>
 					<role>com.dianping.cat.storage.BucketManager</role>
 				</requirement>
-				<requirement>
-					<role>com.dainping.cat.consumer.dal.report.ReportDao</role>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.message.spi.MessageConsumer</role>
 					<role-hint>realtime</role-hint>
@@ -1888,9 +1885,6 @@
 				<requirement>
 					<role>com.dianping.cat.storage.BucketManager</role>
 				</requirement>
-				<requirement>
-					<role>com.dainping.cat.consumer.dal.report.ReportDao</role>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.message.spi.MessageConsumer</role>
 					<role-hint>realtime</role-hint>
@@ -2545,9 +2539,6 @@
 				<requirement>
 					<role>com.dianping.cat.report.page.state.JspViewer</role>
 				</requirement>
-				<requirement>
-					<role>com.dianping.cat.status.ServerStateManager</role>
-				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.service.ReportService</role>
 				</requirement>

java_formatter.xml

@@ -74,7 +74,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="132"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
@@ -82,14 +82,14 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="3"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
 <setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
@@ -205,7 +205,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="132"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>