Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r2854 - in branches/perfsonarui: . src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/flowsa src/org/perfsonar/perfsonarui/flowsa/components src/org/perfsonar/perfsonarui/flowsa/panels

Subject: perfsonar development work

List archive

perfsonar: r2854 - in branches/perfsonarui: . src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/flowsa src/org/perfsonar/perfsonarui/flowsa/components src/org/perfsonar/perfsonarui/flowsa/panels


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r2854 - in branches/perfsonarui: . src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/flowsa src/org/perfsonar/perfsonarui/flowsa/components src/org/perfsonar/perfsonarui/flowsa/panels
  • Date: Tue, 18 Sep 2007 19:19:56 -0400
Author: michael.bischoff
Date: 2007-09-18 19:19:56 -0400 (Tue, 18 Sep 2007)
New Revision: 2854

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/Flow.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/Result.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/Statistics.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/TopDatum.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/DefaultResultModel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/ResultModel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/ResultView.java
Modified:
branches/perfsonarui/
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAModel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequest.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAUserData.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/DefaultDateTimeModel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/OptionsPanel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/QueryResultPanel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/RawPanel.java

branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/StatPanel.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/raw.xml
branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.console
branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.properties
Log:



Property changes on: branches/perfsonarui
___________________________________________________________________
Name: svn:ignore
+ build
.classpath
.project
dist


Added: branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/Flow.java

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAModel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAModel.java
2007-09-18 23:12:49 UTC (rev 2853)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAModel.java
2007-09-18 23:19:56 UTC (rev 2854)
@@ -266,5 +266,11 @@

return null;
}
+
+ @Override
+ public synchronized SmartMARequest getRequest() {
+ // TODO Auto-generated method stub
+ return super.getRequest();
+ }

}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequest.java
2007-09-18 23:12:49 UTC (rev 2853)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSARequest.java
2007-09-18 23:19:56 UTC (rev 2854)
@@ -113,22 +113,31 @@

// replace filter rule & aggregationRule rule and other
parameters
NodeList paraNodes =
request.getElementsByTagName("nmwg:parameter");
+ Element removeAggregation = null;
+ Element removeFilter = null;
for (int j = 0; j < paraNodes.getLength(); j++) {
Element paraNode = (Element) paraNodes.item(j);
String nameAttr = paraNode.getAttribute("name");
if (nameAttr.equals("aggregationRule")) {
-
paraNode.getFirstChild().setTextContent(data.getQuery(FlowSAUserData.RAWAGGREGATION));
+ String rule =
data.getQuery(FlowSAUserData.TOPAGGREGATION);
+ if(rule != null && !rule.equals("") &&
!rule.equals("N/A")) {
+
paraNode.getFirstChild().setTextContent(rule);
+ } else {
+ removeAggregation = paraNode;
+ }
} else if (nameAttr.equals("filterRule")) {
-
paraNode.getFirstChild().setTextContent(data.getQuery(FlowSAUserData.RAWFILTER));
- } else if (nameAttr.equals("startTime")) {
- Element startNode = (Element)
paraNode.getElementsByTagName("nmtm:time").item(0);
- startNode.setAttribute("value",
data.getStartTime());
+ String rule =
data.getQuery(FlowSAUserData.TOPFILTER);
+ if(rule != null && !rule.equals("") &&
!rule.equals("N/A")) {
+
paraNode.getFirstChild().setTextContent(rule);
+ } else {
+ removeFilter =paraNode;
+ }
} else if (nameAttr.equals("topStatistic")) {

paraNode.getFirstChild().setTextContent(data.getQuery(FlowSAUserData.TOPELEMENTS));
} else if (nameAttr.equals("orderBy")) {

paraNode.getFirstChild().setTextContent(data.getQuery(FlowSAUserData.TOPORDERBY));
} else if (nameAttr.equals("splitProtocol")) {
-
paraNode.getFirstChild().setTextContent(data.getQuery(FlowSAUserData.TOPTRANSGROUP));
+
paraNode.getFirstChild().setTextContent(data.getQuery(FlowSAUserData.TOPTRANSGROUP).equals("yes")
? "false" : "true");
} else if (nameAttr.equals("topN")) {

paraNode.getFirstChild().setTextContent(data.getQuery(FlowSAUserData.TOPNUMBER));
} else if (nameAttr.equals("filterRule")) {
@@ -137,33 +146,34 @@

paraNode.getFirstChild().setTextContent(data.getQuery(FlowSAUserData.TOPAGGREGATION));
}
}
+ if(removeAggregation!=null) {
+
removeAggregation.getParentNode().removeChild(removeAggregation);
+ }
+ if(removeFilter!=null) {
+
removeFilter.getParentNode().removeChild(removeFilter);
+ }
return request;

}

@Override
public String getMessageNamespace() {
- // TODO: not yet implemented
- logger.warn("not yet implemented");
- return null;
+ throw new UnsupportedOperationException("Unplemented");
}

public String[] getNamespaces() {
- // TODO: not yet implemented
- logger.warn("not yet implemented");
- return null;
+ throw new UnsupportedOperationException("Unplemented");
}

public String getRequestType() {
- // TODO: not yet implemented
- logger.warn("not yet implemented");
- return null;
+ throw new UnsupportedOperationException("Unplemented");
}

/* (non-Javadoc)
* @see
org.perfsonar.perfsonarui.plugins.IPerfsonarRequest#process(org.perfsonar.perfsonarui.plugins.IUserData,
org.w3c.dom.Document, org.perfsonar.perfsonarui.plugins.IPerfsonarResponse)
*/
public void process(IUserData data, Document response,
IPerfsonarResponse listener) throws Exception {
+ data.setResponse(response);
logger.debug(response);
}

@@ -216,8 +226,7 @@
while (network.getChildNodes().getLength() > 0) {
network.removeChild(network.getFirstChild());
}
-
- // add routers from userdata
+ // add routers from userData
int routerid = 1;
for (String router :
data.getQuery(FlowSAUserData.ROUTERS).split(" ")) {
Element routerNode =
request.createElementNS("http://ggf.org/ns/nmwg/topology/base/3.0/";, "node");

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAUserData.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAUserData.java
2007-09-18 23:12:49 UTC (rev 2853)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/FlowSAUserData.java
2007-09-18 23:19:56 UTC (rev 2854)
@@ -7,8 +7,6 @@

package org.perfsonar.perfsonarui.flowsa;

-import static java.util.Calendar.SECOND;
-
import java.util.Calendar;

import org.perfsonar.perfsonarui.AbstractUserData;
@@ -89,9 +87,9 @@
protected void setDefaults() {
setQuery(FlowSAUserData.QUERYTYPE, "Raw");
Calendar now = Calendar.getInstance();
- setQuery(FlowSAUserData.ENDMOMENT,
String.valueOf(now.getTime().getTime()));
- now.roll(SECOND, -60);
- setQuery(FlowSAUserData.STARTMOMENT,
String.valueOf(now.getTime().getTime()));
+ setQuery(FlowSAUserData.ENDMOMENT,
String.valueOf(now.getTime().getTime()/1000));
+ now.roll(Calendar.MINUTE, -1);
+ setQuery(FlowSAUserData.STARTMOMENT,
String.valueOf(now.getTime().getTime()/1000));
}

}

Added: branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/Result.java

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/Statistics.java

Added: branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/TopDatum.java

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/DefaultDateTimeModel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/DefaultDateTimeModel.java
2007-09-18 23:12:49 UTC (rev 2853)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/DefaultDateTimeModel.java
2007-09-18 23:19:56 UTC (rev 2854)
@@ -10,9 +10,17 @@

public class DefaultDateTimeModel implements DateTimeModel {

- private Calendar calendar = Calendar.getInstance();
+ private Calendar calendar;
private List<ChangeListener> listeners = new Vector<ChangeListener>();

+ public DefaultDateTimeModel() {
+ this.calendar = Calendar.getInstance();
+ }
+
+ public DefaultDateTimeModel(Calendar calendar) {
+ this.calendar = (Calendar) calendar.clone();
+ }
+
public void addChangeListener(ChangeListener listener) {
listeners.add(listener);
}

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/DefaultResultModel.java

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/OptionsPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/OptionsPanel.java
2007-09-18 23:12:49 UTC (rev 2853)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/OptionsPanel.java
2007-09-18 23:19:56 UTC (rev 2854)
@@ -9,6 +9,8 @@

import java.awt.LayoutManager;
import java.awt.event.ActionEvent;
+import java.util.Calendar;
+
import static org.jdesktop.layout.GroupLayout.*;
import static org.jdesktop.layout.LayoutStyle.*;

@@ -51,13 +53,15 @@
}

protected JPanel createPeriodPanel(final FlowSAUserData model) {
- final DateTimeModel startTimeModel = new
DefaultDateTimeModel();
+ Calendar calendar = Calendar.getInstance();
+ final DateTimeModel endTimeModel = new
DefaultDateTimeModel(calendar);
+ calendar.roll(Calendar.MINUTE, -1);
+ final DateTimeModel startTimeModel = new
DefaultDateTimeModel(calendar);
startTimeModel.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {

model.setQuery(FlowSAUserData.STARTMOMENT,String.valueOf(startTimeModel.getValue().getTime()/1000));
}
});
- final DateTimeModel endTimeModel = new DefaultDateTimeModel();
endTimeModel.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {

model.setQuery(FlowSAUserData.ENDMOMENT,String.valueOf(endTimeModel.getValue().getTime()/1000));

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/ResultModel.java

Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/components/ResultView.java

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/QueryResultPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/QueryResultPanel.java
2007-09-18 23:12:49 UTC (rev 2853)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/QueryResultPanel.java
2007-09-18 23:19:56 UTC (rev 2854)
@@ -5,16 +5,21 @@
import java.util.Observable;
import java.util.Observer;

+import org.perfsonar.perfsonarui.AbstractUserData;
import org.perfsonar.perfsonarui.flowsa.FlowSAUserData;
+import org.perfsonar.perfsonarui.flowsa.FlowSAUserData.QueryType;
import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
import org.perfsonar.perfsonarui.ui.PluginMainPanel;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;

public class QueryResultPanel extends PluginMainPanel implements Observer {

private static final long serialVersionUID = 1L;
protected final CardLayout myLayout = new CardLayout();
protected final FlowSAUserData userData;
-
+
public QueryResultPanel(Component parentFrame, IPerfsonarTab model,
FlowSAUserData userData) {
super(parentFrame, model, null);
this.userData = userData;
@@ -31,8 +36,62 @@
}

public void update(Observable o, Object arg) {
- String queryType =
userData.getQuery(FlowSAUserData.QUERYTYPE);
- myLayout.show(this, queryType);
+ if(FlowSAUserData.QUERYTYPE.equals(arg)) {
+ String queryType =
userData.getQuery(FlowSAUserData.QUERYTYPE);
+ myLayout.show(this, queryType);
+ }
+ if(AbstractUserData.DOCUMENT_RESPONSE.equals(arg)) {
+ handleResponseUpdate();
+ }
}

+ private void handleResponseUpdate() {
+ Document response = userData.getResponse();
+ QueryType type =
QueryType.get(userData.getQuery(FlowSAUserData.QUERYTYPE));
+ NodeList data = response.getElementsByTagName("nmwg:data");
+ if(data.item(0)==null) {
+ logger.error("no data element");
+ return;
+ }
+ if(type==null) {
+ logger.error("unkown type");
+ return;
+ }
+
+ NodeList datums = data.item(0).getChildNodes();
+ int i = 0;
+ switch (type) {
+ case RAW:
+ handleRawResponse(datums);
+ break;
+ case STATISTICAL:
+ handleStatisticalResponse(datums);
+ break;
+ case TOP:
+ handleTopResponse(datums);
+ break;
+ default:
+ logger.error("unkown type!");
+ break;
+ }
+ }
+
+ private void handleTopResponse(NodeList datums) {
+ // TODO Auto-generated method stub
+
+ }
+
+ private void handleStatisticalResponse(NodeList datums) {
+ Node datum = datums.item(0);
+ if(datum==null) {
+ logger.error("No Datum item");
+ return;
+ }
+
+ }
+
+ private void handleRawResponse(NodeList datums) {
+ // TODO Auto-generated method stub
+
+ }
}

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/RawPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/RawPanel.java
2007-09-18 23:12:49 UTC (rev 2853)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/RawPanel.java
2007-09-18 23:19:56 UTC (rev 2854)
@@ -68,6 +68,4 @@

layout.createSequentialGroup().addContainerGap().add(RawPane,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,

org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
Short.MAX_VALUE).addContainerGap()));
}
-
-
}
\ No newline at end of file

Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/StatPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/StatPanel.java
2007-09-18 23:12:49 UTC (rev 2853)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/panels/StatPanel.java
2007-09-18 23:19:56 UTC (rev 2854)
@@ -8,20 +8,18 @@
package org.perfsonar.perfsonarui.flowsa.panels;

import java.awt.Component;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.util.Observable;
-import java.util.Observer;

import javax.swing.SwingConstants;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;

+import org.jdesktop.layout.GroupLayout;
import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
import org.perfsonar.perfsonarui.ui.PluginMainPanel;

-public class StatPanel extends PluginMainPanel implements Observer,
DocumentListener, FocusListener {
+import static org.jdesktop.layout.GroupLayout.*;
+import static org.jdesktop.layout.LayoutStyle.*;

+public class StatPanel extends PluginMainPanel {
+
private static final long serialVersionUID = 1L;
private javax.swing.JPanel statQueryPanel;
private javax.swing.JTextField statsBytesField;
@@ -73,26 +71,26 @@
@Override
public void addWidgets() {
statQueryPanel = new javax.swing.JPanel();
- statsFlowsLabel = new javax.swing.JLabel();
- statsFlowsTcpLabel = new javax.swing.JLabel();
- statsFlowsUdpLabel = new javax.swing.JLabel();
- statsFlowsIcmpLabel = new javax.swing.JLabel();
- statsFlowsOthersLabel = new javax.swing.JLabel();
- statsFlowsPacketsLabel = new javax.swing.JLabel();
- statsPacketsTcpLabel = new javax.swing.JLabel();
- statsPacketsUdpLabel = new javax.swing.JLabel();
- statsPacketsIcmpLabel = new javax.swing.JLabel();
- statsPacketsOtherLabel = new javax.swing.JLabel();
- statsBytesLabel = new javax.swing.JLabel();
- statsBytesTcpLabel = new javax.swing.JLabel();
- statsBytesUdpLabel = new javax.swing.JLabel();
- statsBytesIcmpLabel = new javax.swing.JLabel();
- statsBytesOtherLabel = new javax.swing.JLabel();
- statsFirstLabel = new javax.swing.JLabel();
- statsLastLabel = new javax.swing.JLabel();
- statsMsecFirstLabel = new javax.swing.JLabel();
- statsMsecLastLabel = new javax.swing.JLabel();
- statsSeqFailLabel = new javax.swing.JLabel();
+ statsFlowsLabel = new javax.swing.JLabel("Flows");
+ statsFlowsTcpLabel = new javax.swing.JLabel("Flows TCP");
+ statsFlowsUdpLabel = new javax.swing.JLabel("Flows UDP");
+ statsFlowsIcmpLabel = new javax.swing.JLabel("Flows ICMP");
+ statsFlowsOthersLabel = new javax.swing.JLabel("Flows other");
+ statsFlowsPacketsLabel = new javax.swing.JLabel("Packets");
+ statsPacketsTcpLabel = new javax.swing.JLabel("Packets TCP");
+ statsPacketsUdpLabel = new javax.swing.JLabel("Packets UDP");
+ statsPacketsIcmpLabel = new javax.swing.JLabel("Packets
ICMP");
+ statsPacketsOtherLabel = new javax.swing.JLabel("Packets
other");
+ statsBytesLabel = new javax.swing.JLabel("Bytes");
+ statsBytesTcpLabel = new javax.swing.JLabel("Bytes TCP");
+ statsBytesUdpLabel = new javax.swing.JLabel("Bytes UDP");
+ statsBytesIcmpLabel = new javax.swing.JLabel("Bytes ICMP");
+ statsBytesOtherLabel = new javax.swing.JLabel("Bytes other");
+ statsFirstLabel = new javax.swing.JLabel("First");
+ statsLastLabel = new javax.swing.JLabel("Last");
+ statsMsecFirstLabel = new javax.swing.JLabel("msec first");
+ statsMsecLastLabel = new javax.swing.JLabel("msec last");
+ statsSeqFailLabel = new javax.swing.JLabel("Sequence
failures");
statsFlowsField = new javax.swing.JTextField();
statsFlowsTcpField = new javax.swing.JTextField();
statsFlowsudpField = new javax.swing.JTextField();
@@ -114,46 +112,6 @@
statsMsecLastField = new javax.swing.JTextField();
statsSeqFailField = new javax.swing.JTextField();

- statsFlowsLabel.setText("Flows");
-
- statsFlowsTcpLabel.setText("Flows TCP");
-
- statsFlowsUdpLabel.setText("Flows UDP");
-
- statsFlowsIcmpLabel.setText("Flows ICMP");
-
- statsFlowsOthersLabel.setText("Flows other");
-
- statsFlowsPacketsLabel.setText("Packets");
-
- statsPacketsTcpLabel.setText("Packets TCP");
-
- statsPacketsUdpLabel.setText("Packets UDP");
-
- statsPacketsIcmpLabel.setText("Packets ICMP");
-
- statsPacketsOtherLabel.setText("Packets other");
-
- statsBytesLabel.setText("Bytes");
-
- statsBytesTcpLabel.setText("Bytes TCP");
-
- statsBytesUdpLabel.setText("Bytes UDP");
-
- statsBytesIcmpLabel.setText("Bytes ICMP");
-
- statsBytesOtherLabel.setText("Bytes other");
-
- statsFirstLabel.setText("First");
-
- statsLastLabel.setText("Last");
-
- statsMsecFirstLabel.setText("msec first");
-
- statsMsecLastLabel.setText("msec last");
-
- statsSeqFailLabel.setText("Sequence failures");
-
statsFlowsField.setEditable(false);
statsFlowsField.setHorizontalAlignment(SwingConstants.RIGHT);
statsFlowsField.setText("32743934");
@@ -234,197 +192,184 @@

statsSeqFailField.setHorizontalAlignment(SwingConstants.RIGHT);
statsSeqFailField.setText("139");

- org.jdesktop.layout.GroupLayout statQueryPanelLayout = new
org.jdesktop.layout.GroupLayout(statQueryPanel);
+ GroupLayout statQueryPanelLayout = new
GroupLayout(statQueryPanel);
statQueryPanel.setLayout(statQueryPanelLayout);
-
statQueryPanelLayout.setHorizontalGroup(statQueryPanelLayout.createParallelGroup(
- org.jdesktop.layout.GroupLayout.LEADING).add(
-
statQueryPanelLayout.createSequentialGroup().addContainerGap().add(
-
statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING).add(statsFlowsLabel)
-
.add(statsFlowsTcpLabel).add(statsFlowsUdpLabel).add(statsFlowsIcmpLabel).add(statsFlowsOthersLabel)
-
.add(statsFlowsPacketsLabel).add(statsPacketsTcpLabel).add(statsPacketsUdpLabel).add(
-
statsPacketsIcmpLabel).add(statsPacketsOtherLabel)).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED).add(
-
statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING,
false).add(
-
statsPacketsIcmpField).add(statsPacketsUdpField).add(statsPacketsTcpField).add(statsPacketsotherField)
-
.add(statsPacketsField).add(statsFlowsOtherField).add(statsFlowsIcmpField).add(statsFlowsudpField).add(
-
statsFlowsTcpField).add(statsFlowsField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 108,
-
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED).add(
-
statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING).add(
-
statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING).add(
-
org.jdesktop.layout.GroupLayout.TRAILING,
-

statQueryPanelLayout.createSequentialGroup().add(statsBytesIcmpLabel).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED)).add(
-
org.jdesktop.layout.GroupLayout.TRAILING,
-

statQueryPanelLayout.createSequentialGroup().add(statsBytesOtherLabel).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED)).add(
-
org.jdesktop.layout.GroupLayout.TRAILING,
-

statQueryPanelLayout.createSequentialGroup().add(statsFirstLabel).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED)).add(
-
org.jdesktop.layout.GroupLayout.TRAILING,
-

statQueryPanelLayout.createSequentialGroup().add(statsLastLabel).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED)).add(
-
statQueryPanelLayout.createSequentialGroup().add(47, 47, 47).add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING).add(
-

statsMsecFirstLabel).add(statsMsecLastLabel)).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED)).add(
-
org.jdesktop.layout.GroupLayout.TRAILING,
-
statQueryPanelLayout.createSequentialGroup().add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING).add(
-

statsBytesTcpLabel).add(statsBytesUdpLabel).add(statsBytesLabel)).addPreferredGap(
-

org.jdesktop.layout.LayoutStyle.RELATED))).add(statsSeqFailLabel)).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED).add(
-
statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING,
false).add(
-
org.jdesktop.layout.GroupLayout.TRAILING,
statsBytesField).add(statsSeqFailField).add(
-
statsMsecLastField).add(statsMsecFirstField).add(statsBytesUdpField).add(statsBytesIcmpField).add(
-
statsBytesOtherField).add(statsFirstField).add(statsLastField).add(statsBytesTcpField,
-
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 130,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addContainerGap(38,
Short.MAX_VALUE)));
-
statQueryPanelLayout.setVerticalGroup(statQueryPanelLayout.createParallelGroup(
- org.jdesktop.layout.GroupLayout.LEADING).add(
-
statQueryPanelLayout.createSequentialGroup().addContainerGap().add(
-
statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING).add(
-
statQueryPanelLayout.createSequentialGroup().add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-
statsFlowsLabel).add(statsFlowsField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-
.add(10, 10, 10).add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-
statsFlowsTcpField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-

org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).add(statsFlowsTcpLabel)).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED).add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-
statsFlowsudpField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-

org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).add(statsFlowsUdpLabel)).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED).add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-
statsFlowsIcmpField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-

org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).add(statsFlowsIcmpLabel)).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED).add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-
statsFlowsOtherField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-

org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).add(statsFlowsOthersLabel)).add(6,
6, 6)
-
.add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-
statsPacketsField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-

org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).add(statsFlowsPacketsLabel))
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED).add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-
statsPacketsotherField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-

org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).add(statsPacketsTcpLabel)).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED).add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-
statsPacketsTcpField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-

org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).add(statsPacketsUdpLabel)).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED).add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-
statsPacketsUdpField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-

org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).add(statsPacketsIcmpLabel))
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED).add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-
statsPacketsIcmpField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-

org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).add(statsPacketsOtherLabel))).add(
-
statQueryPanelLayout.createSequentialGroup().add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-
statsBytesField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-
.add(statsBytesLabel)).add(10, 10, 10).add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-
statsBytesTcpLabel).add(statsBytesTcpField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED).add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-
statsBytesUdpLabel).add(statsBytesUdpField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-

org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED).add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-

statsBytesIcmpLabel).add(statsBytesIcmpField,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-

org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED).add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-

statsBytesOtherLabel).add(statsBytesOtherField,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-

org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED).add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-
statsFirstLabel).add(statsFirstField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-

org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED).add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-
statsLastLabel).add(statsLastField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-

org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED).add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-
statsMsecFirstField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-

org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).add(statsMsecFirstLabel)).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED).add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-
statsMsecLastField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-

org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).add(statsMsecLastLabel)).addPreferredGap(
-
org.jdesktop.layout.LayoutStyle.RELATED).add(
-

statQueryPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE).add(
-
statsSeqFailField,
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
-

org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-

org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).add(statsSeqFailLabel)))).addContainerGap(
- 39, Short.MAX_VALUE)));
+
statQueryPanelLayout.setHorizontalGroup(statQueryPanelLayout.createParallelGroup(LEADING)
+
.add(statQueryPanelLayout.createSequentialGroup()
+ .addContainerGap()
+
.add(statQueryPanelLayout.createParallelGroup(TRAILING)
+
.add(statsFlowsLabel)
+
.add(statsFlowsTcpLabel)
+
.add(statsFlowsUdpLabel)
+
.add(statsFlowsIcmpLabel)
+
.add(statsFlowsOthersLabel)
+
.add(statsFlowsPacketsLabel)
+
.add(statsPacketsTcpLabel)
+
.add(statsPacketsUdpLabel)
+
.add(statsPacketsIcmpLabel)
+
.add(statsPacketsOtherLabel)
+ )
+ .addPreferredGap(RELATED)
+
.add(statQueryPanelLayout.createParallelGroup(LEADING, false)
+
.add(statsPacketsIcmpField)
+
.add(statsPacketsUdpField)
+
.add(statsPacketsTcpField)
+
.add(statsPacketsotherField)
+
.add(statsPacketsField)
+
.add(statsFlowsOtherField)
+
.add(statsFlowsIcmpField)
+
.add(statsFlowsudpField)
+
.add(statsFlowsTcpField)
+
.add(statsFlowsField, PREFERRED_SIZE, 108, PREFERRED_SIZE)
+ )
+ .addPreferredGap(RELATED)
+
.add(statQueryPanelLayout.createParallelGroup(LEADING)
+
.add(statQueryPanelLayout.createParallelGroup(LEADING)
+
.add(TRAILING,statQueryPanelLayout.createSequentialGroup()
+
.add(statsBytesIcmpLabel)
+
.addPreferredGap(RELATED)
+
).add(TRAILING,statQueryPanelLayout.createSequentialGroup()
+
.add(statsBytesOtherLabel)
+
.addPreferredGap(RELATED)
+
).add(TRAILING,statQueryPanelLayout.createSequentialGroup()
+
.add(statsFirstLabel)
+
.addPreferredGap(RELATED)
+
).add(TRAILING,statQueryPanelLayout.createSequentialGroup()
+
.add(statsLastLabel)
+
.addPreferredGap(RELATED)
+
).add(statQueryPanelLayout.createSequentialGroup()
+
.add(47, 47, 47)
+
.add(statQueryPanelLayout.createParallelGroup(TRAILING)
+
.add(statsMsecFirstLabel)
+
.add(statsMsecLastLabel)
+
)
+
.addPreferredGap(RELATED)
+
).add(TRAILING,statQueryPanelLayout.createSequentialGroup()
+
.add(statQueryPanelLayout.createParallelGroup(TRAILING)
+
.add(statsBytesTcpLabel)
+
.add(statsBytesUdpLabel)
+
.add(statsBytesLabel)
+
)
+
.addPreferredGap(RELATED)
+
)
+ )
+
.add(statsSeqFailLabel)
+ )
+ .addPreferredGap(RELATED)
+
.add(statQueryPanelLayout.createParallelGroup(LEADING, false)
+
.add(TRAILING, statsBytesField)
+
.add(statsSeqFailField)
+
.add(statsMsecLastField)
+
.add(statsMsecFirstField)
+
.add(statsBytesUdpField)
+
.add(statsBytesIcmpField)
+
.add(statsBytesOtherField)
+
.add(statsFirstField)
+
.add(statsLastField)
+
.add(statsBytesTcpField)
+ )
+ .addContainerGap(38,
Short.MAX_VALUE)
+ )
+ );
+
statQueryPanelLayout.setVerticalGroup(statQueryPanelLayout.createSequentialGroup()
+ .addContainerGap()
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsFlowsLabel)
+ .add(statsFlowsField)
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsFlowsTcpField)
+ .add(statsFlowsTcpLabel)
+ )
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsFlowsudpField)
+ .add(statsFlowsUdpLabel)
+ )
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsFlowsIcmpField)
+ .add(statsFlowsIcmpLabel)
+ )
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsFlowsOtherField)
+ .add(statsFlowsOthersLabel)
+ )
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsPacketsField)
+ .add(statsFlowsPacketsLabel)
+ )
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsPacketsotherField)
+ .add(statsPacketsTcpLabel)
+ )
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsPacketsTcpField)
+ .add(statsPacketsUdpLabel)
+ )
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsPacketsUdpField)
+ .add(statsPacketsIcmpLabel)
+ )
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsPacketsIcmpField)
+ .add(statsPacketsOtherLabel)
+ )
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsBytesField)
+ .add(statsBytesLabel))
+ )
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsBytesTcpLabel)
+ .add(statsBytesTcpField)
+ )
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsBytesUdpLabel)
+ .add(statsBytesUdpField)
+ )
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsBytesIcmpLabel)
+ .add(statsBytesIcmpField)
+ )
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsBytesOtherLabel)
+ .add(statsBytesOtherField)
+ )
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsFirstLabel)
+ .add(statsFirstField)
+ )
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsLastLabel)
+ .add(statsLastField)
+ )
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsMsecFirstLabel)
+ .add(statsMsecFirstField)
+ )
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsMsecLastLabel)
+ .add(statsMsecLastField)
+ )
+
.add(statQueryPanelLayout.createParallelGroup(BASELINE)
+ .add(statsSeqFailLabel)
+ .add(statsSeqFailField)
+ )
+ .addContainerGap()
+ );

org.jdesktop.layout.GroupLayout layout = new
org.jdesktop.layout.GroupLayout(this);
this.setLayout(layout);
-
layout.setHorizontalGroup(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING).add(
-
layout.createSequentialGroup().addContainerGap().add(statQueryPanel,
-
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE).addContainerGap(
-
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)));
-
layout.setVerticalGroup(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING).add(
-
layout.createSequentialGroup().addContainerGap()
- .add(statQueryPanel,
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
-
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE,
Short.MAX_VALUE).addContainerGap()));
+ layout.setHorizontalGroup(layout.createParallelGroup(LEADING)
+ .add(layout.createSequentialGroup()
+ .addContainerGap()
+ .add(statQueryPanel)
+
.addContainerGap(DEFAULT_SIZE, Short.MAX_VALUE)
+ )
+ );
+ layout.setVerticalGroup(layout.createParallelGroup(LEADING)
+ .add(layout.createSequentialGroup()
+ .addContainerGap()
+ .add(statQueryPanel,
DEFAULT_SIZE, DEFAULT_SIZE, Short.MAX_VALUE)
+ .addContainerGap()
+ )
+ );
}
-
- public void update(Observable o, Object arg) {
- // TODO Auto-generated method stub
-
- }
-
- public void changedUpdate(DocumentEvent e) {
- // TODO Auto-generated method stub
-
- }
-
- public void insertUpdate(DocumentEvent e) {
- // TODO Auto-generated method stub
-
- }
-
- public void removeUpdate(DocumentEvent e) {
- // TODO Auto-generated method stub
-
- }
-
- public void focusGained(FocusEvent e) {
- // TODO Auto-generated method stub
-
- }
-
- public void focusLost(FocusEvent e) {
- // TODO Auto-generated method stub
-
- }
}

Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/raw.xml
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/raw.xml
2007-09-18 23:12:49 UTC (rev 2853)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/flowsa/raw.xml
2007-09-18 23:19:56 UTC (rev 2854)
@@ -33,29 +33,6 @@
<flow:parameters id="flowparamid1">
<nmwg:parameter name="aggregationRule">srcip,dstport</nmwg:parameter>
<nmwg:parameter name="filterRule">port = 80</nmwg:parameter>
- <!--
- possible fields than can be enabled:
-
- <nmwg:parameter name="showFieldAddressFamily"/>
- <nmwg:parameter name="showFieldTimeFirstSeen"/>
- <nmwg:parameter name="showFieldMsecFirstSeen"/>
- <nmwg:parameter name="showFieldTimeLastSeen"/>
- <nmwg:parameter name="showFieldMsecLastSeen"/>
- <nmwg:parameter name="showFieldProtocol"/>
- <nmwg:parameter name="showFieldSrcAddress"/>
- <nmwg:parameter name="showFieldSrcPort"/>
- <nmwg:parameter name="showFieldDstAddress"/>
- <nmwg:parameter name="showFieldDstPort"/>
- <nmwg:parameter name="showFieldSrcAS"/>
- <nmwg:parameter name="showFieldDstAS"/>
- <nmwg:parameter name="showFieldInputIF"/>
- <nmwg:parameter name="showFieldOutputIF"/>
- <nmwg:parameter name="showFieldTcpFlags"/>
- <nmwg:parameter name="showFieldTos"/>
- <nmwg:parameter name="showFieldPackets"/>
- <nmwg:parameter name="showFieldBytes"/>
-
- -->
</flow:parameters>
</nmwg:metadata>


Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.console
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.console
2007-09-18 23:12:49 UTC (rev 2853)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.console
2007-09-18 23:19:56 UTC (rev 2854)
@@ -1,6 +1,6 @@
-log4j.rootCategory=ERROR, console
+log4j.rootCategory=DEBUG, console

-log4j.category.org.perfsonar.client=ERROR
+log4j.category.org.perfsonar=DEBUG

log4j.appender.console=org.apache.log4j.ConsoleAppender
log4j.appender.console.layout=org.apache.log4j.PatternLayout

Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.properties
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.properties
2007-09-18 23:12:49 UTC (rev 2853)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.properties
2007-09-18 23:19:56 UTC (rev 2854)
@@ -1,13 +1,13 @@
-log4j.rootCategory=WARN, file
+log4j.rootCategory=DEBUG, file

log4j.category.org.perfsonar.perfsonarui=DEBUG

-//log4j.logger.org.apache.axis=ERROR
-//log4j.logger.org.apache.axis.encoding=ERROR
-//log4j.logger.org.apache.axis.utils=ERROR
-//log4j.logger.org.apache.axis.message=ERROR
+log4j.logger.org.apache.axis=ERROR
+log4j.logger.org.apache.axis.encoding=ERROR
+log4j.logger.org.apache.axis.utils=ERROR
+log4j.logger.org.apache.axis.message=ERROR

-//log4j.appender.file=org.apache.log4j.ConsoleAppender
+log4j.appender.file=org.apache.log4j.ConsoleAppender
log4j.appender.file=org.apache.log4j.FileAppender
log4j.appender.file.File=perfsonar.log
log4j.appender.file.layout=org.apache.log4j.PatternLayout


  • perfsonar: r2854 - in branches/perfsonarui: . src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/flowsa src/org/perfsonar/perfsonarui/flowsa/components src/org/perfsonar/perfsonarui/flowsa/panels, svnlog, 09/18/2007

Archive powered by MHonArc 2.6.16.

Top of Page