perfsonar development work

Author: rodriguez
Date: 2007-11-21 05:11:34 -0500 (Wed, 21 Nov 2007)
New Revision: 3060

Added:
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/AuthNSAMLData.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/AuthNX509Data.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java
Removed:
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/AuthNData.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNData.java
Modified:
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/AuthNDataFactory.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPX509Client.java
Log:
Dividing classes of the WE profile from other ones

Deleted: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/AuthNData.java

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/AuthNDataFactory.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/AuthNDataFactory.java
    2007-11-20 15:38:15 UTC (rev 3059)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/AuthNDataFactory.java
    2007-11-21 10:11:34 UTC (rev 3060)
@@ -1,8 +1,13 @@
 package org.perfsonar.client.base.authn;
 
 public class AuthNDataFactory {
-       public static AuthNData getDefaultAuthNData() {
-               AuthNData data=new WSSAuthNData();
+       public static AuthNX509Data getDefaultAuthNX509Data() {
+               AuthNX509Data data=new WSSAuthNX509Data();
                return data;
        }
+
+       public static AuthNSAMLData getDefaultAuthNSAMLData() {
+               AuthNSAMLData data=new WSSAuthNSAMLData();
+               return data;
+       }
 }

Added: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/AuthNSAMLData.java

Copied: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/AuthNX509Data.java
 (from rev 3059, 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/AuthNData.java)

Deleted: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNData.java

Added: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java

Copied: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java
 (from rev 3059, 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNData.java)

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPX509Client.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPX509Client.java
     2007-11-20 15:38:15 UTC (rev 3059)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPX509Client.java
     2007-11-21 10:11:34 UTC (rev 3060)
@@ -1,21 +1,8 @@
 package org.perfsonar.client.testHarness;
 
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileReader;
 import java.io.FileWriter;
-import java.io.InputStream;
 import java.net.URL;
-import java.security.Key;
-import java.security.KeyFactory;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Vector;
 
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
@@ -26,27 +13,13 @@
 import org.apache.axis.message.SOAPBodyElement;
 import org.apache.axis.message.SOAPEnvelope;
 import org.apache.axis.utils.XMLUtils;
-import org.apache.ws.security.SOAPConstants;
-import org.apache.ws.security.WSConstants;
-import org.apache.ws.security.WSEncryptionPart;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.message.WSSecHeader;
-import org.apache.ws.security.message.WSSecSignature;
-import org.apache.ws.security.util.Base64;
-import org.apache.ws.security.util.WSSecurityUtil;
 import org.apache.xml.serialize.OutputFormat;
 import org.apache.xml.serialize.XMLSerializer;
 
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.ggf.ns.nmwg.base.v2_0.Message;
-
 import org.w3c.dom.Document;
 
-import org.perfsonar.base.auxiliary.components.authn.DynamicCrypto;
-import org.perfsonar.base.auxiliary.components.authn.SOAPUtil;
-import org.perfsonar.client.base.authn.AuthNData;
+import org.perfsonar.client.base.authn.AuthNX509Data;
 import org.perfsonar.client.base.authn.AuthNDataFactory;
-import 
org.perfsonar.client.base.requests.authService.AuthNEERequestGenerator;
 
 /**
  *  Class which provides the basic web service (Doc/Lit) client capability
@@ -83,7 +56,7 @@
             System.out.println("Certificate file: " + certFile);
 
             // read the certificate... more or less...
-            InputStream isCert=new FileInputStream(certFile);
+//            InputStream isCert=new FileInputStream(certFile);
 
             // prepare to call - set service elements
             Service service = new Service();
@@ -103,7 +76,7 @@
             SOAPBodyElement requestMessage = 
                 new SOAPBodyElement(request.getDocumentElement());
 
-            AuthNData authnData=AuthNDataFactory.getDefaultAuthNData();
+            AuthNX509Data 
authnData=AuthNDataFactory.getDefaultAuthNX509Data();
             Object reqRaw=authnData.addX509STInMessage(requestMessage, 
keyFile, certFile);
             SOAPEnvelope envelope=(SOAPEnvelope)reqRaw;