modify the package and the remove some unused resources

cat-consumer/src/main/java/com/dianping/cat/consumer/failure/FailureReportAnalyzer.java

@@ -9,11 +9,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.dianping.cat.consumer.model.failure.entity.Entry;
-import com.dianping.cat.consumer.model.failure.entity.FailureReport;
-import com.dianping.cat.consumer.model.failure.entity.Machines;
-import com.dianping.cat.consumer.model.failure.entity.Segment;
-import com.dianping.cat.consumer.model.failure.entity.Threads;
+import com.dianping.cat.consumer.failure.model.entity.Entry;
+import com.dianping.cat.consumer.failure.model.entity.FailureReport;
+import com.dianping.cat.consumer.failure.model.entity.Machines;
+import com.dianping.cat.consumer.failure.model.entity.Segment;
+import com.dianping.cat.consumer.failure.model.entity.Threads;
 import com.dianping.cat.message.Event;
 import com.dianping.cat.message.Message;
 import com.dianping.cat.message.Transaction;

cat-consumer/src/main/java/com/dianping/cat/consumer/failure/FailureReportStore.java

@@ -4,8 +4,8 @@ import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 
-import com.dianping.cat.consumer.model.failure.entity.FailureReport;
-import com.dianping.cat.consumer.model.failure.transform.DefaultJsonBuilder;
+import com.dianping.cat.consumer.failure.model.entity.FailureReport;
+import com.dianping.cat.consumer.failure.model.transform.DefaultJsonBuilder;
 import com.site.helper.Files;
 
 public class FailureReportStore {

cat-consumer/src/main/java/com/dianping/cat/consumer/transaction/TransactionReportMessageAnalyzer.java

@@ -11,10 +11,10 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import com.dianping.cat.consumer.model.transaction.entity.TransactionName;
-import com.dianping.cat.consumer.model.transaction.entity.TransactionReport;
-import com.dianping.cat.consumer.model.transaction.entity.TransactionType;
-import com.dianping.cat.consumer.model.transaction.transform.DefaultJsonBuilder;
+import com.dianping.cat.consumer.transaction.model.entity.TransactionName;
+import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
+import com.dianping.cat.consumer.transaction.model.entity.TransactionType;
+import com.dianping.cat.consumer.transaction.model.transform.DefaultJsonBuilder;
 import com.dianping.cat.message.Message;
 import com.dianping.cat.message.Transaction;
 import com.dianping.cat.message.spi.AbstractMessageAnalyzer;

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

@@ -2,17 +2,17 @@
 	<components>
 		<component>
 			<role>com.dianping.cat.message.spi.MessageQueue</role>
-			<implementation>com.dianping.cat.consumer.impl.DefaultMessageQueue</implementation>
+			<implementation>com.dianping.cat.consumer.DefaultMessageQueue</implementation>
 			<instantiation-strategy>per-lookup</instantiation-strategy>
 		</component>
 		<component>
-			<role>com.dianping.cat.consumer.impl.AnalyzerFactory</role>
-			<implementation>com.dianping.cat.consumer.impl.DefaultAnalyzerFactoryImpl</implementation>
+			<role>com.dianping.cat.consumer.AnalyzerFactory</role>
+			<implementation>com.dianping.cat.consumer.DefaultAnalyzerFactory</implementation>
 		</component>
 		<component>
 			<role>com.dianping.cat.message.spi.MessageConsumer</role>
 			<role-hint>realtime</role-hint>
-			<implementation>com.dianping.cat.consumer.impl.RealtimeConsumer</implementation>
+			<implementation>com.dianping.cat.consumer.RealtimeConsumer</implementation>
 			<configuration>
 				<consumerId>realtime</consumerId>
 				<domain>Review</domain>
@@ -21,7 +21,7 @@
 			</configuration>
 			<requirements>
 				<requirement>
-					<role>com.dianping.cat.consumer.impl.AnalyzerFactory</role>
+					<role>com.dianping.cat.consumer.AnalyzerFactory</role>
 				</requirement>
 			</requirements>
 		</component>

cat-consumer/src/test/java/com/dianping/cat/consumer/failure/FailureAnalyzerStoreTest.java

@@ -9,8 +9,8 @@ import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 import com.dianping.cat.consumer.AnalyzerFactory;
-import com.dianping.cat.consumer.model.failure.entity.FailureReport;
-import com.dianping.cat.consumer.model.failure.transform.DefaultJsonBuilder;
+import com.dianping.cat.consumer.failure.model.entity.FailureReport;
+import com.dianping.cat.consumer.failure.model.transform.DefaultJsonBuilder;
 import com.dianping.cat.message.internal.DefaultTransaction;
 import com.dianping.cat.message.spi.MessageTree;
 import com.dianping.cat.message.spi.internal.DefaultMessageTree;

cat-consumer/src/test/java/com/dianping/cat/consumer/failure/FailureAnalyzerTest.java

@@ -10,9 +10,9 @@ import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 import com.dianping.cat.consumer.AnalyzerFactory;
-import com.dianping.cat.consumer.model.failure.entity.Entry;
-import com.dianping.cat.consumer.model.failure.entity.FailureReport;
-import com.dianping.cat.consumer.model.failure.entity.Segment;
+import com.dianping.cat.consumer.failure.model.entity.Entry;
+import com.dianping.cat.consumer.failure.model.entity.FailureReport;
+import com.dianping.cat.consumer.failure.model.entity.Segment;
 import com.dianping.cat.message.Message;
 import com.dianping.cat.message.internal.DefaultEvent;
 import com.dianping.cat.message.internal.DefaultTransaction;

cat-consumer/src/test/java/com/dianping/cat/consumer/failure/FailureAnaylzerStoreTestConfigurator.java

@@ -4,7 +4,6 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.dianping.cat.consumer.failure.FailureReportAnalyzer;
 import com.dianping.cat.consumer.failure.FailureReportAnalyzer.Handler;
 import com.site.lookup.configuration.AbstractResourceConfigurator;
 import com.site.lookup.configuration.Component;

cat-consumer/src/test/java/com/dianping/cat/consumer/failure/FailureReportModelTest.java

-package com.dianping.cat.consumer.failure;
-
-import java.io.IOException;
-
-import org.junit.Test;
-import org.xml.sax.SAXException;
-
-import com.dianping.cat.consumer.model.failure.entity.FailureReport;
-import com.dianping.cat.consumer.model.failure.transform.DefaultJsonBuilder;
-import com.dianping.cat.consumer.model.failure.transform.DefaultParser;
-import com.site.helper.Files;
-
-public class FailureReportModelTest {
-	@Test
-	public void test() throws SAXException, IOException {
-		String xml = Files.forIO().readFrom(getClass().getResourceAsStream("/logView.xml"), "utf-8");
-		FailureReport report = new DefaultParser().parse(xml);
-
-		System.out.println(report);
-
-		report.getMachines().addMachine("a").addMachine("b");
-
-		System.out.println(report);
-
-		DefaultJsonBuilder jsonBuilder = new DefaultJsonBuilder();
-
-		jsonBuilder.visitFailureReport(report);
-		System.out.println(jsonBuilder.getString());
-	}
-}

cat-consumer/src/test/java/com/dianping/cat/consumer/transaction/TransactionReportMessageAnalyzerTest.java

@@ -11,11 +11,10 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import com.dianping.cat.consumer.model.transaction.entity.TransactionName;
-import com.dianping.cat.consumer.model.transaction.entity.TransactionReport;
-import com.dianping.cat.consumer.model.transaction.entity.TransactionType;
-import com.dianping.cat.consumer.model.transaction.transform.DefaultJsonBuilder;
-import com.dianping.cat.consumer.transaction.TransactionReportMessageAnalyzer;
+import com.dianping.cat.consumer.transaction.model.entity.TransactionName;
+import com.dianping.cat.consumer.transaction.model.entity.TransactionReport;
+import com.dianping.cat.consumer.transaction.model.entity.TransactionType;
+import com.dianping.cat.consumer.transaction.model.transform.DefaultJsonBuilder;
 import com.dianping.cat.message.Message;
 import com.dianping.cat.message.internal.DefaultTransaction;
 import com.dianping.cat.message.spi.MessageTree;

cat-consumer/src/test/resources/com/dianping/cat/consumer/ManyAnalyzerTest.xml

@@ -3,38 +3,38 @@
 		<component>
 			<role>com.dianping.cat.message.spi.MessageConsumer</role>
 			<role-hint>mockManyAnalyzers</role-hint>
-			<implementation>com.dianping.cat.consumer.impl.RealtimeConsumer</implementation>
+			<implementation>com.dianping.cat.consumer.RealtimeConsumer</implementation>
 			<configuration>
 				<consumerId>analyzers</consumerId>
 				<analyzerNames>mock1,mock2,mock3</analyzerNames>
 			</configuration>
 			<requirements>
 				<requirement>
-					<role>com.dianping.cat.consumer.impl.AnalyzerFactory</role>
+					<role>com.dianping.cat.consumer.AnalyzerFactory</role>
 				</requirement>
 			</requirements>
 		</component>
 		<component>
 			<role>com.dianping.cat.message.spi.MessageAnalyzer</role>
 			<role-hint>mock1</role-hint>
-			<implementation>com.dianping.cat.consumer.impl.ManyAnalyzerTest$MockAnalyzer1</implementation>
+			<implementation>com.dianping.cat.consumer.ManyAnalyzerTest$MockAnalyzer1</implementation>
 			<instantiation-strategy>per-lookup</instantiation-strategy>
 		</component>
 		<component>
 			<role>com.dianping.cat.message.spi.MessageAnalyzer</role>
 			<role-hint>mock2</role-hint>
-			<implementation>com.dianping.cat.consumer.impl.ManyAnalyzerTest$MockAnalyzer2</implementation>
+			<implementation>com.dianping.cat.consumer.ManyAnalyzerTest$MockAnalyzer2</implementation>
 			<instantiation-strategy>per-lookup</instantiation-strategy>
 		</component>
 		<component>
 			<role>com.dianping.cat.message.spi.MessageAnalyzer</role>
 			<role-hint>mock3</role-hint>
-			<implementation>com.dianping.cat.consumer.impl.ManyAnalyzerTest$MockAnalyzer3</implementation>
+			<implementation>com.dianping.cat.consumer.ManyAnalyzerTest$MockAnalyzer3</implementation>
 			<instantiation-strategy>per-lookup</instantiation-strategy>
 		</component>
 		<component>
-			<role>com.dianping.cat.consumer.impl.AnalyzerFactory</role>
-			<implementation>com.dianping.cat.consumer.impl.ManyAnalyerMockFactory</implementation>
+			<role>com.dianping.cat.consumer.AnalyzerFactory</role>
+			<implementation>com.dianping.cat.consumer.ManyAnalyerMockFactory</implementation>
 		</component>
 	</components>
 </plexus>

cat-consumer/src/test/resources/com/dianping/cat/consumer/OneAnalyzerTwoDurationTest.xml

@@ -3,26 +3,26 @@
 		<component>
 			<role>com.dianping.cat.message.spi.MessageConsumer</role>
 			<role-hint>mock</role-hint>
-			<implementation>com.dianping.cat.consumer.impl.RealtimeConsumer</implementation>
+			<implementation>com.dianping.cat.consumer.RealtimeConsumer</implementation>
 			<configuration>
 				<consumerId>mock</consumerId>
 				<analyzerNames>mock</analyzerNames>
 			</configuration>
 			<requirements>
 				<requirement>
-					<role>com.dianping.cat.consumer.impl.AnalyzerFactory</role>
+					<role>com.dianping.cat.consumer.AnalyzerFactory</role>
 				</requirement>
 			</requirements>
 		</component>
 		<component>
 			<role>com.dianping.cat.message.spi.MessageAnalyzer</role>
 			<role-hint>mock</role-hint>
-			<implementation>com.dianping.cat.consumer.impl.OneAnalyzerTwoDurationTest$MockAnalyzer</implementation>
+			<implementation>com.dianping.cat.consumer.OneAnalyzerTwoDurationTest$MockAnalyzer</implementation>
 			<instantiation-strategy>per-lookup</instantiation-strategy>
 		</component>
 		<component>
-			<role>com.dianping.cat.consumer.impl.AnalyzerFactory</role>
-			<implementation>com.dianping.cat.consumer.impl.OneAnalyzerMockFactory</implementation>
+			<role>com.dianping.cat.consumer.AnalyzerFactory</role>
+			<implementation>com.dianping.cat.consumer.OneAnalyzerMockFactory</implementation>
 		</component>
 	</components>
 </plexus>