← Back to branch summary

~ubuntu-branches/ubuntu/maverick/eucalyptus/maverick

« back to all changes in this revision

Viewing changes to clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/HeartbeatClient.java

  • Committer: Bazaar Package Importer
  • Author(s): Dave Walker (Daviey)
  • Date: 2010-07-21 17:27:10 UTC
  • mfrom: (1.1.38 upstream)
  • Revision ID: james.westby@ubuntu.com-20100721172710-7xv07dmdqgivc3t9
Tags: 2.0~bzr1211-0ubuntu1
https://launchpad.net/bugs/597330
https://launchpad.net/bugs/595421
* New major upstream version merge, 2.0 (r1211).
* debian/patches/:
  - 01-wsdl-stubs.patch, debian/wsdl.md5sums: wsdl stubs updated.
  - 02-Makefile.patch: Updated to reflect new code layout.
  - 07-local_support_euca_conf-in.patch: Updated to reflect new code layout.
  - 08-ubuntu-default-networking.patch: Refreshed.
  - 09-small-128-192MB.patch: Updated to point to new location.
  - 10-disable-iscsi.patch: Refreshed.
  - 11-state-cleanup-memleakfix.patch: Removed, fixed upstream.
  - 15-fix-default-ramdisk.patch: Updated to point to new location.
  - 16-kvm_libvirt_xml_default_use_kvm.patch: Updated to reflect changes.
  - 17-fix_walrus_OOM_errors.patch: Removed, fixed upstream.
  - 18-priv_security.patch: Updated to reflect upstream changes.
  - 20-brute-force-webui.patch: Updated to reflect upstream changes. 
  - 21-eucalyptus-1.7-with-gwt-1.6.4.patch: New patch, allows 
    eucalyptus-1.7 to be built against gwt 1.6.4. Based on patch courtesy 
    of Dmitrii Zagorodnov, upstream. (LP: #597330)
* debian/eucalyptus-java-common.links: 
  - Changed symlink for groovy, point to groovy.all.jar, making compatiable 
    with groovy versions >1.7. (LP: #595421)
  - Added ant.jar & jetty-rewrite-handler.jar as they are now required.
* debian/control
  - & debian/build-jars: Added libjavassist-java and libjetty-extra-java as 
    build dependencies.
  - Added libjetty-extra-java as a dependency of eucalyptus-java-common
* The binary resulting jar's have been renamed from eucalyptus-*-1.6.2.jar
  to eucalyptus-*-main.jar:    
  - debian/eucalyptus-cc.upstart
  - debian/eucalyptus-cloud.install
  - debian/eucalyptus-common.eucalyptus.upstart
  - debian/eucalyptus-java-common.install
  - debian/eucalyptus-network.upstart
  - debian/eucalyptus-sc.install
  - debian/eucalyptus-walrus.install
* debian/eucalyptus-java-common.install: New upstream jars that have been
  installed:
  - eucalyptus-db-hsqldb-ext-main.jar
  - eucalyptus-component-main.jar
* debian/control:
  - Updated Standards Version to 3.8.4 (no change)
  - Updated the upstream Homepage to: http://open.eucalyptus.com/
  - Changed Vcs-Bzr to reflect new location of Ubuntu hosted development branch.
  - Made the Build Dependency of groovy and the binary eucalyptus-java-common
    package depend on version >=1.7.

Show diffs side-by-side

added added

removed removed

Lines of Context:
clc/modules/wsstack/src/main/java/com/eucalyptus/ws/client/HeartbeatClient.java
12
12
import org.jboss.netty.handler.codec.http.HttpRequest;
13
13
import org.jboss.netty.handler.codec.http.HttpVersion;
14
14
 
 
15
import com.eucalyptus.component.ServiceConfiguration;
15
16
import com.eucalyptus.config.ComponentConfiguration;
 
17
import com.eucalyptus.http.MappingHttpRequest;
16
18
import com.eucalyptus.util.LogUtil;
17
 
import com.eucalyptus.ws.MappingHttpRequest;
18
19
import com.google.common.collect.Lists;
19
20
 
20
21
import edu.ucsb.eucalyptus.msgs.ComponentType;
40
41
    this.port = port;
41
42
  }
42
43
  
43
 
  public void send( Collection<ComponentConfiguration> componentConfigurations ) {
 
44
  public void send( Collection<ServiceConfiguration> componentConfigurations ) {
44
45
    try {
45
46
      HeartbeatType hbmsg = this.getMessage( componentConfigurations );
46
47
      MappingHttpRequest httpRequest = new MappingHttpRequest( HttpVersion.HTTP_1_1, HttpMethod.POST, this.getHostName( ), this.getPort(), "/services/Heartbeat", hbmsg );
95
96
  public int getPort( ) {
96
97
    return port;
97
98
  }
98
 
  private synchronized HeartbeatType getMessage( Collection<ComponentConfiguration> componentConfigurations ) {
 
99
  private synchronized HeartbeatType getMessage( Collection<ServiceConfiguration> componentConfigurations ) {
99
100
    HeartbeatType hbmsg = new HeartbeatType( );
100
101
    hbmsg.getStarted( ).addAll( started );
101
102
    this.started.clear( );
102
103
    hbmsg.getStopped( ).addAll( stopped );
103
104
    this.stopped.clear( );
104
 
    for( ComponentConfiguration c : componentConfigurations ) {
 
105
    for( ServiceConfiguration c : componentConfigurations ) {
105
106
      hbmsg.getComponents( ).add( new HeartbeatComponentType( c.getComponent( ).name( ), c.getName( ) ) );
106
107
    }
107
108
    return hbmsg;
108
109
  }
109
 
  public synchronized boolean addStarted( ComponentConfiguration e ) {
 
110
  public synchronized boolean addStarted( ServiceConfiguration e ) {
110
111
    return this.started.add( new ComponentType( e.getComponent( ).name( ), e.getName( ), e.getUri( ) ) );
111
112
  }
112
 
  public synchronized boolean addStopped( ComponentConfiguration e ) {
 
113
  public synchronized boolean addStopped( ServiceConfiguration e ) {
113
114
    return this.stopped.add( new ComponentType( e.getComponent( ).name( ), e.getName( ), e.getUri( ) ) );
114
115
  }
115
116
}