perfsonar-dev - perfsonar: r3015 - in branches/perfsonarui: ant src src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/aa src/org/perfsonar/perfsonarui/ma/ui/panels src/org/perfsonar/perfsonarui/playground src/org/perfsonar/perfsonarui/test/aa src/org/perfsonar/perfsonarui/ui
Subject: perfsonar development work
List archive
perfsonar: r3015 - in branches/perfsonarui: ant src src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/aa src/org/perfsonar/perfsonarui/ma/ui/panels src/org/perfsonar/perfsonarui/playground src/org/perfsonar/perfsonarui/test/aa src/org/perfsonar/perfsonarui/ui
Chronological Thread
- From:
- To:
- Subject: perfsonar: r3015 - in branches/perfsonarui: ant src src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/aa src/org/perfsonar/perfsonarui/ma/ui/panels src/org/perfsonar/perfsonarui/playground src/org/perfsonar/perfsonarui/test/aa src/org/perfsonar/perfsonarui/ui
- Date: Tue, 6 Nov 2007 07:26:45 -0500
Author: nina
Date: 2007-11-06 07:26:44 -0500 (Tue, 06 Nov 2007)
New Revision: 3015
Added:
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/IAACapable.java
Modified:
branches/perfsonarui/ant/build.xml
branches/perfsonarui/ant/javadoc.xml
branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AAPerfsonarRequest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.properties
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/RequestOptionsPanel.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundRequest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/AAMARequestTest.java
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
branches/perfsonarui/src/perfsonarui.classes
Log:
UI option to switch on/off AA and modification to
playground/PlaygroundRequest.java to use AA.
Version updated to 0.11
Modified: branches/perfsonarui/ant/build.xml
===================================================================
--- branches/perfsonarui/ant/build.xml 2007-10-31 09:33:54 UTC (rev 3014)
+++ branches/perfsonarui/ant/build.xml 2007-11-06 12:26:44 UTC (rev 3015)
@@ -22,7 +22,7 @@
-->
<project basedir="../" default="all" name="perfsonar">
- <property name="version" value="0.10" />
+ <property name="version" value="0.11" />
<!-- compile options -->
<property name="build.sysclasspath" value="ignore" />
<property name="build.compiler" value="modern" />
Modified: branches/perfsonarui/ant/javadoc.xml
===================================================================
--- branches/perfsonarui/ant/javadoc.xml 2007-10-31 09:33:54 UTC (rev
3014)
+++ branches/perfsonarui/ant/javadoc.xml 2007-11-06 12:26:44 UTC (rev
3015)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project default="javadoc">
<target name="javadoc">
-<javadoc access="public" author="true"
classpath="../jars/xml/activation.jar;../jars/axis/wsdl4j-1.5.1.jar;../jars/axis/commons-discovery-0.2.jar;../jars/ui/junit.jar;../jars/xml/commons-cli-1.0.jar;../jars/ui/jfreechart-1.0.3.jar;../jars/axis/log4j-1.2.8.jar;C:\eclipse\plugins\org.junit_3.8.1\junit.jar;../jars/axis/axis-ant.jar;../jars/axis/jaxrpc.jar;../jars/ui/jcommon-1.0.8.jar;../jars/axis/axis.jar;../jars/l2fprod/l2fprod-common-all.jar;j../ars/xml/mail.jar;../jars/xml/jdom.jar;../jars/axis/commons-logging-1.0.4.jar;../jars/axis/saaj.jar"
destdir="../dist/PerfsonarUI-v0.09/doc" doctitle="Perfsonar UI"
nodeprecated="false" nodeprecatedlist="false" noindex="false"
nonavbar="false" notree="false" overview="../src/overview.html"
packagenames="org.perfsonar.perfsonarui.playground,org.perfsonar.perfsonarui.ui,org.perfsonar.perfsonarui,org.perfsonar.perfsonarui.ma.ui.panels,org.perfsonar.perfsonarui.ippm.ui.panels,org.perfsonar.perfsonarui.demo,org.perfsonar.perfsonarui.ma,org.
perfsonar.perfsonarui.test.misc,org.perfsonar.perfsonarui.test,org.perfsonar.perfsonarui.ui.panels,org.perfsonar.perfsonarui.ippm.ui.actions,org.perfsonar.perfsonarui.ippm,org.perfsonar.perfsonarui.ma.ui.actions,org.perfsonar.perfsonarui.plugins,org.perfsonar.perfsonarui.ui.actions"
source="1.5" sourcepath="../src" splitindex="true" use="true" version="true">
+<javadoc access="public" author="true"
classpath="../jars/xml/activation.jar;../jars/axis/wsdl4j-1.5.1.jar;../jars/axis/commons-discovery-0.2.jar;../jars/ui/junit.jar;../jars/xml/commons-cli-1.0.jar;../jars/ui/jfreechart-1.0.3.jar;../jars/axis/log4j-1.2.8.jar;C:\eclipse\plugins\org.junit_3.8.1\junit.jar;../jars/axis/axis-ant.jar;../jars/axis/jaxrpc.jar;../jars/ui/jcommon-1.0.8.jar;../jars/axis/axis.jar;../jars/l2fprod/l2fprod-common-all.jar;j../ars/xml/mail.jar;../jars/xml/jdom.jar;../jars/axis/commons-logging-1.0.4.jar;../jars/axis/saaj.jar"
destdir="../dist/PerfsonarUI-v0.10/doc" doctitle="Perfsonar UI"
nodeprecated="false" nodeprecatedlist="false" noindex="false"
nonavbar="false" notree="false" overview="../src/overview.html"
packagenames="org.perfsonar.perfsonarui.playground,org.perfsonar.perfsonarui.ui,org.perfsonar.perfsonarui,org.perfsonar.perfsonarui.ma.ui.panels,org.perfsonar.perfsonarui.ippm.ui.panels,org.perfsonar.perfsonarui.demo,org.perfsonar.perfsonarui.ma,org.
perfsonar.perfsonarui.test.misc,org.perfsonar.perfsonarui.test,org.perfsonar.perfsonarui.ui.panels,org.perfsonar.perfsonarui.ippm.ui.actions,org.perfsonar.perfsonarui.ippm,org.perfsonar.perfsonarui.ma.ui.actions,org.perfsonar.perfsonarui.plugins,org.perfsonar.perfsonarui.ui.actions"
source="1.5" sourcepath="../src" splitindex="true" use="true" version="true">
<link href="http://www.jfree.org/jfreechart/api/javadoc"/>
-<link href="../dist/PerfsonarUI-v0.09/doc/"/>
+<link href="../dist/PerfsonarUI-v0.10/doc/"/>
<link href="http://ws.apache.org/axis/java/apiDocs"/>
</javadoc>
</target>
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
2007-10-31 09:33:54 UTC (rev 3014)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/SmartMARequest.java
2007-11-06 12:26:44 UTC (rev 3015)
@@ -24,8 +24,8 @@
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.List;
-import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy;
+import org.perfsonar.perfsonarui.aa.IAACapable;
import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
import org.perfsonar.perfsonarui.plugins.IPerfsonarResponse;
import org.perfsonar.perfsonarui.plugins.IUserData;
@@ -57,7 +57,8 @@
* @author Nina Jeliazkova
*
*/
-public abstract class SmartMARequest extends AbstractMARequest {
+public abstract class SmartMARequest extends AbstractMARequest implements
IAACapable {
+ protected boolean aa_enabled = false;
protected boolean parallel = true;
protected int requestsRunning = 0;
protected AbstractPerfsonarResponse propertyChangeListener;
@@ -209,6 +210,8 @@
if (newRequest == null) {
throw new Exception("Can't create request for
"+endpoint);
}
+ if (newRequest instanceof IAACapable)
+ ((IAACapable)newRequest).setAAEnabled(isAAEnabled());
newRequest.setTimeout(timeout);
pool.addConnection(newRequest);
request = pool.getRequest();
@@ -447,4 +450,10 @@
System.out.println("Requests will be sent sequentially");
}
+ public synchronized boolean isAAEnabled() {
+ return aa_enabled;
+ }
+ public synchronized void setAAEnabled(boolean enable) {
+ aa_enabled = enable;
+ }
}
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AAPerfsonarRequest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AAPerfsonarRequest.java
2007-10-31 09:33:54 UTC (rev 3014)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AAPerfsonarRequest.java
2007-11-06 12:26:44 UTC (rev 3015)
@@ -40,13 +40,17 @@
* @author Nina Jeliazkova
*
*/
-public abstract class AAPerfsonarRequest extends AbstractMARequest {
+public abstract class AAPerfsonarRequest extends AbstractMARequest
implements IAACapable {
+ protected boolean aa_enabled = false;
protected ICredentialsListener credentialsListener = null;
- protected boolean skipAA = false;
+ public AAPerfsonarRequest() {
+ super();
+ setAAEnabled(true);
+ }
@Override
public SOAPEnvelope prepareEnvelope(SOAPBodyElement soapbodyelement)
throws PSException {
try {
- if (skipAA) return null;
+ if (!isAAEnabled()) return null;
if (credentialsListener == null) {
credentialsListener = new
SwingCredentialListener();
@@ -91,8 +95,6 @@
System.setProperty("javax.net.ssl.trustStoreType", "jceks");
- //Steps for getting a certificate from a SASL CA server are:
-
//The class org.perfsonar.client.base.authn.saslca.UserID
contains the name and the password of the user for the authentication
process.
UserID userID = new UserID(username, userpass);
@@ -129,10 +131,10 @@
public void setCredentialsListener(ICredentialsListener
credentialsListener) {
this.credentialsListener = credentialsListener;
}
- public boolean isSkipAA() {
- return skipAA;
+ public synchronized boolean isAAEnabled() {
+ return aa_enabled;
}
- public void setSkipAA(boolean skipAA) {
- this.skipAA = skipAA;
- }
+ public synchronized void setAAEnabled(boolean enable) {
+ this.aa_enabled = enable;
+ }
}
Added: branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/IAACapable.java
Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.properties
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.properties
2007-10-31 09:33:54 UTC (rev 3014)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/log4.properties
2007-11-06 12:26:44 UTC (rev 3015)
@@ -3,9 +3,6 @@
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.appender.file=org.apache.log4j.ConsoleAppender
log4j.appender.file=org.apache.log4j.FileAppender
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/RequestOptionsPanel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/RequestOptionsPanel.java
2007-10-31 09:33:54 UTC (rev 3014)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/ui/panels/RequestOptionsPanel.java
2007-11-06 12:26:44 UTC (rev 3015)
@@ -54,6 +54,7 @@
protected JFormattedTextField field_timeout;
protected JSpinner field_maxItems;
protected JCheckBox field_parallel;
+ protected JCheckBox aa_enable;
protected IPerfsonarTab psModel;
@@ -68,23 +69,10 @@
for (int i=0; i < label.length;i++)
label[i] = new JLabel("xxx");
- /*
-
topNumberField.setHorizontalAlignment(javax.swing.JTextField.RIGHT);
- topNumberField.setText("10");
-
-
-
topGroupTransCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0,
0, 0, 0));
- topGroupTransCheckBox.setMargin(new java.awt.Insets(0, 0, 0,
0));
-
- topGroupTransLabel.setText("group transport protocols");
-
- topFilterLabel.setText("filter rule");
-
- topAggregationLabel.setText("aggregation rule");
- */
JLabel tLabel = new JLabel("Request timeout, ms");
JLabel rLabel = new JLabel("Max number of interfaces per
request");
+
//setPreferredSize(new Dimension(400,400));
org.jdesktop.layout.GroupLayout glayout = new
org.jdesktop.layout.GroupLayout(
this);
@@ -98,6 +86,7 @@
.add(tLabel)
.add(rLabel)
.add(field_parallel)
+ .add(aa_enable)
);
sg.add(glayout.createParallelGroup(GroupLayout.LEADING)
.add(field_timeout)
@@ -115,7 +104,10 @@
.add(field_maxItems));
sg1.add(glayout.createParallelGroup(GroupLayout.LEADING)
.add(field_parallel)
- );
+ );
+ sg1.add(glayout.createParallelGroup(GroupLayout.LEADING)
+ .add(aa_enable)
+ );
glayout.setVerticalGroup(sg1);
@@ -152,6 +144,14 @@
getPsModel().getRequest().setParallel(cb.isSelected());
}
};
+
+ Action aaAction = new AbstractAction("Enable Authentication
and Authorization") {
+ // This method is called when the button is pressed
+ public void actionPerformed(ActionEvent evt) {
+ JCheckBox cb = (JCheckBox)evt.getSource();
+ getPsModel().getRequest().setAAEnabled(cb.isSelected());
+ }
+ };
field_parallel = new JCheckBox(action);
field_parallel.setSelected(getPsModel().getRequest().isParallel());
@@ -169,6 +169,10 @@
}
});
+ aa_enable = new JCheckBox(aaAction);
+ aa_enable.setSelected(getPsModel().getRequest().isAAEnabled());
+ aa_enable.setToolTipText("Authentication enabled if checked.");
+
placeWidgets();
}
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
2007-10-31 09:33:54 UTC (rev 3014)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PerfsonarPlaygroundModel.java
2007-11-06 12:26:44 UTC (rev 3015)
@@ -25,9 +25,12 @@
import java.io.File;
import java.util.List;
+import javax.swing.JComponent;
+
import org.perfsonar.perfsonarui.AbstractUserData;
import org.perfsonar.perfsonarui.IPerfsonarSchema;
import org.perfsonar.perfsonarui.SmartMARequest;
+import org.perfsonar.perfsonarui.ma.ui.panels.RequestOptionsPanel;
import org.perfsonar.perfsonarui.plugins.IPerfsonarRequest;
import org.perfsonar.perfsonarui.plugins.IPerfsonarTab;
import org.perfsonar.perfsonarui.plugins.ITimeValueResponse;
@@ -144,6 +147,7 @@
// TODO Auto-generated method stub
return null;
}
+
}
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundRequest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundRequest.java
2007-10-31 09:33:54 UTC (rev 3014)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/playground/PlaygroundRequest.java
2007-11-06 12:26:44 UTC (rev 3015)
@@ -32,6 +32,7 @@
import org.perfsonar.perfsonarui.AbstractMARequest;
import org.perfsonar.perfsonarui.AbstractUserData;
+import org.perfsonar.perfsonarui.aa.AAPerfsonarRequest;
import org.perfsonar.perfsonarui.plugins.IPerfsonarResponse;
import org.perfsonar.perfsonarui.plugins.IUserData;
import org.perfsonar.perfsonarui.plugins.MAEndpoint;
@@ -47,7 +48,7 @@
* @author Nina Jeliazkova
* <b>Modified</b> Jan 12, 2007
*/
-public class PlaygroundRequest extends AbstractMARequest {
+public class PlaygroundRequest extends AAPerfsonarRequest {
public DocumentBuilderFactory factory;
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/AAMARequestTest.java
===================================================================
---
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/AAMARequestTest.java
2007-10-31 09:33:54 UTC (rev 3014)
+++
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/AAMARequestTest.java
2007-11-06 12:26:44 UTC (rev 3015)
@@ -15,22 +15,25 @@
public class AAMARequestTest extends TestCase {
public void test() {
try {
- IUserData data = new AbstractUserData();
- data.setEndpoint(new
MAEndpoint("TelnetSSH,http://chaos169.test.atlantis.ugent.be:8080/JAVA-SSHTELNET-MP-1.2-1.2-dev/services/TelnetSSH,lg,,lg,lg";));
- FileAARequest request = new FileAARequest(
- new File("data/aa/metadatarequest.xml")
- );
- request.setCredentialsListener(new SwingCredentialListener());
- request.makeRequest(data,"",
- new FilePerfsonarResponse(new
File("data/aa/metadataresponse.xml")) {
- @Override
- public synchronized void
callException(PerfsonarResponseEvent event) {
- if (event.getException() != null)
-
event.getException().printStackTrace();
- fail(event.getMessage());
- }
- },
- false);
+ IUserData data = new AbstractUserData();
+ data.setEndpoint(new
MAEndpoint("TelnetSSH,http://chaos169.test.atlantis.ugent.be:8080/JAVA-SSHTELNET-MP-1.2-1.2-dev/services/TelnetSSH,lg,,lg,lg";));
+ FileAARequest request = new FileAARequest(
+ new
File("data/aa/metadatarequest.xml")
+ );
+ request.setCredentialsListener(new
SwingCredentialListener());
+ File response = new
File("data/aa/metadataresponse.xml");
+ if (response.exists()) response.delete();
+ request.makeRequest(data,"",
+ new FilePerfsonarResponse(response) {
+ @Override
+ public synchronized void
callException(PerfsonarResponseEvent event) {
+ if (event.getException() != null)
+
event.getException().printStackTrace();
+ fail(event.getMessage());
+ }
+ },
+ false);
+ assertTrue(response.exists());
} catch (Exception x) {
x.printStackTrace();
fail(x.getMessage());
Modified:
branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
2007-10-31 09:33:54 UTC (rev 3014)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/ui/MANIFESTAPP.MFT
2007-11-06 12:26:44 UTC (rev 3015)
@@ -2,11 +2,11 @@
Main-Class: org.perfsonar.perfsonarui.ui.PerfSonarApp
Class-Path: jars/ui/swing-layout-1.0.jar jars/axis/saaj.jar
jars/axis/axis.jar jars/axis/axis-ant.jar jars/axis/commons-discovery-0.2.jar
jars/axis/commons-logging-1.0.4.jar jars/axis/jaxrpc.jar
jars/axis/log4j-1.2.15.jar jars/axis/wsdl4j-1.5.1.jar jars/xml/activation.jar
jars/xml/mail.jar jars/xml/jdom.jar jars/ui/jcommon-1.0.10.jar
jars/ui/jfreechart-1.0.6.jar jars/l2fprod/l2fprod-common-all.jar
jars/xml/commons-cli-1.0.jar jars/dns/dnsjava-2.0.3.jar
Specification-Title: perfSonar test application
-Specification-Version: 0.03
+Specification-Version: 0.11
Specification-Vendor: perfsonar.acad.bg
Package-Title: org.perfsonar.perfsonarui
-Package-Version: 0.10
+Package-Version: 0.11
Package-Vendor: acad.bg
Implementation-Title: Perfsonar UI
-Implementation-Version: 0.10
+Implementation-Version: 0.11
Implementation-Vendor:
\ No newline at end of file
Modified: branches/perfsonarui/src/perfsonarui.classes
===================================================================
--- branches/perfsonarui/src/perfsonarui.classes 2007-10-31 09:33:54
UTC (rev 3014)
+++ branches/perfsonarui/src/perfsonarui.classes 2007-11-06 12:26:44
UTC (rev 3015)
@@ -1,5 +1,6 @@
org/perfsonar/perfsonarui/*.class
org/perfsonar/perfsonarui/plugins/*.class
+org/perfsonar/perfsonarui/aa/*.class
org/perfsonar/perfsonarui/log4.console
org/perfsonar/perfsonarui/log4.properties
- perfsonar: r3015 - in branches/perfsonarui: ant src src/org/perfsonar/perfsonarui src/org/perfsonar/perfsonarui/aa src/org/perfsonar/perfsonarui/ma/ui/panels src/org/perfsonar/perfsonarui/playground src/org/perfsonar/perfsonarui/test/aa src/org/perfsonar/perfsonarui/ui, svnlog, 11/06/2007
Archive powered by MHonArc 2.6.16.