修改测试环境

ifa6 · Apr 26, 2013 · f4844a2 · f4844a2
1 parent 550da16
commit f4844a2
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 3 deletions.
diff --git a/...s/hydra-collector-service/src/main/java/com/jd/bdp/hydra/collector/service/Bootstrap.java b/...s/hydra-collector-service/src/main/java/com/jd/bdp/hydra/collector/service/Bootstrap.java
@@ -16,6 +16,7 @@ public static void main(String[] strings){
         try {
             ApplicationContext context = new ClassPathXmlApplicationContext("hydra-collector-service.xml");
             Bootstrap bootstrap = new Bootstrap();
+            bootstrap.collectorService = (CollectorService)context.getBean("collectorService");
             bootstrap.start();
         } catch (Exception e) {
             e.printStackTrace();
@@ -25,4 +26,5 @@ public static void main(String[] strings){
     public void start()throws Exception{
         collectorService.subscribe(topic);
     }
+
 }
diff --git a/...-collector-service/src/main/java/com/jd/bdp/hydra/collector/service/CollectorService.java b/...-collector-service/src/main/java/com/jd/bdp/hydra/collector/service/CollectorService.java
@@ -28,6 +28,14 @@ public class CollectorService {
     private ExecutorService executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
     private AtomicLong c = new AtomicLong(0L);
 
+    public void setConsumer(MessageConsumer consumer) {
+        this.consumer = consumer;
+    }
+
+    public void setHbaseService(HbaseService hbaseService) {
+        this.hbaseService = hbaseService;
+    }
+
     class HbaseConsumer implements MessageListener{
         @Override
         public void recieveMessages(Message message) {

diff --git a/modules/hydra-collector-service/src/main/resources/hydra-collector-service.xml b/modules/hydra-collector-service/src/main/resources/hydra-collector-service.xml
@@ -18,16 +18,19 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
+        default-autowire="byName">
 
     <bean id="hbaseService" class="com.jd.bdp.hydra.hbase.service.impl.HbaseServiceImpl"/>
+    <bean id="collectorService" class="com.jd.bdp.hydra.collector.service.CollectorService" />
+
     <bean id="sessionFactory" class="com.taobao.metamorphosis.client.MetaMessageSessionFactory">
         <constructor-arg>
             <bean class="com.taobao.metamorphosis.client.MetaClientConfig">
                 <property name="zkConfig">
                     <bean class="com.taobao.metamorphosis.utils.ZkUtils.ZKConfig">
                         <constructor-arg>
-                            <value>127.0.0.1:2181</value>
+                            <value>192.168.227.83:2181</value>
                         </constructor-arg>
                         <constructor-arg>
                             <value>30000</value>

diff --git a/modules/hydra-collector/pom.xml b/modules/hydra-collector/pom.xml
@@ -21,6 +21,10 @@
             <groupId>com.jd.bdp</groupId>
             <artifactId>hydra-interface</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>dubbo</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.taobao.metamorphosis</groupId>
             <artifactId>metamorphosis-client</artifactId>

diff --git a/...ple/hydra-example-benchmark/src/main/java/com/jd/bdp/hydra/benchmark/trigger/Trigger.java b/...ple/hydra-example-benchmark/src/main/java/com/jd/bdp/hydra/benchmark/trigger/Trigger.java
@@ -79,5 +79,14 @@ public void setRootService(InterfaceA rootService) {
         this.rootService = rootService;
     }
 
+    public static void main(String[] args) throws InterruptedException {
+        ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{
+                "classpath*:trigger-context.xml",
+        });
+        context.start();
+        Trigger trigger = (Trigger)context.getBean("trigger");
+        trigger.startWorkWithSleep(5,0);
+        Thread.sleep(999999999);
+    }
 
 }
diff --git a/modules/hydra-manager/src/main/resources/hydra-manager.xml b/modules/hydra-manager/src/main/resources/hydra-manager.xml
@@ -10,7 +10,7 @@
     <dubbo:application name="hydra-manager"/>
     <dubbo:registry protocol="zookeeper" address="192.168.227.48:2181"/>
     <!-- 用dubbo协议在20880端口暴露服务 -->
-    <dubbo:protocol name="dubbo" port="20889"/>
+    <dubbo:protocol name="dubbo" port="20890"/>
     <bean id="leaderService" class="com.jd.bdp.hydra.dubbomonitor.provider.impl.LeaderServiceImpl">
         <property name="appService" ref="appService"/>
         <property name="seedService" ref="seedService"/>