Merge branch 'master' into dev

This commit is contained in:
Axel Uhl committed 2013-01-15 17:34:06 +01:00
commit dc159cbf3f
17 files changed
+142 -134

No files matched your search

@@ -14,6 +14,7 @@ import com.sap.sailing.domain.base.RaceColumnListener;
import com.sap.sailing.domain.common.MaxPointsReason;
import com.sap.sailing.domain.leaderboard.DelayedLeaderboardCorrections;
import com.sap.sailing.domain.leaderboard.Leaderboard;
import com.sap.sailing.domain.leaderboard.ThresholdBasedResultDiscardingRule;
import com.sap.sailing.domain.tracking.TrackedRace;
/**
@@ -390,6 +391,10 @@ public class DelayedLeaderboardCorrectionsImpl implements DelayedLeaderboardCorr
public void competitorDisplayNameChanged(Competitor competitor, String oldDisplayName, String displayName) {
}
@Override
public void resultDiscardingRuleChanged(ThresholdBasedResultDiscardingRule oldDiscardingRule, ThresholdBasedResultDiscardingRule newDiscardingRule) {
}
@Override
public boolean isTransient() {
return false;
@@ -2,6 +2,7 @@ package com.sap.sailing.domain.base;
import java.io.Serializable;
import com.sap.sailing.domain.leaderboard.ThresholdBasedResultDiscardingRule;
import com.sap.sailing.domain.tracking.TrackedRace;
public interface RaceColumnListener extends Serializable {
@@ -23,6 +24,8 @@ public interface RaceColumnListener extends Serializable {
void competitorDisplayNameChanged(Competitor competitor, String oldDisplayName, String displayName);
void resultDiscardingRuleChanged(ThresholdBasedResultDiscardingRule oldDiscardingRule, ThresholdBasedResultDiscardingRule newDiscardingRule);
/**
* A listener can use this to specify that it must not be serialized together with other listeners.
* Background: the collections holding race column listeners are usually non-transient. This will cause
@@ -22,6 +22,7 @@ import com.sap.sailing.domain.common.RegattaIdentifier;
import com.sap.sailing.domain.common.RegattaName;
import com.sap.sailing.domain.common.impl.NamedImpl;
import com.sap.sailing.domain.leaderboard.ScoringScheme;
import com.sap.sailing.domain.leaderboard.ThresholdBasedResultDiscardingRule;
import com.sap.sailing.domain.tracking.TrackedRace;
import com.sap.sailing.domain.tracking.TrackedRegatta;
import com.sap.sailing.domain.tracking.TrackedRegattaRegistry;
@@ -256,6 +257,12 @@ public class RegattaImpl extends NamedImpl implements Regatta, RaceColumnListene
raceColumnListeners.notifyListenersAboutCompetitorDisplayNameChanged(competitor, oldDisplayName, displayName);
}
@Override
public void resultDiscardingRuleChanged(ThresholdBasedResultDiscardingRule oldDiscardingRule,
ThresholdBasedResultDiscardingRule newDiscardingRule) {
raceColumnListeners.notifyListenersAboutResultDiscardingRuleChanged(oldDiscardingRule, newDiscardingRule);
}
@Override
public boolean isTransient() {
return false;
@@ -16,6 +16,7 @@ import com.sap.sailing.domain.base.Regatta;
import com.sap.sailing.domain.base.Series;
import com.sap.sailing.domain.common.impl.NamedImpl;
import com.sap.sailing.domain.common.impl.Util;
import com.sap.sailing.domain.leaderboard.ThresholdBasedResultDiscardingRule;
import com.sap.sailing.domain.tracking.TrackedRace;
import com.sap.sailing.domain.tracking.TrackedRegatta;
import com.sap.sailing.domain.tracking.TrackedRegattaRegistry;
@@ -239,6 +240,12 @@ public class SeriesImpl extends NamedImpl implements Series, RaceColumnListener
raceColumnListeners.notifyListenersAboutCompetitorDisplayNameChanged(competitor, oldDisplayName, displayName);
}
@Override
public void resultDiscardingRuleChanged(ThresholdBasedResultDiscardingRule oldDiscardingRule,
ThresholdBasedResultDiscardingRule newDiscardingRule) {
raceColumnListeners.notifyListenersAboutResultDiscardingRuleChanged(oldDiscardingRule, newDiscardingRule);
}
@Override
public boolean isTransient() {
return false;
@@ -194,7 +194,9 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
@Override
public void setResultDiscardingRule(ThresholdBasedResultDiscardingRule discardingRule) {
ThresholdBasedResultDiscardingRule oldDiscardingRule = getResultDiscardingRule();
this.resultDiscardingRule = discardingRule;
getRaceColumnListeners().notifyListenersAboutResultDiscardingRuleChanged(oldDiscardingRule, discardingRule);
}
@Override
@@ -481,6 +483,12 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race
getRaceColumnListeners().notifyListenersAboutCompetitorDisplayNameChanged(competitor, oldDisplayName, displayName);
}
@Override
public void resultDiscardingRuleChanged(ThresholdBasedResultDiscardingRule oldDiscardingRule,
ThresholdBasedResultDiscardingRule newDiscardingRule) {
getRaceColumnListeners().notifyListenersAboutResultDiscardingRuleChanged(oldDiscardingRule, newDiscardingRule);
}
@Override
public boolean isTransient() {
return false;
@@ -9,6 +9,7 @@ import com.sap.sailing.domain.base.RaceColumnListener;
import com.sap.sailing.domain.base.impl.SimpleAbstractRaceColumn;
import com.sap.sailing.domain.common.RaceIdentifier;
import com.sap.sailing.domain.leaderboard.Leaderboard;
import com.sap.sailing.domain.leaderboard.ThresholdBasedResultDiscardingRule;
import com.sap.sailing.domain.tracking.TrackedRace;
/**
@@ -136,6 +137,12 @@ public class MetaLeaderboardColumn extends SimpleAbstractRaceColumn implements R
getRaceColumnListeners().notifyListenersAboutCompetitorDisplayNameChanged(competitor, oldDisplayName, displayName);
}
@Override
public void resultDiscardingRuleChanged(ThresholdBasedResultDiscardingRule oldDiscardingRule,
ThresholdBasedResultDiscardingRule newDiscardingRule) {
getRaceColumnListeners().notifyListenersAboutResultDiscardingRuleChanged(oldDiscardingRule, newDiscardingRule);
}
@Override
public boolean isTransient() {
return false;
@@ -11,6 +11,7 @@ import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.Fleet;
import com.sap.sailing.domain.base.RaceColumn;
import com.sap.sailing.domain.base.RaceColumnListener;
import com.sap.sailing.domain.leaderboard.ThresholdBasedResultDiscardingRule;
import com.sap.sailing.domain.tracking.TrackedRace;
/**
@@ -123,4 +124,10 @@ public class RaceColumnListeners implements Serializable {
}
}
public void notifyListenersAboutResultDiscardingRuleChanged(ThresholdBasedResultDiscardingRule oldDiscardingRule,
ThresholdBasedResultDiscardingRule newDiscardingRule) {
for (RaceColumnListener listener : getRaceColumnListeners()) {
listener.resultDiscardingRuleChanged(oldDiscardingRule, newDiscardingRule);
}
}
}
@@ -1,20 +1,80 @@
package com.sap.sailing.gwt.ui.adminconsole;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import com.google.gwt.user.client.ui.ListBox;
import com.sap.sailing.gwt.ui.client.AbstractRegattaPanel;
import com.sap.sailing.gwt.ui.client.ErrorReporter;
import com.sap.sailing.gwt.ui.client.RegattaRefresher;
import com.sap.sailing.gwt.ui.client.RaceSelectionProvider;
import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.shared.RegattaDTO;
public abstract class AbstractEventManagementPanel extends AbstractRegattaPanel {
protected final TrackedRacesListComposite trackedRacesListComposite;
private final List<RegattaDTO> availableRegattas;
private final ListBox availableRegattasListBox;
public AbstractEventManagementPanel(SailingServiceAsync sailingService, RegattaRefresher regattaRefresher,
ErrorReporter errorReporter, RaceSelectionProvider raceSelectionProvider, StringMessages stringMessages) {
super(sailingService, regattaRefresher, errorReporter, stringMessages);
this.availableRegattas = new ArrayList<RegattaDTO>();
this.availableRegattasListBox = new ListBox();
this.availableRegattasListBox.ensureDebugId("AvailableRegattas");
// TrackedEventsComposite should exist in every *ManagementPanel.
trackedRacesListComposite = new TrackedRacesListComposite(sailingService, errorReporter, regattaRefresher,
raceSelectionProvider, stringMessages, /* multiselection */ true);
}
@Override
public void fillRegattas(List<RegattaDTO> regattas) {
this.trackedRacesListComposite.fillRegattas(regattas);
RegattaDTO selectedRegatta = getSelectedRegatta();
this.availableRegattas.clear();
this.availableRegattasListBox.clear();
this.availableRegattasListBox.addItem(this.stringMessages.noRegatta());
List<RegattaDTO> regattasSortedByName = new ArrayList<RegattaDTO>(regattas);
Collections.sort(regattasSortedByName, new Comparator<RegattaDTO>() {
@Override
public int compare(RegattaDTO o1, RegattaDTO o2) {
return o1.name.compareTo(o2.name);
}
});
for (RegattaDTO regatta : regattasSortedByName) {
this.availableRegattas.add(regatta);
this.availableRegattasListBox.addItem(regatta.name);
if(selectedRegatta != null && selectedRegatta.name.equals(regatta.name)) {
this.availableRegattasListBox.setSelectedIndex(this.availableRegattasListBox.getItemCount() - 1);
}
}
}
protected List<RegattaDTO> getAvailableRegattas() {
return availableRegattas;
}
protected ListBox getAvailableRegattasListBox() {
return availableRegattasListBox;
}
public RegattaDTO getSelectedRegatta() {
RegattaDTO result = null;
int selIndex = this.availableRegattasListBox.getSelectedIndex();
// the zero index represents the 'no selection' text
if (selIndex > 0) {
String itemText = this.availableRegattasListBox.getItemText(selIndex);
for (RegattaDTO regatta : this.availableRegattas) {
if (regatta.name.equals(itemText)) {
result = regatta;
break;
}
}
}
return result;
}
}
@@ -51,20 +51,13 @@ public abstract class AbstractRaceManagementPanel extends AbstractEventManagemen
abstract void refreshSelectedRaceData();
@Override
public void fillRegattas(List<RegattaDTO> result) {
trackedRacesListComposite.fillRegattas(result);
savedEvents = result;
}
@Override
public void onRaceSelectionChange(List<RegattaAndRaceIdentifier> selectedRaces) {
if (selectedRaces.size() == 1) {
singleSelectedRace = selectedRaces.get(0);
selectedCaptionRacePanel.setCaptionText(singleSelectedRace.getRaceName());
selectedCaptionRacePanel.setVisible(true);
for (RegattaDTO regatta : savedEvents) {
for (RegattaDTO regatta : getAvailableRegattas()) {
for (RaceDTO race : regatta.races) {
if (race != null && race.getRaceIdentifier().equals(singleSelectedRace)) {
this.selectedRaceDTO = race;
@@ -35,11 +35,10 @@ import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.view.client.ListDataProvider;
import com.google.gwt.view.client.MultiSelectionModel;
import com.sap.sailing.gwt.ui.client.ErrorReporter;
import com.sap.sailing.gwt.ui.client.RegattaRefresher;
import com.sap.sailing.gwt.ui.client.RaceSelectionModel;
import com.sap.sailing.gwt.ui.client.RegattaRefresher;
import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.shared.RegattaDTO;
import com.sap.sailing.gwt.ui.shared.SwissTimingConfigurationDTO;
import com.sap.sailing.gwt.ui.shared.SwissTimingRaceRecordDTO;
@@ -372,11 +371,6 @@ public class SwissTimingEventManagementPanel extends AbstractEventManagementPane
}
}
@Override
public void fillRegattas(List<RegattaDTO> result) {
trackedRacesListComposite.fillRegattas(result);
}
private void fillRaceListFromAvailableRacesApplyingFilter(String text) {
List<String> wordsToFilter = Arrays.asList(text.split(" "));
raceList.getList().clear();
@@ -62,8 +62,6 @@ public class SwissTimingReplayConnectorPanel extends AbstractEventManagementPane
private final TextBox jsonUrlBox;
private final Grid grid;
private final List<SwissTimingReplayRaceDTO> availableSwissTimingRaces;
private Iterable<RegattaDTO> allRegattas;
private final ListBox regattaListBox;
public SwissTimingReplayConnectorPanel(final SailingServiceAsync sailingService, ErrorReporter errorReporter,
RegattaRefresher regattaRefresher, StringMessages stringMessages) {
@@ -168,9 +166,8 @@ public class SwissTimingReplayConnectorPanel extends AbstractEventManagementPane
regattaPanel.setCellVerticalAlignment(lblRegattas, HasVerticalAlignment.ALIGN_MIDDLE);
regattaPanel.setSpacing(5);
regattaPanel.add(lblRegattas);
regattaListBox = new ListBox();
regattaPanel.add(regattaListBox);
regattaPanel.setCellVerticalAlignment(regattaListBox, HasVerticalAlignment.ALIGN_MIDDLE);
regattaPanel.add(getAvailableRegattasListBox());
regattaPanel.setCellVerticalAlignment(getAvailableRegattasListBox(), HasVerticalAlignment.ALIGN_MIDDLE);
HorizontalPanel filterPanel = new HorizontalPanel();
filterPanel.setSpacing(5);
@@ -342,7 +339,7 @@ public class SwissTimingReplayConnectorPanel extends AbstractEventManagementPane
if (boatClassName != null) {
if (selectedRegatta == null) {
// in case no regatta has been selected we check if there would be a matching regatta
for (RegattaDTO regatta : allRegattas) {
for (RegattaDTO regatta : getAvailableRegattas()) {
if (boatClassName.equalsIgnoreCase(regatta.boatClass.name)) {
return false;
}
@@ -409,39 +406,6 @@ public class SwissTimingReplayConnectorPanel extends AbstractEventManagementPane
}
}
@Override
public void fillRegattas(List<RegattaDTO> regattas) {
trackedRacesListComposite.fillRegattas(regattas);
RegattaDTO oldRegattaSelection = getSelectedRegatta();
regattaListBox.clear();
regattaListBox.addItem(stringMessages.noRegatta());
if (!regattas.isEmpty()) {
for (RegattaDTO regatta : regattas) {
regattaListBox.addItem(regatta.name);
if(oldRegattaSelection != null && oldRegattaSelection.name.equals(regatta.name)) {
regattaListBox.setSelectedIndex(regattaListBox.getItemCount()-1);
}
}
}
allRegattas = new ArrayList<RegattaDTO>(regattas);
}
public RegattaDTO getSelectedRegatta() {
RegattaDTO result = null;
int selIndex = regattaListBox.getSelectedIndex();
if(selIndex > 0) { // the zero index represents the 'no selection' text
String itemText = regattaListBox.getItemText(selIndex);
for(RegattaDTO regattaDTO: allRegattas) {
if(regattaDTO.name.equals(itemText)) {
result = regattaDTO;
break;
}
}
}
return result;
}
private void fillRaceListFromAvailableRacesApplyingFilter(String text) {
List<String> wordsToFilter = Arrays.asList(text.split(" "));
raceList.getList().clear();
@@ -8,26 +8,21 @@ import java.util.List;
import java.util.Map;
import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Style;
import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.event.dom.client.ChangeEvent;
import com.google.gwt.event.dom.client.ChangeHandler;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.dom.client.KeyUpEvent;
import com.google.gwt.event.dom.client.KeyUpHandler;
import com.google.gwt.user.cellview.client.CellTable;
import com.google.gwt.user.cellview.client.Column;
import com.google.gwt.user.cellview.client.ColumnSortEvent;
import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler;
import com.google.gwt.user.cellview.client.TextColumn;
import com.google.gwt.user.client.Element;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.CaptionPanel;
import com.google.gwt.user.client.ui.CheckBox;
@@ -41,24 +36,19 @@ import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
import com.google.gwt.view.client.ListDataProvider;
import com.google.gwt.view.client.MultiSelectionModel;
import com.google.gwt.view.client.SelectionModel;
import com.sap.sailing.domain.common.RegattaIdentifier;
import com.sap.sailing.domain.common.RegattaName;
import com.sap.sailing.domain.common.impl.Util;
import com.sap.sailing.domain.common.impl.Util.Pair;
import com.sap.sailing.gwt.ui.client.ErrorReporter;
import com.sap.sailing.gwt.ui.client.MarkedAsyncCallback;
import com.sap.sailing.gwt.ui.client.RaceSelectionModel;
import com.sap.sailing.gwt.ui.client.RegattaRefresher;
import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.shared.RegattaDTO;
import com.sap.sailing.gwt.ui.shared.TracTracConfigurationDTO;
import com.sap.sailing.gwt.ui.shared.TracTracRaceRecordDTO;
@@ -84,8 +74,6 @@ public class TracTracEventManagementPanel extends AbstractEventManagementPanel {
private final List<TracTracRaceRecordDTO> availableTracTracRaces;
private final List<RegattaDTO> availableRegattas;
private final ListDataProvider<TracTracRaceRecordDTO> raceList;
private ListBox connectionsHistoryListBox;
@@ -100,7 +88,6 @@ public class TracTracEventManagementPanel extends AbstractEventManagementPanel {
private TextBox liveURITextBox;
private TextBox jsonURLTextBox;
private ListBox availableRegattasListBox;
private TextBox racesFilterTextBox;
private CellTable<TracTracRaceRecordDTO> racesTable;
@@ -108,14 +95,10 @@ public class TracTracEventManagementPanel extends AbstractEventManagementPanel {
public TracTracEventManagementPanel(final SailingServiceAsync sailingService, ErrorReporter errorReporter,
RegattaRefresher regattaRefresher, StringMessages stringMessages) {
super(sailingService, regattaRefresher, errorReporter, new RaceSelectionModel(), stringMessages);
this.errorReporter = errorReporter;
this.previousConfigurations = new HashMap<String, TracTracConfigurationDTO>();
this.availableTracTracRaces = new ArrayList<TracTracRaceRecordDTO>();
this.availableRegattas = new ArrayList<RegattaDTO>();
this.raceList = new ListDataProvider<TracTracRaceRecordDTO>();
this.setWidget(createContent());
}
@@ -358,11 +341,8 @@ public class TracTracEventManagementPanel extends AbstractEventManagementPanel {
Label regattaForTrackingLabel = new Label("Regatta used for the tracked race:");
regattaForTrackingLabel.setWordWrap(false);
this.availableRegattasListBox = new ListBox();
this.availableRegattasListBox.ensureDebugId("AvailableRegattas");
layoutTable.setWidget(0, 0, regattaForTrackingLabel);
layoutTable.setWidget(0, 1, this.availableRegattasListBox);
layoutTable.setWidget(0, 1, getAvailableRegattasListBox());
// Track settings (wind)
Label trackSettingsLabel = new Label(this.stringMessages.trackSettings() + ":");
@@ -616,23 +596,21 @@ public class TracTracEventManagementPanel extends AbstractEventManagementPanel {
private boolean checkBoatClassMatch(TracTracRaceRecordDTO tracTracRecord, RegattaDTO selectedRegatta) {
Iterable<String> boatClassNames = tracTracRecord.boatClassNames;
if(boatClassNames != null && Util.size(boatClassNames) > 0) {
if (boatClassNames != null && Util.size(boatClassNames) > 0) {
String tracTracBoatClass = boatClassNames.iterator().next();
if(selectedRegatta == null) {
if (selectedRegatta == null) {
// in case no regatta has been selected we check if there would be a matching regatta
for(RegattaDTO regatta : this.availableRegattas) {
if(tracTracBoatClass.equalsIgnoreCase(regatta.boatClass.name)) {
for (RegattaDTO regatta : getAvailableRegattas()) {
if (tracTracBoatClass.equalsIgnoreCase(regatta.boatClass.name)) {
return false;
}
}
} else {
if(!tracTracBoatClass.equalsIgnoreCase(selectedRegatta.boatClass.name)) {
if (!tracTracBoatClass.equalsIgnoreCase(selectedRegatta.boatClass.name)) {
return false;
}
}
}
return true;
}
@@ -721,43 +699,6 @@ public class TracTracEventManagementPanel extends AbstractEventManagementPanel {
this.storedURITextBox.setValue(config.storedDataURI);
}
@Override
public void fillRegattas(List<RegattaDTO> regattas) {
this.trackedRacesListComposite.fillRegattas(regattas);
RegattaDTO selectedRegatta = getSelectedRegatta();
this.availableRegattas.clear();
this.availableRegattasListBox.clear();
this.availableRegattasListBox.addItem(this.stringMessages.noRegatta());
for (RegattaDTO regatta : regattas) {
this.availableRegattas.add(regatta);
this.availableRegattasListBox.addItem(regatta.name);
if(selectedRegatta != null && selectedRegatta.name.equals(regatta.name)) {
this.availableRegattasListBox.setSelectedIndex(this.availableRegattasListBox.getItemCount() - 1);
}
}
}
public RegattaDTO getSelectedRegatta() {
int selIndex = this.availableRegattasListBox.getSelectedIndex();
// the zero index represents the 'no selection' text
if(selIndex > 0) {
String itemText = this.availableRegattasListBox.getItemText(selIndex);
for(RegattaDTO regatta : this.availableRegattas) {
if(regatta.name.equals(itemText)) {
return regatta;
}
}
}
return null;
}
private void fillRaceListFromAvailableRacesApplyingFilter(String text) {
List<String> wordsToFilter = Arrays.asList(text.split(" "));
List<TracTracRaceRecordDTO> races = this.raceList.getList();
@@ -31,6 +31,7 @@ import com.sap.sailing.domain.common.impl.Util.Pair;
import com.sap.sailing.domain.leaderboard.Leaderboard;
import com.sap.sailing.domain.leaderboard.ScoreCorrection;
import com.sap.sailing.domain.leaderboard.ScoreCorrectionListener;
import com.sap.sailing.domain.leaderboard.ThresholdBasedResultDiscardingRule;
import com.sap.sailing.domain.tracking.GPSFix;
import com.sap.sailing.domain.tracking.GPSFixMoving;
import com.sap.sailing.domain.tracking.MarkPassing;
@@ -289,6 +290,12 @@ public class LeaderboardDTOCache {
removeFromCache(leaderboard);
}
@Override
public void resultDiscardingRuleChanged(ThresholdBasedResultDiscardingRule oldDiscardingRule,
ThresholdBasedResultDiscardingRule newDiscardingRule) {
removeFromCache(leaderboard);
}
@Override
public void competitorDisplayNameChanged(Competitor competitor, String oldDisplayName, String displayName) {
removeFromCache(leaderboard);
@@ -43,7 +43,7 @@ public class OSGiRestartingPortMonitor extends AbstractPortMonitor {
this.info = SystemInformationImpl.getInstance();
log.info("Started and initialized OSGi monitor. State of SIGAR sysstats library: " + (info == null ? "INACTIVE" : "ACTIVE"));
log.info("Started and initialized OSGi monitor. State of SIGAR sysstats library: " + (info == null ? "INACTIVE" : "ACTIVE") + " java.library.path: " + System.getProperty("java.library.path"));
}
@Override
@@ -1,8 +1,8 @@
package com.sap.sailing.monitoring.sysinfo;
import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.lang.management.OperatingSystemMXBean;
import java.util.HashMap;
@@ -53,22 +53,26 @@ public class SystemInformationImpl implements SystemInformation {
this.java_manager = ManagementFactory.getOperatingSystemMXBean();
}
protected String[] readProc(String path) throws Exception {
protected String[] readProc(String path) {
String line = ""; StringBuffer buf = new StringBuffer();
BufferedReader reader = null;
try {
reader = new BufferedReader(new FileReader(path));
} catch (FileNotFoundException ex) {
while ( (line = reader.readLine() ) != null) {
buf.append(line).append("\n");
}
} catch (Exception ex) {
return new String[]{}; /* return empty result */
} finally {
if (reader != null) {
reader.close();
try {
reader.close();
} catch (IOException ex) {
/* ignore */
}
}
}
String line = ""; StringBuffer buf = new StringBuffer();
while ( (line = reader.readLine() ) != null) {
buf.append(line).append("\n");
}
return buf.toString().split("\\n");
}
@@ -77,7 +81,7 @@ public class SystemInformationImpl implements SystemInformation {
try {
sockstat = readProc("/proc/" + getPid() + "/net/sockstat");
} catch (Exception e) {
e.printStackTrace();
/* ignore */
}
for (String line : sockstat) {
@@ -135,7 +139,7 @@ public class SystemInformationImpl implements SystemInformation {
}
@Override
public long getOpenFiles() throws Exception {
public long getOpenFiles() {
String[] val = readProc("/proc/sys/fs/file-nr");
if(val.length > 0)
@@ -25,6 +25,6 @@
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
<stringAttribute key="workspace_bundles" value="com.google.gwt.osgi@default:default,com.googlecode.java-diff-utils@default:default,com.mongodb.driver@default:default,com.sap.sailing.declination@default:default,com.sap.sailing.domain.common@default:default,com.sap.sailing.domain.persistence@default:default,com.sap.sailing.domain.swisstimingadapter.persistence@default:default,com.sap.sailing.domain.swisstimingadapter@default:default,com.sap.sailing.domain.swisstimingreplayadapter.test@default:false,com.sap.sailing.domain.swisstimingreplayadapter@default:default,com.sap.sailing.domain.test@default:default,com.sap.sailing.domain.tractracadapter.persistence@default:default,com.sap.sailing.domain.tractracadapter@default:default,com.sap.sailing.domain@default:default,com.sap.sailing.ess40.resultimport@default:default,com.sap.sailing.expeditionconnector@default:default,com.sap.sailing.freg.resultimport@default:default,com.sap.sailing.geocoding@default:default,com.sap.sailing.gwt.ui@default:default,com.sap.sailing.kiworesultimport@default:default,com.sap.sailing.mongodb@default:default,com.sap.sailing.monitoring@4:default,com.sap.sailing.operationaltransformation@default:default,com.sap.sailing.server.gateway@default:default,com.sap.sailing.server.replication@default:default,com.sap.sailing.server@default:default,com.sap.sailing.udpconnector@default:default,com.sap.sailing.www.events@default:default,com.sap.sailing.www@default:default,com.sap.sailing.xcelsiusadapter@default:default,com.tractrac.clientmodule@default:default,org.json.simple@default:default,org.moxieapps.gwt.highcharts@default:default"/>
<stringAttribute key="workspace_bundles" value="com.google.gwt.osgi@default:default,com.googlecode.java-diff-utils@default:default,com.mongodb.driver@default:default,com.sap.sailing.declination@default:default,com.sap.sailing.domain.common@default:default,com.sap.sailing.domain.persistence@default:default,com.sap.sailing.domain.swisstimingadapter.persistence@default:default,com.sap.sailing.domain.swisstimingadapter@default:default,com.sap.sailing.domain.swisstimingreplayadapter.test@default:false,com.sap.sailing.domain.swisstimingreplayadapter@default:default,com.sap.sailing.domain.test@default:default,com.sap.sailing.domain.tractracadapter.persistence@default:default,com.sap.sailing.domain.tractracadapter@default:default,com.sap.sailing.domain@default:default,com.sap.sailing.ess40.resultimport@default:default,com.sap.sailing.expeditionconnector@default:default,com.sap.sailing.freg.resultimport@default:default,com.sap.sailing.geocoding@default:default,com.sap.sailing.gwt.ui@default:default,com.sap.sailing.kiworesultimport@default:default,com.sap.sailing.mongodb@default:default,com.sap.sailing.monitoring@5:true,com.sap.sailing.operationaltransformation@default:default,com.sap.sailing.server.gateway@default:default,com.sap.sailing.server.replication@default:default,com.sap.sailing.server@default:default,com.sap.sailing.udpconnector@default:default,com.sap.sailing.www.events@default:default,com.sap.sailing.www@default:default,com.sap.sailing.xcelsiusadapter@default:default,com.tractrac.clientmodule@default:default,org.json.simple@default:default,org.moxieapps.gwt.highcharts@default:default"/>
<stringAttribute key="yk-options" value="&#13;&#10;additional-options2=onexit\=snapshot&#13;&#10;"/>
</launchConfiguration>
+3 -2
View File
@@ -1,3 +1,4 @@
scriptdir=`dirname "$0"`
echo scriptdir is $scriptdir
"$JAVA_HOME/bin/java" -XX:+UseMembar -Dfile.encoding=cp1252 -Djetty.home=$scriptdir/configuration/jetty -Djava.util.logging.config.file=$scriptdir/configuration/logging.properties -Xmx8192m -jar plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar -console -configuration ./ -clean -Djava.library.path=$scriptdir/native-libraries
LIB_DIR=`pwd`/native-libraries
echo scriptdir is $scriptdir and LIB_DIR is $LIB_DIR
"$JAVA_HOME/bin/java" -XX:+UseMembar -Dfile.encoding=cp1252 -Djetty.home=$scriptdir/configuration/jetty -Djava.util.logging.config.file=$scriptdir/configuration/logging.properties -Djava.library.path=$LIB_DIR -Xmx8192m -jar plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar -console -configuration ./ -clean