perfsonar development work

Author: nordunet.behrmann
Date: 2012-10-05 10:22:49 +0100 (Fri, 05 Oct 2012)
New Revision: 6013

Modified:
   
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
   
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java
   
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/DiscardsResponseGenerator.java
   
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ErrorsResponseGenerator.java
   
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/GenericResponseGenerator.java
   
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
   
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/L2PathStatusResponseGenerator.java
   
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
   
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java
   
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
   
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
   
trunk/perfsonar-java-sql-ma/src/test/java/org/perfsonar/service/measurementArchive/sqlType/OwampStoreRequestProcessTest.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java
   trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/XMLUtils.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
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPUbCClient.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCSaslTest.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrRequest.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecTokenSOAPManager.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSListAddresses.java
   
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
Log:
perfsonar_base, perfsonar-java-sql-ma: Get rid of unused imports.

Issue: PSSERVICES-597

Modified: 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
   2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/SQLStorageManager.java
   2012-10-05 09:22:49 UTC (rev 6013)
@@ -9,7 +9,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Collection;
-import java.util.Date;
 
 import java.io.Reader;
 
@@ -30,7 +29,6 @@
 import org.ggf.ns.nmwg.base.v2_0.Key;
 import org.ggf.ns.nmwg.base.v2_0.Metadata;
 import org.ggf.ns.nmwg.base.v2_0.Data;
-import org.ggf.ns.nmwg.base.v2_0.Datum;
 import org.ggf.ns.nmwg.base.v2_0.Parameter;
 import org.ggf.ns.nmwg.base.v2_0.Parameters;
 

Modified: 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java
        2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/BwctlResponseGenerator.java
        2012-10-05 09:22:49 UTC (rev 6013)
@@ -2,7 +2,6 @@
 
 
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

Modified: 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/DiscardsResponseGenerator.java
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/DiscardsResponseGenerator.java
     2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/DiscardsResponseGenerator.java
     2012-10-05 09:22:49 UTC (rev 6013)
@@ -8,7 +8,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Date;
 
 import org.ggf.ns.nmwg.base.v2_0.Data;
 import org.ggf.ns.nmwg.characteristic.discards.v2_0.Datum;

Modified: 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ErrorsResponseGenerator.java
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ErrorsResponseGenerator.java
       2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/ErrorsResponseGenerator.java
       2012-10-05 09:22:49 UTC (rev 6013)
@@ -8,7 +8,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Date;
 
 import org.ggf.ns.nmwg.base.v2_0.Data;
 import org.ggf.ns.nmwg.characteristic.errors.v2_0.Datum;

Modified: 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/GenericResponseGenerator.java
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/GenericResponseGenerator.java
      2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/GenericResponseGenerator.java
      2012-10-05 09:22:49 UTC (rev 6013)
@@ -8,7 +8,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Date;
 
 import org.ggf.ns.nmwg.base.v2_0.Data;
 import org.ggf.ns.nmwg.base.v2_0.Datum;

Modified: 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
        2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/IperfResponseGenerator.java
        2012-10-05 09:22:49 UTC (rev 6013)
@@ -8,7 +8,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Date;
 
 import org.ggf.ns.nmwg.base.v2_0.Data;
 import org.ggf.ns.nmwg.tools.iperf.v2_0.Datum;

Modified: 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/L2PathStatusResponseGenerator.java
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/L2PathStatusResponseGenerator.java
 2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/L2PathStatusResponseGenerator.java
 2012-10-05 09:22:49 UTC (rev 6013)
@@ -6,7 +6,6 @@
 
 
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

Modified: 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
        2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/OwampResponseGenerator.java
        2012-10-05 09:22:49 UTC (rev 6013)
@@ -1,7 +1,6 @@
 package org.perfsonar.service.measurementArchive.sqlType.fetch;
 
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

Modified: 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java
 2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/PingResponseGenerator.java
 2012-10-05 09:22:49 UTC (rev 6013)
@@ -2,7 +2,6 @@
 
 
 import java.util.Collection;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

Modified: 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
  2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/fetch/UtilizationResponseGenerator.java
  2012-10-05 09:22:49 UTC (rev 6013)
@@ -8,7 +8,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Date;
 
 import org.ggf.ns.nmwg.base.v2_0.Data;
 import org.ggf.ns.nmwg.characteristic.utilization.v2_0.Datum;

Modified: 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
      2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar-java-sql-ma/src/main/java/org/perfsonar/service/measurementArchive/sqlType/store/OwampStoreRequestProcess.java
      2012-10-05 09:22:49 UTC (rev 6013)
@@ -7,7 +7,6 @@
 import java.util.Map;
 
 import org.ggf.ns.nmwg.base.v2_0.Element;
-import org.ggf.ns.nmwg.tools.owamp.v2_0.Datum;
 import org.perfsonar.base.exceptions.PerfSONARException;
 import 
org.perfsonar.service.measurementArchive.sqlType.nmwg.OwampAggregationDatum;
 

Modified: 
trunk/perfsonar-java-sql-ma/src/test/java/org/perfsonar/service/measurementArchive/sqlType/OwampStoreRequestProcessTest.java
===================================================================
--- 
trunk/perfsonar-java-sql-ma/src/test/java/org/perfsonar/service/measurementArchive/sqlType/OwampStoreRequestProcessTest.java
        2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar-java-sql-ma/src/test/java/org/perfsonar/service/measurementArchive/sqlType/OwampStoreRequestProcessTest.java
        2012-10-05 09:22:49 UTC (rev 6013)
@@ -3,7 +3,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.ggf.ns.nmwg.tools.owamp.v2_0.Datum;
 import org.junit.Assert;
 import org.junit.Test;
 import 
org.perfsonar.service.measurementArchive.sqlType.nmwg.OwampAggregationDatum;

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java
   2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/auxiliary/components/mapping/ExpressionMapping.java
   2012-10-05 09:22:49 UTC (rev 6013)
@@ -1,7 +1,6 @@
 package org.perfsonar.base.auxiliary.components.mapping;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/XMLUtils.java
===================================================================
--- trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/XMLUtils.java  
  2012-10-05 09:22:48 UTC (rev 6012)
+++ trunk/perfsonar_base/src/main/java/org/perfsonar/base/util/XMLUtils.java  
  2012-10-05 09:22:49 UTC (rev 6013)
@@ -11,7 +11,6 @@
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java
    2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNSAMLData.java
    2012-10-05 09:22:49 UTC (rev 6013)
@@ -1,10 +1,8 @@
 package org.perfsonar.client.base.authn;
 
-import java.security.Key;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.PrivateKey;
-import java.security.Provider;
 import java.security.cert.Certificate;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java
    2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/base/authn/WSSAuthNX509Data.java
    2012-10-05 09:22:49 UTC (rev 6013)
@@ -4,12 +4,10 @@
 import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.InputStream;
-import java.security.Key;
 import java.security.KeyFactory;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.PrivateKey;
-import java.security.Provider;
 import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 import java.security.spec.PKCS8EncodedKeySpec;

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPUbCClient.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPUbCClient.java
      2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/SOAPUbCClient.java
      2012-10-05 09:22:49 UTC (rev 6013)
@@ -3,17 +3,14 @@
 import java.io.File;
 import java.io.StringWriter;
 import java.net.URL;
-import java.security.Key;
 import java.security.KeyPair;
 import java.security.KeyStore;
 import java.security.PrivateKey;
-import java.security.Provider;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateParsingException;
 import java.security.cert.X509Certificate;
 import java.text.DateFormat;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
 
@@ -36,14 +33,12 @@
 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.perfsonar.base.auxiliary.components.authn.DynamicCrypto;
 import org.perfsonar.base.auxiliary.components.authn.SOAPUtil;
 import org.perfsonar.base.exceptions.PerfSONARException;
 import org.perfsonar.client.base.authn.saslca.SASLCAClient;
 import org.perfsonar.client.base.authn.saslca.SASLCAClientConfiguration;
 import org.perfsonar.client.base.authn.saslca.UserID;
-import 
org.perfsonar.client.base.requests.authService.AuthNEERequestGenerator;
 import org.w3c.dom.Document;
 
 public class SOAPUbCClient {

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCSaslTest.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCSaslTest.java
        2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/client/testHarness/UbCSaslTest.java
        2012-10-05 09:22:49 UTC (rev 6013)
@@ -2,17 +2,14 @@
 
 import java.io.StringWriter;
 import java.net.URL;
-import java.security.Key;
 import java.security.KeyPair;
 import java.security.KeyStore;
 import java.security.PrivateKey;
-import java.security.Provider;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateParsingException;
 import java.security.cert.X509Certificate;
 import java.text.DateFormat;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Vector;

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrRequest.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrRequest.java
        2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/AttrRequest.java
        2012-10-05 09:22:49 UTC (rev 6013)
@@ -1,6 +1,5 @@
 package org.perfsonar.service.base.authn;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecTokenSOAPManager.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecTokenSOAPManager.java
 2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/authn/tokens/SecTokenSOAPManager.java
 2012-10-05 09:22:49 UTC (rev 6013)
@@ -1,7 +1,6 @@
 package org.perfsonar.service.base.authn.tokens;
 
 import java.io.ByteArrayInputStream;
-import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.security.cert.CertificateParsingException;
@@ -24,7 +23,6 @@
 import org.apache.axis.Message;
 import org.apache.axis.MessageContext;
 import org.apache.axis.message.SOAPHeader;
-import org.apache.axis.utils.XMLUtils;
 import org.apache.ws.security.WSSecurityEngine;
 import org.apache.ws.security.components.crypto.Crypto;
 import org.apache.ws.security.util.Base64;

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSListAddresses.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSListAddresses.java
     2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSListAddresses.java
     2012-10-05 09:22:49 UTC (rev 6013)
@@ -6,7 +6,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.ArrayList;
 import java.util.Collection;
 
 /**

Modified: 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
===================================================================
--- 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
     2012-10-05 09:22:48 UTC (rev 6012)
+++ 
trunk/perfsonar_base/src/main/java/org/perfsonar/service/base/registration/LSSummaryServiceContent.java
     2012-10-05 09:22:49 UTC (rev 6013)
@@ -3,7 +3,6 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;