perfsonar development work

Author: dante.delvaux
Date: 2012-03-08 10:34:48 +0000 (Thu, 08 Mar 2012)
New Revision: 5899

Modified:
   trunk/perfsonar-java-base2/ant/build.xml
   trunk/perfsonar-java-base2/conf/log4j.xml
   trunk/perfsonar-java-base2/pom.xml
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/AADispatchSOAPProtocol.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/component/wssec/WSSecAuthNComponent.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/tokens/SecTokenSOAPManager.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/Configuration.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/MessageHandler.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/ProtocolMappings.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/Service.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/scheduler/singleThread/SingleThreadScheduler.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/xml/nmwg/NMWGNamespaceFactory.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/xml/nmwg/ParametersContainer.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/ElementToJavaGenerator.java
   
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/StaxParserSimple.java
   trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/TestParser.java
   trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/ThreadTask.java
   
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/ConfigFilesCollectionTest.java
Log:
Correcting most raw types and other warnings and adding dependency on 
org.apache.httpcomponents v4.0.1


Modified: trunk/perfsonar-java-base2/ant/build.xml
===================================================================
--- trunk/perfsonar-java-base2/ant/build.xml    2012-03-01 18:19:10 UTC (rev 
5898)
+++ trunk/perfsonar-java-base2/ant/build.xml    2012-03-08 10:34:48 UTC (rev 
5899)
@@ -13,6 +13,7 @@
 
 -->
 
+<!DOCTYPE project>
 <project name="ps-mdm-base2" basedir=".." default="info">
 
     <target name="info">

Modified: trunk/perfsonar-java-base2/conf/log4j.xml
===================================================================
--- trunk/perfsonar-java-base2/conf/log4j.xml   2012-03-01 18:19:10 UTC (rev 
5898)
+++ trunk/perfsonar-java-base2/conf/log4j.xml   2012-03-08 10:34:48 UTC (rev 
5899)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<!DOCTYPE log4j:configuration SYSTEM 
"http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd";>
 
     <!--
         $Id$

Modified: trunk/perfsonar-java-base2/pom.xml
===================================================================
--- trunk/perfsonar-java-base2/pom.xml  2012-03-01 18:19:10 UTC (rev 5898)
+++ trunk/perfsonar-java-base2/pom.xml  2012-03-08 10:34:48 UTC (rev 5899)
@@ -102,12 +102,12 @@
                </repository>
         <repository>
             <id>geant-repository</id>
-            <name>perfSONAR repository</name>
+            <name>GEANT repository</name>
             <url>http://maven.geant.net/repo/net/geant/3rdparty</url>
         </repository>
                <repository>
-                       <id>personar</id>
-                       <name>personar repository</name>
+                       <id>perfsonar-old-repo</id>
+                       <name>old perfSONAR repository</name>
                        
<url>http://svn.geant.net/GEANT/SA2/ps-java-services/trunk/jar-repository/</url>
                </repository>
                <repository>
@@ -252,6 +252,16 @@
                        <artifactId>xmlsec</artifactId>
                        <version>1.4.6</version>
                </dependency>
+               <dependency>
+                       <groupId>org.apache.httpcomponents</groupId>
+                       <artifactId>httpcore</artifactId>
+                       <version>4.0.1</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.httpcomponents</groupId>
+                       <artifactId>httpcore-nio</artifactId>
+                       <version>4.0.1</version>
+               </dependency>
        </dependencies>
 
 

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/AADispatchSOAPProtocol.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/AADispatchSOAPProtocol.java
      2012-03-01 18:19:10 UTC (rev 5898)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/AADispatchSOAPProtocol.java
      2012-03-08 10:34:48 UTC (rev 5899)
@@ -95,7 +95,7 @@
                SOAPHeaderBlock secHeader = null;
                //Issue is axiom - a returned collection must not be null
                if(headerBlocks != null) {
-               Iterator headerBlocksIterator = headerBlocks.iterator();
+               Iterator<?> headerBlocksIterator = headerBlocks.iterator();
                while (headerBlocksIterator.hasNext()) {
                        SOAPHeaderBlock elem = (SOAPHeaderBlock) 
headerBlocksIterator.next();
                        if(elem.getLocalName().equals(WSConstants.WSSE_LN)) {

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/component/wssec/WSSecAuthNComponent.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/component/wssec/WSSecAuthNComponent.java
 2012-03-01 18:19:10 UTC (rev 5898)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/component/wssec/WSSecAuthNComponent.java
 2012-03-08 10:34:48 UTC (rev 5899)
@@ -65,9 +65,9 @@
                return res;
        }
 
+       @SuppressWarnings("deprecation")
        public void requestAuthR(String messageType, String eventType)
                        throws PerfSONARException {
-               boolean authr = true;
                SecurityToken st = new SecurityToken(SecTokenManagerFactory
                                .getDefaultSecTokenManager());
                if (!st.hasSecTokenInRequest()) {

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/tokens/SecTokenSOAPManager.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/tokens/SecTokenSOAPManager.java
  2012-03-01 18:19:10 UTC (rev 5898)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/authn/tokens/SecTokenSOAPManager.java
  2012-03-08 10:34:48 UTC (rev 5899)
@@ -69,7 +69,7 @@
                SOAPEnvelope se = mc.getEnvelope();
                SOAPHeader sh = se.getHeader();
                if (sh!=null) {
-                       Iterator it = sh.examineAllHeaderBlocks();
+                       Iterator<?> it = sh.examineAllHeaderBlocks();
                        while (it.hasNext()) {
                                SOAPHeaderBlock shb = 
(SOAPHeaderBlock)it.next();
                                if (shb.getLocalName().equals(WSSECHEADER)&&
@@ -97,7 +97,7 @@
                                Crypto crypto = new DynamicCrypto();
                                WSSecurityEngine secEngine = new 
WSSecurityEngine();
                                String actor=shb.getAttribute(new 
QName(SOAPENV_NS, WSSECHEADER_ACTOR)).getAttributeValue();
-                               Vector resultSignature = 
secEngine.processSecurityHeader(doc, actor, null, crypto);
+                               Vector<?> resultSignature = 
secEngine.processSecurityHeader(doc, actor, null, crypto);
                                if (resultSignature==null) {
                                        throw new 
PerfSONARException("error.authn.wssec","Null response checking the 
signature");
                                }
@@ -158,9 +158,9 @@
         Object stValue=token.getSecTokenValue();
                if (!isDelegated(token)) {
                        X509Certificate cert=(X509Certificate)stValue;
-                       Collection subjectAltNames = 
cert.getSubjectAlternativeNames();
+                       Collection<List<?>> subjectAltNames = 
cert.getSubjectAlternativeNames();
             if (subjectAltNames != null) {
-                Iterator names = subjectAltNames.iterator();
+                Iterator<List<?>> names = subjectAltNames.iterator();
                 while (names.hasNext()) {
                     List<?> values = (List<?>)names.next();
                     if (values.size() == 2) {
@@ -175,7 +175,7 @@
                }
                else {
                        SAMLAssertion assertion=(SAMLAssertion)stValue;
-                       Iterator it=assertion.getStatements();
+                       Iterator<?> it=assertion.getStatements();
                        while (it.hasNext()) {
                                SAMLStatement 
statement=(SAMLStatement)it.next();
                                if (statement instanceof 
SAMLAuthenticationStatement) {

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/Configuration.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/Configuration.java
       2012-03-01 18:19:10 UTC (rev 5898)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/Configuration.java
       2012-03-08 10:34:48 UTC (rev 5899)
@@ -46,7 +46,7 @@
                return service;
        }
 
-       public Map getServices() {
+       public Map<String, Service> getServices() {
                return services;
        }
 
@@ -85,13 +85,13 @@
                                .getValue();
        }
 
-       public Iterator getLookupInformationIterator() throws 
PerfSONARException {
+       public Iterator<String> getLookupInformationIterator() throws 
PerfSONARException {
                return ((LookupInformation) getService().getEntry(
                                
Configuration.LOOKUP_INFORMATION)).getOptions().keySet()
                                .iterator();
        }
 
-       public Iterator getLookupInformationIterator(String serviceName)
+       public Iterator<String> getLookupInformationIterator(String 
serviceName)
                        throws PerfSONARException {
                return ((LookupInformation) getService(serviceName).getEntry(
                                
Configuration.LOOKUP_INFORMATION)).getOptions().keySet()
@@ -138,13 +138,13 @@
                                .getMapping();
        }
 
-       public Iterator getProtocolMappingsIterator() throws 
PerfSONARException {
+       public Iterator<String> getProtocolMappingsIterator() throws 
PerfSONARException {
                return ((ProtocolMappings) getService().getEntry(
                                
Configuration.PROTOCOL_MAPPINGS)).getElements().keySet()
                                .iterator();
        }
 
-       public Iterator getProtocolMappingsIterator(String serviceName)
+       public Iterator<String> getProtocolMappingsIterator(String 
serviceName)
                        throws PerfSONARException {
                return ((ProtocolMappings) getService(serviceName).getEntry(
                                
Configuration.PROTOCOL_MAPPINGS)).getElements().keySet()
@@ -163,13 +163,13 @@
                                .getOption(optionName).getValue();
        }
 
-       public Iterator getExtensionOptionsIterator(String extensionName,
+       public Iterator<String> getExtensionOptionsIterator(String 
extensionName,
                        String optionName) throws PerfSONARException {
                return ((Extension) 
getService().getEntry(extensionName)).getOptions()
                                .keySet().iterator();
        }
 
-       public Iterator getExtensionOptionsIterator(String serviceName,
+       public Iterator<String> getExtensionOptionsIterator(String 
serviceName,
                        String extensionName, String optionName) throws 
PerfSONARException {
                return ((Extension) 
getService(serviceName).getEntry(extensionName))
                                .getOptions().keySet().iterator();

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/MessageHandler.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/MessageHandler.java
      2012-03-01 18:19:10 UTC (rev 5898)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/MessageHandler.java
      2012-03-08 10:34:48 UTC (rev 5899)
@@ -41,7 +41,7 @@
         return ((Message)messages.get(type));
     }
 
-    public Map getMessages() {
+    public Map<String,Message> getMessages() {
         return messages;
     }
 

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/ProtocolMappings.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/ProtocolMappings.java
    2012-03-01 18:19:10 UTC (rev 5898)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/ProtocolMappings.java
    2012-03-08 10:34:48 UTC (rev 5899)
@@ -42,7 +42,7 @@
         return ((ElementConf)elements.get(name));
     }
 
-    public Map getElements() {
+    public Map<String,ElementConf> getElements() {
         return elements;
     }
 

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/Service.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/Service.java
     2012-03-01 18:19:10 UTC (rev 5898)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/configuration/Service.java
     2012-03-08 10:34:48 UTC (rev 5899)
@@ -40,7 +40,7 @@
         return ((Entry)childs.get(name));
     }
 
-    public Map getEntries() {
+    public Map<String,Entry> getEntries() {
         return childs;
     }
 

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
  2012-03-01 18:19:10 UTC (rev 5898)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/requesthandler/axis2/Axis2RequestHandler.java
  2012-03-08 10:34:48 UTC (rev 5899)
@@ -19,7 +19,6 @@
 import org.perfsonar.base2.service.exceptions.PerfSONARException;
 import org.perfsonar.base2.service.requesthandler.RequestHandler;
 import org.perfsonar.base2.service.requesthandler.ServiceMessage;
-import org.perfsonar.base2.service.validation.JREVersion;
 import org.perfsonar.base2.xml.AXIOMCreator;
 import org.perfsonar.base2.xml.ConfigurationStaxParser;
 import org.perfsonar.base2.xml.Element;

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/scheduler/singleThread/SingleThreadScheduler.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/scheduler/singleThread/SingleThreadScheduler.java
      2012-03-01 18:19:10 UTC (rev 5898)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/service/scheduler/singleThread/SingleThreadScheduler.java
      2012-03-08 10:34:48 UTC (rev 5899)
@@ -90,7 +90,7 @@
                                Thread.sleep(interval * 1000);
                                iteration++;
                        } catch (InterruptedException e) {
-                               logger.warn("Sleep error");
+                               logger.warn("Sleep error after " + iteration 
+ " iterations.");
                        }
 
                }

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/xml/nmwg/NMWGNamespaceFactory.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/xml/nmwg/NMWGNamespaceFactory.java
     2012-03-01 18:19:10 UTC (rev 5898)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/xml/nmwg/NMWGNamespaceFactory.java
     2012-03-08 10:34:48 UTC (rev 5899)
@@ -13,7 +13,7 @@
         //TODO: to be loaded from file ?
         namespaces.put("nmwg", "http://ggf.org/ns/nmwg/base/2.0/";);
         namespaces.put("perfsonar", 
"http://ggf.org/ns/nmwg/tools/org/perfsonar/1.0/";);
-       namespaces.put("psservice", 
"http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";);
+        namespaces.put("psservice", 
"http://ggf.org/ns/nmwg/tools/org/perfsonar/service/1.0/";);
         namespaces.put("xquery", 
"http://ggf.org/ns/nmwg/tools/org/perfsonar/service/lookup/xquery/1.0/";);
         namespaces.put("nmwgr", "http://ggf.org/ns/nmwg/result/2.0/";);
         //..........

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/xml/nmwg/ParametersContainer.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/xml/nmwg/ParametersContainer.java
      2012-03-01 18:19:10 UTC (rev 5898)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/base2/xml/nmwg/ParametersContainer.java
      2012-03-08 10:34:48 UTC (rev 5899)
@@ -45,7 +45,7 @@
         return (Parameters) parametersMap.get(namespaceUri);
     }
     
-    public Map getParametersMap() {
+    public Map<String, Parameters> getParametersMap() {
 
         return parametersMap;
     }

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/ElementToJavaGenerator.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/ElementToJavaGenerator.java
     2012-03-01 18:19:10 UTC (rev 5898)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/ElementToJavaGenerator.java
     2012-03-08 10:34:48 UTC (rev 5899)
@@ -54,9 +54,9 @@
       }
       
       //attributes
-      Iterator i = e.getAttributes().entrySet().iterator();
+      Iterator<Map.Entry<String, String>> i = 
e.getAttributes().entrySet().iterator();
       while (i.hasNext()) {
-          Map.Entry attr = (Map.Entry)i.next();
+          Map.Entry<String, String> attr = (Map.Entry<String, 
String>)i.next();
           String name = (String)attr.getKey();
           String value = (String)attr.getValue();
           System.out.println("    "+elementName+".addAttribute(\""+name+"\", 
\""+value+"\");");

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/StaxParserSimple.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/StaxParserSimple.java
   2012-03-01 18:19:10 UTC (rev 5898)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/StaxParserSimple.java
   2012-03-08 10:34:48 UTC (rev 5899)
@@ -2,191 +2,114 @@
 
 import java.io.InputStream;
 import java.util.HashMap;
-import java.util.Stack;
 
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
+import org.apache.log4j.Logger;
 import org.perfsonar.base2.xml.Element;
 
 /**
  * Parser for parsing XML to Element hierarchy with using Stax.
  * 
  * @author Maciej Glowiak
- *
+ * 
  */
 public class StaxParserSimple {
 
-    private static final String DEFAULT_ELEMENT_CLASSNAME = 
"org.perfsonar.base2.xml.Element";
-    private static final String ANY_ELEMENT = "*";
-    
-    HashMap<String, String> objectMappings = new HashMap<String, String>();
-    
-    
-    private boolean resetCount = false;
-    private int total = 0;
-    
+       private final Logger logger = 
Logger.getLogger(StaxParserSimple.class);
 
-    
-    // ----------------------------------------------------------- 
constructor
+       private static final String DEFAULT_ELEMENT_CLASSNAME = 
"org.perfsonar.base2.xml.Element";
+       private static final String ANY_ELEMENT = "*";
 
-    public StaxParserSimple() {
-    
-        objectMappings.put(ANY_ELEMENT, DEFAULT_ELEMENT_CLASSNAME); 
//default one
-        
-    }
+       HashMap<String, String> objectMappings = new HashMap<String, 
String>();
 
+       // ----------------------------------------------------------- 
constructor
 
-    
-    // -------------------------------------------------------- public 
methods
-    
-    
-    /**
-     * StAX Parser for InputStream
-     * 
-     * @param fis
-     * @return
-     * @throws XMLStreamException
-     */
-    public Element parse(InputStream istream) throws XMLStreamException {
+       public StaxParserSimple() {
+               objectMappings.put(ANY_ELEMENT, DEFAULT_ELEMENT_CLASSNAME); 
// default
+                                                                             
                                                          // one
+       }
 
-        // create STAX reader from inputstream
-        XMLInputFactory factory = (XMLInputFactory) XMLInputFactory
-                .newInstance();
-        XMLStreamReader staxXmlReader = (XMLStreamReader) factory
-                .createXMLStreamReader(istream);
-        return parse(staxXmlReader);
+       // -------------------------------------------------------- public 
methods
 
-    }
+       /**
+        * StAX Parser for InputStream
+        * 
+        * @param fis
+        * @return
+        * @throws XMLStreamException
+        */
+       public Element parse(InputStream istream) throws XMLStreamException {
+               // create STAX reader from inputstream
+               XMLInputFactory factory = (XMLInputFactory) 
XMLInputFactory.newInstance();
+               XMLStreamReader staxXmlReader = (XMLStreamReader) 
factory.createXMLStreamReader(istream);
+               return parse(staxXmlReader);
+       }
 
+       /**
+        * StAX Parser for XMLStreamReader
+        * 
+        * @param fis
+        * @return
+        * @throws XMLStreamException
+        */
+       public Element parse(XMLStreamReader staxXmlReader) throws 
XMLStreamException {
 
-    /**
-     * StAX Parser for XMLStreamReader
-     * 
-     * @param fis
-     * @return
-     * @throws XMLStreamException
-     */
-    public Element parse(XMLStreamReader staxXmlReader)
-            throws XMLStreamException {
+               Element topElement = null;
 
-        Element topElement = null;
-        Stack<Element> parents = new Stack<Element>();
+               // initialize settings
 
-        // initialize settings
+               // for textual elements
+               int begin = 0;
+               String elementName = "";
+               boolean rememberIndex = false;
+               @SuppressWarnings("unused")
+               int lastIndex = 0;
 
-        // for textual elements
-        String text = "";
-        int begin = 0;
-        int end = 0;
-        int count = 0;
-        String textElementName = "";
-        boolean rememberNextStartIndex = false;
-        boolean isTextual = false;
-        boolean finished = false;
-        String elementName = "";
-        // current element reference
-        Element currentElement = null;
+               // Parse for all STAX events
+               for (int event = staxXmlReader.next(); event != 
XMLStreamConstants.END_DOCUMENT; event = staxXmlReader.next()) {
 
-        boolean rememberIndex=false;
-        int lastIndex = 0;
-        
-        
-        // Parse for all STAX events
-        for (int event = staxXmlReader.next(); event != 
XMLStreamConstants.END_DOCUMENT; event = staxXmlReader
-                .next()) {
+                       if (event == XMLStreamConstants.START_ELEMENT) {
+                               logger.debug("\n== BEGIN: " + 
staxXmlReader.getLocalName());
+                               try {
+                                       log("* [" + staxXmlReader.getText() + 
"]");
+                               } catch (Exception ex) {
+                               }
+                               elementName = staxXmlReader.getLocalName();
+                               rememberIndex = true;
 
-            if (event == XMLStreamConstants.START_ELEMENT) {
+                       } // end START_ELEMENT
 
-//                
log("-----------------------------------------------------------------------\n");
-                log("\n== BEGIN: "+staxXmlReader.getLocalName());
-                try{
-                    log("* ["+staxXmlReader.getText()+"]");
-                } catch (Exception ex) {}
-                elementName = staxXmlReader.getLocalName();
-                rememberIndex = true;
+                       else if (event == XMLStreamConstants.END_ELEMENT) {
+                               logger.debug("\n  == END: " + 
staxXmlReader.getLocalName());
 
-            } // end START_ELEMENT
+                       } // end END_ELEMENT
 
-            else if (event == XMLStreamConstants.END_ELEMENT) {
+                       else if (event == XMLStreamConstants.CHARACTERS) {
 
-//                
log("-----------------------------------------------------------------------\n");
-//                log("\n  == END: "+staxXmlReader.getLocalName());
+                               
logger.debug("-----------------------------------------------------------------------\n");
+                               logger.debug("\n== CHARACTERS <" + 
elementName + ">:");
 
-            } // end END_ELEMENT
+                               if (rememberIndex) {
+                                       rememberIndex = false;
+                                       lastIndex = begin;
+                               }
 
-            else 
-            if (event == XMLStreamConstants.CHARACTERS) {
+                               if (staxXmlReader.getTextStart() > begin)
+                                       begin = staxXmlReader.getTextStart();
 
-                
log("-----------------------------------------------------------------------\n");
-                log("\n== CHARACTERS <"+elementName+">:");
-                
-                if (rememberIndex) {
-                    rememberIndex = false;
-                    lastIndex = begin;
-                }
-                
-//                log("0 ["+staxXmlReader.getText().trim()+"] 
("+staxXmlReader.getText().length()+")");
+                       } // end CHARACTERS
 
-                // ---------------------
-//                String i = " 
("+begin+","+(staxXmlReader.getTextStart()-begin)+")";
-//                try { 
-//                    String s =String.copyValueOf(
-//                            staxXmlReader.getTextCharacters(), 
-//                            begin, 
-//                            (staxXmlReader.getTextStart()-begin)); 
-//                    log("1. ["+ s.trim() + "]"+i); } catch (Exception ex) 
{ log("1. [] err"+i);  }
+               } // end for
 
-                    // ---------------------
-//                     i = " ("+lastIndex+","+(begin-lastIndex)+")";
-//                    try { 
-//                        String s =String.copyValueOf(
-//                                staxXmlReader.getTextCharacters(), 
-//                                lastIndex, 
-//                                (begin-lastIndex)); 
-//                        log("2 ["+ s.trim() + "]"+i); } catch (Exception 
ex) { log("2 [] err"+i);  }                    
-                    
-                // ---------------------
-//                i = " ("+begin+","+(staxXmlReader.getTextLength())+")";
-//                try { 
-//                    String s =String.copyValueOf(
-//                            staxXmlReader.getTextCharacters(), 
-//                            begin, 
-//                            staxXmlReader.getTextLength()); 
-//                    log("2 ["+ s.trim() + "]"+i); } catch (Exception ex) { 
log("2 [] err"+i); ex.printStackTrace(); }                    
+               return topElement;
+       }
 
-                // ------------------    
-//                i = " 
("+staxXmlReader.getTextStart()+","+staxXmlReader.getTextLength()+")";
-//                try {
-//                    String s = String.copyValueOf(
-//                            staxXmlReader.getTextCharacters(),  
-//                            staxXmlReader.getTextStart(), 
-//                            staxXmlReader.getTextLength());
-//                    log("2. ["+s.trim() +"]"+i);  } catch (Exception ex) { 
log("2. [] err"+i);  }
+       private void log(String s) {
+               System.out.println(s);
+       }
 
-                // ----------------------
-                    
-                    
-                // ------------------------
-                    
-                //log("     -> (begin="+begin+", 
start="+staxXmlReader.getTextStart()+", 
len="+staxXmlReader.getTextLength()+")");
-                 //log(" *** ["+staxXmlReader.getText()+"]");
-                if (staxXmlReader.getTextStart()>begin)
-                    begin = staxXmlReader.getTextStart();
-
-            } // end CHARACTERS
-
-        } // end for
-
-        return topElement;
-    }
-
-
-    private void log(String s) {
-        System.out.println(s);
-    }
-
-    
-} //StaxParser
+} // StaxParser

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/TestParser.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/TestParser.java 
2012-03-01 18:19:10 UTC (rev 5898)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/TestParser.java 
2012-03-08 10:34:48 UTC (rev 5899)
@@ -8,11 +8,9 @@
 import javax.xml.stream.XMLStreamReader;
 
 import org.perfsonar.base2.xml.Element;
-import org.perfsonar.base2.xml.ElementSerializer;
 import org.perfsonar.base2.xml.StaxParser;
 import org.perfsonar.base2.xml.nmwg.Message;
 import org.perfsonar.base2.xml.nmwg.Metadata;
-import org.perfsonar.base2.xml.nmwg.EventType;
 import org.perfsonar.base2.xml.nmwg.Parameters;
 import org.perfsonar.base2.xml.nmwg.Parameter;
 

Modified: 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/ThreadTask.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/ThreadTask.java 
2012-03-01 18:19:10 UTC (rev 5898)
+++ 
trunk/perfsonar-java-base2/src/main/java/org/perfsonar/test/ThreadTask.java 
2012-03-08 10:34:48 UTC (rev 5899)
@@ -5,9 +5,8 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
 
-public class ThreadTask implements Callable {
+public class ThreadTask implements Callable<String> {
 
     /**
      * @param args
@@ -65,7 +64,7 @@
         
     }
 
-    public Object call() throws Exception {
+    public String call() throws Exception {
         for (int i=1; i<5; i++) {
             
             System.out.println(((id>3999)?"*** ":"")+"Thread [#"+id+"] run 
for ["+i+"] time");

Modified: 
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/ConfigFilesCollectionTest.java
===================================================================
--- 
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/ConfigFilesCollectionTest.java
 2012-03-01 18:19:10 UTC (rev 5898)
+++ 
trunk/perfsonar-java-base2/src/test/java/org/perfsonar/base2/service/configuration/migration/ConfigFilesCollectionTest.java
 2012-03-08 10:34:48 UTC (rev 5899)
@@ -79,9 +79,9 @@
                return expected;
        }
        
-       private void assertCollectionEquals(Collection expected, Collection 
actual) {
-               final Collection result = new ArrayList();
-               for (Object obj : expected) {
+       private void assertCollectionEquals(Collection<File> expected, 
Collection<File> actual) {
+               final Collection<File> result = new ArrayList<File>();
+               for (File obj : expected) {
                        if (!actual.contains(obj))
                                result.add(obj);
                }