perfsonar development work

Author: nina
Date: 2007-10-26 08:47:10 -0400 (Fri, 26 Oct 2007)
New Revision: 2999

Added:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/FilePerfsonarResponse.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AAPerfsonarRequest.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/FileAARequest.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/ICredentialsListener.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/SwingCredentialListener.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/AAMARequestTest.java
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/SwingCredentialListenerTest.java
Modified:
   branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java
   branches/perfsonarui/src/org/perfsonar/perfsonarui/PSException.java
Log:
AA aware descendant of AbstractMARequest.java. Derive your request classes 
from this class in order to automatically embed a certificate in the SOAP 
message.

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java 
  2007-10-26 12:33:01 UTC (rev 2998)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/AbstractMARequest.java 
  2007-10-26 12:47:10 UTC (rev 2999)
@@ -33,6 +33,7 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.rpc.ServiceException;
+import javax.xml.soap.SOAPEnvelope;
 
 import org.apache.axis.client.Call;
 import org.apache.axis.client.Service;
@@ -51,6 +52,7 @@
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 
+import com.sun.corba.se.spi.legacy.connection.GetEndPointInfoAgainException;
 import com.sun.org.apache.xml.internal.serialize.OutputFormat;
 import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
 
@@ -238,7 +240,10 @@
                                call = (Call)service.createCall();
                                
                        }
-                       
+                       if (uData == null) 
+                   throw new Exception("IUserData not assigned - null");
+                       if (uData.getEndpoint() == null) 
+                   throw new Exception("Endpoint not assigned - null");      
                  
                    //Call call = (Call)service.createCall();
                    call.setTargetEndpointAddress(new 
URL(uData.getEndpoint().getEndpoint()));
                    call.setOperationName(new QName(URI_SOAP,"submit"));
@@ -246,7 +251,7 @@
                    Document request = createRequest(uData,messageType);
                    // build a SOAPBodyElement from the document
                    requestMessage = new 
SOAPBodyElement(request.getDocumentElement());
-                           
+                   
                    query = uData;
                    queries = null;
                    if (runInThread)  {
@@ -309,7 +314,14 @@
                 
                        call.setTimeout(new Integer(timeout)); //5 min
                 logger.debug("Timeout set to "+call.getTimeout());
-                resultObject = call.invoke(new Object[] {requestMessage});
+                
+                SOAPEnvelope envelope = prepareEnvelope(requestMessage);
+                
+                if (envelope != null)
+                       //resultObject = call.invoke((SOAPEnvelope)envelope);
+                       throw new Exception("AA not implemented! Have to 
figure out why  resultObject = call.invoke((SOAPEnvelope)envelope); does not 
compile");
+                else
+                       resultObject = call.invoke(new Object[] 
{requestMessage});
 
                 if (!isInterrupted()) {
                     logger.debug("request completed");
@@ -331,6 +343,9 @@
             
        
     }
+    public SOAPEnvelope prepareEnvelope(javax.xml.soap.SOAPBodyElement 
soapbodyelement) throws PSException {
+       return null;
+    }
     /**
      * Temporary function to create org.w3c.dom.Document from 
org.jdom.Element.
      * TODO eliminate jdom, create DOM document directly, then this function 
will became obsolete.

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/FilePerfsonarResponse.java

Modified: branches/perfsonarui/src/org/perfsonar/perfsonarui/PSException.java
===================================================================
--- branches/perfsonarui/src/org/perfsonar/perfsonarui/PSException.java 
2007-10-26 12:33:01 UTC (rev 2998)
+++ branches/perfsonarui/src/org/perfsonar/perfsonarui/PSException.java 
2007-10-26 12:47:10 UTC (rev 2999)
@@ -66,7 +66,7 @@
      * @param cause
      */
     public PSException(MAEndpoint maEndpoint,Throwable cause) {
-        super(cause);
+        this(cause);
         this.maEndpoint = maEndpoint;
     }
 
@@ -78,6 +78,18 @@
         super(message, cause);
         this.maEndpoint = maEndpoint;
     }
+    /**
+     * @param cause
+     */
+    public PSException(Throwable cause) {
+        super(cause);
+    }
+    /**
+     * @param cause
+     */
+    public PSException(String message) {
+        super(message);
+    }        
     /* (non-Javadoc)
      * @see java.lang.Throwable#getMessage()
      */
@@ -86,11 +98,13 @@
             return super.getMessage();
                StringBuffer b = new StringBuffer();
                b.append(super.getMessage());
+               if (maEndpoint!=null) {
+                       b.append("\n");
+                       b.append(maEndpoint.getTitle());
+                       b.append(" at ");
+                       b.append(maEndpoint.getEndpoint());
+               }
                b.append("\n");
-               b.append(maEndpoint.getTitle());
-               b.append(" at ");
-               b.append(maEndpoint.getEndpoint());
-               b.append("\n");
                if (getCause() != null)
                    b.append(getCause());
                return b.toString();

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/AAPerfsonarRequest.java

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/FileAARequest.java

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/ICredentialsListener.java

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/aa/SwingCredentialListener.java

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/AAMARequestTest.java

Added: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/test/aa/SwingCredentialListenerTest.java