ws-wsrf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i..@apache.org
Subject svn commit: r225633 - in /webservices/wsrf/trunk/src: java/org/apache/ws/resource/faults/ java/org/apache/ws/resource/properties/impl/ java/org/apache/ws/resource/properties/query/xpath/impl/ java/org/apache/ws/resource/tool/ java/org/apache/ws/resourc...
Date Wed, 27 Jul 2005 20:59:57 GMT
Author: ips
Date: Wed Jul 27 13:59:36 2005
New Revision: 225633

URL: http://svn.apache.org/viewcvs?rev=225633&view=rev
Log:
implemented TODO(s)

Modified:
    webservices/wsrf/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java
    webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertySetMetaData.java
    webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/JaxenXPathExpressionEvaluator.java
    webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java
    webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/PortType2JavaInfo.java
    webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/velocity/ImplementsListBuilder.java
    webservices/wsrf/trunk/src/java/org/apache/ws/util/IoUtils.java
    webservices/wsrf/trunk/src/java/org/apache/ws/util/NameUtils.java
    webservices/wsrf/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java
    webservices/wsrf/trunk/src/java/org/apache/ws/util/XmlBeanNameUtils.java
    webservices/wsrf/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java
    webservices/wsrf/trunk/src/java/org/apache/ws/util/i18n/doclet/ResourcePropertiesGeneratorDoclet.java
    webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/BasicBeanFactory.java
    webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/BeanFactory.java
    webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/JNDIUtils.java
    webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/XmlBeanNamingContext.java
    webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerImpl.java
    webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerManagerImpl.java
    webservices/wsrf/trunk/src/java/org/apache/ws/util/work/WorkItemImpl.java
    webservices/wsrf/trunk/src/java/org/apache/ws/util/work/WorkManagerImpl.java
    webservices/wsrf/trunk/src/java/org/apache/ws/util/xml/impl/DomNamespaceContext.java
    webservices/wsrf/trunk/src/test/org/apache/ws/resource/metadataexchange/v2004_09/MetadataExchangePortTypeTest.java
    webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/AbstractResourcePropertiesTestCase.java
    webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertySetTestCase.java
    webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertyTestCase.java
    webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/AbstractWsrpPortTypeImplTestCase.java
    webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesProviderTestCase.java
    webservices/wsrf/trunk/src/test/org/apache/ws/util/XmlBeanUtilsTestCase.java

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/faults/AbstractBaseFaultException.java Wed Jul 27 13:59:36 2005
@@ -265,7 +265,7 @@
             }
             if ( m_originator != null )
             {
-                // TODO - low priority
+                // TODO (low priority)
             }
         }
         else if ( m_namespaceSet instanceof org.apache.ws.resource.properties.v2004_06.impl.NamespaceVersionHolderImpl )
@@ -303,7 +303,7 @@
             }
             if ( m_originator != null )
             {
-                // TODO - low priority
+                // TODO (low priority)
             }
         }
         else

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertySetMetaData.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertySetMetaData.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertySetMetaData.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertySetMetaData.java Wed Jul 27 13:59:36 2005
@@ -178,7 +178,7 @@
 
     private static PropertyType getPropertyDesc( MetadataDescriptorType metadataDesc, QName propName )
     {
-        // TODO: recurse into inherited descriptors when looking for property descs
+        // TODO (low priority): recurse into inherited descriptors when looking for property descs
         //       (assume inherited-desc locations are absolute URLs, since we don't know our base URL)
         if ( metadataDesc != null )
         {

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/JaxenXPathExpressionEvaluator.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/JaxenXPathExpressionEvaluator.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/JaxenXPathExpressionEvaluator.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/properties/query/xpath/impl/JaxenXPathExpressionEvaluator.java Wed Jul 27 13:59:36 2005
@@ -99,7 +99,7 @@
             QueryEvaluationErrorException,
             InvalidQueryExpressionException
     {
-        // TODO: for better performance, we could use the Jaxen Navigator that
+        // NOTE: for better performance, we could use the Jaxen Navigator that
         //       comes with XMLBeans v1 to resolve the expression directly
         //       against the resource property set XmlObject; this is low
         //       priority, since XMLBeans v2 no longer includes a Jaxen

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java Wed Jul 27 13:59:36 2005
@@ -25,7 +25,7 @@
 import java.util.Map;
 
 /**
- * TODO
+ * A set of utility methods that are utilized by Wsdl2Java.
  *
  * @author Ian Springer (ian DOT springer AT hp DOT com)
  */

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/PortType2JavaInfo.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/PortType2JavaInfo.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/PortType2JavaInfo.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/PortType2JavaInfo.java Wed Jul 27 13:59:36 2005
@@ -33,9 +33,11 @@
     public abstract QName getName();
 
     /**
-     * TODO
+     * Returns the name of an interface that the generated resource should implement,
+     * or null if no interface should be implemented.
      *
-     * @return
+     * @return the name of an interface that the generated resource should implement,
+     *         or null if no interface should be implemented
      */
     public String getResourceInterfaceName()
     {
@@ -43,9 +45,11 @@
     }
 
     /**
-     * TODO
+     * Returns the name of an interface that the generated service should implement,
+     * or null if no interface should be implemented.
      *
-     * @return
+     * @return the name of an interface that the generated service should implement,
+     *         or null if no interface should be implemented
      */
     public String getServiceInterfaceName()
     {
@@ -53,9 +57,13 @@
     }
 
     /**
-     * TODO
+     * Returns the name of a Velocity template file that should be parsed and
+     * included in the body of the generated resource class, or null if no
+     * template should be parsed and included.
      *
-     * @return
+     * @return the name of a Velocity template file that should be parsed and
+     *         included in the body of the generated resource class, or null if no
+     *         template should be parsed and included
      */
     public String getResourceTemplateFileName()
     {
@@ -63,9 +71,13 @@
     }
 
     /**
-     * TODO
+     * Returns the name of a Velocity template file that should be parsed and
+     * included in the body of the generated service class, or null if no
+     * template should be parsed and included.
      *
-     * @return
+     * @return the name of a Velocity template file that should be parsed and
+     *         included in the body of the generated service class, or null if no 
+     *         template should be parsed and included
      */
     public String getServiceTemplateFileName()
     {

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/velocity/ImplementsListBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/velocity/ImplementsListBuilder.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/velocity/ImplementsListBuilder.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/resource/tool/velocity/ImplementsListBuilder.java Wed Jul 27 13:59:36 2005
@@ -27,11 +27,12 @@
 import java.util.Map;
 
 /**
- * TODO
+ * Provides utility methods for building up the "implements ..." lists for
+ * generated service and resource classes.
  *
  * @author Ian Springer (ian DOT springer AT hp DOT com)
  */
-public class ImplementsListBuilder
+public abstract class ImplementsListBuilder
 {
 
     public static String getServiceImplementsList( ResourceDefinition resourceDef, Map ptInfoMap )

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/IoUtils.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/IoUtils.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/IoUtils.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/IoUtils.java Wed Jul 27 13:59:36 2005
@@ -20,230 +20,101 @@
 import org.apache.ws.util.i18n.Keys;
 import org.apache.ws.util.i18n.Messages;
 import org.apache.ws.util.i18n.MessagesImpl;
-import sun.io.Converters;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 
 /**
- * LOG-DONE
  * Generic I/O utility methods.
  *
- * @author Ian P. Springer, Sal Campana
+ * @author Ian Springer, Sal Campana
  */
 public abstract class IoUtils
 {
 
-   private static final Log LOG = LogFactory.getLog( IoUtils.class );
-   private static final Messages MSG = MessagesImpl.getInstance();
+    private static final Log LOG = LogFactory.getLog( IoUtils.class );
+    private static final Messages MSG = MessagesImpl.getInstance();
 
-   /**
-    * Copies an input stream to an output stream.
-    *
-    * @param in  an input stream; must not be null
-    * @param out an output stream; must not be null
-    *
-    * @throws IOException if the copy fails
-    */
-   public static void copy( InputStream  in,
-                            OutputStream out )
-   throws IOException
-   {
-      if ( in == null )
-      {
-         throw new IllegalArgumentException( MSG.getMessage( Keys.INPUTSTRM_MST_NOT_B_NULL) );
-      }
-      if ( out == null )
-      {
-         throw new IllegalArgumentException( MSG.getMessage( Keys.OUTSTRM_MST_NOT_B_NULL) );
-      }
-      // use Buffered streams for better performance
-      in     = new BufferedInputStream( in );
-      out    = new BufferedOutputStream( out );
-
-      // do not allow other threads to read from the input or write to
-      // the output while copying is taking place
-      synchronized ( in )
-      {
-         synchronized ( out )
-         {
-            byte[] bytes     = new byte[8192];
-            int    bytesRead;
-            while ( ( bytesRead = in.read( bytes ) ) != -1 )
+    /**
+     * Copies an input stream to an output stream.
+     *
+     * @param in  an input stream; must not be null
+     * @param out an output stream; must not be null
+     *
+     * @throws IOException if the copy fails
+     */
+    public static void copy( InputStream in,
+                             OutputStream out )
+            throws IOException
+    {
+        if ( in == null )
+        {
+            throw new IllegalArgumentException( MSG.getMessage( Keys.INPUTSTRM_MST_NOT_B_NULL ) );
+        }
+        if ( out == null )
+        {
+            throw new IllegalArgumentException( MSG.getMessage( Keys.OUTSTRM_MST_NOT_B_NULL ) );
+        }
+        // use Buffered streams for better performance
+        in = new BufferedInputStream( in );
+        out = new BufferedOutputStream( out );
+
+        // do not allow other threads to read from the input or write to
+        // the output while copying is taking place
+        synchronized ( in )
+        {
+            synchronized ( out )
             {
-               out.write( bytes, 0, bytesRead );
+                byte[] bytes = new byte[8192];
+                int bytesRead;
+                while ( ( bytesRead = in.read( bytes ) ) != -1 )
+                {
+                    out.write( bytes, 0, bytesRead );
+                }
+                out.flush();
             }
+        }
+    }
 
-            out.flush(  );
-         }
-      }
-   }
-
-   /**
-       * Copies an input stream to a file.
-       *
-       * @param in an input stream to copy from
-       * @param targetFile the file to copy to; if the file already exists, it will be overwritten
-       *
-       * @throws IOException if the copy fails
-       */
-      public static void copy( InputStream in,
-                               File targetFile )
-      throws IOException
-      {
-         LOG.debug(MSG.getMessage( Keys.COPY_OUTPUTSTRM_TO_FILE, targetFile.toString()));
-         File targetDir = targetFile.getAbsoluteFile(  ).getParentFile(  );
-         targetDir.mkdirs(  );
-         File tempFile = File.createTempFile( MSG.getMessage(Keys.COPY)+"-" + targetFile.getName(  ) + "-", "", targetDir );
-         try
-         {
-            OutputStream out = new FileOutputStream( tempFile );
-            copy( in, out );
-            in.close(  );
-            out.close(  );
-            if ( targetFile.exists(  ) && targetFile.canWrite(  ) )
-            {
-               targetFile.delete(  );
-            }
-
-            if ( !tempFile.renameTo( targetFile ) )
-            {
-               throw new IOException( MSG.getMessage( Keys.FAILED_TO_COPY_INPUTSTRM,targetFile.getAbsolutePath(  ) ,
-                                       tempFile.getAbsolutePath(  )) );
-            }
-         }
-         catch ( IOException ioe )
-         {
-            tempFile.delete(  );
-            throw ( ioe );
-         }
-      }
-
-   /**
-    * Copies one file to another.
-    *
-    * @param sourceFile an existing file to copy from
-    * @param targetFile the file to copy to; if the file already exists, it will be overwritten
-    *
-    * @throws IOException if the copy fails
-    */
-   public static void copy( File sourceFile,
-                            File targetFile )
-   throws IOException
-   {
-      LOG.debug(MSG.getMessage( Keys.ATTMPT_COPY_FILE_TO_FILE,sourceFile,targetFile));
-      try
-      {
-         copy( new FileInputStream( sourceFile ), targetFile );
-      }
-      catch ( IOException ioe )
-      {
-         throw new IOException( MSG.getMessage( Keys.FAILED_TO_CPY_FILE_TO_FILE,sourceFile.getAbsolutePath(  )
-                                   , targetFile.getAbsolutePath(  ) , ioe.getMessage() ));
-      }
-   }
-
-   /**
-    * Deletes all files and subdirectories under dir. Returns true if all deletions were successful. If a deletion
-    * fails, the method stops attempting to delete and returns false.
-    */
-   public static boolean deleteDir( File dir )
-   {
-      LOG.debug(MSG.getMessage( Keys.ATTMPT_DEL_DIR, dir.toString()));
-      if ( dir.isDirectory(  ) )
-      {
-         String[] children = dir.list(  );
-         for ( int i = 0; i < children.length; i++ )
-         {
-            boolean success = deleteDir( new File( dir, children[i] ) );
-            if ( !success )
-            {
-               return false;
-            }
-         }
-      }
-
-      // The directory is now empty so delete it
-      return dir.delete(  );
-   }
-
-   /**
-    * Converts a ByteArrayOutputStream into a ByteArrayInputStream.
-    *
-    * @param out
-    *
-    * @return ByteArrayInputStream
-    */
-   public static ByteArrayInputStream toByteArrayInputStream( ByteArrayOutputStream out )
-   {
-      return new ByteArrayInputStream( out.toByteArray(  ) );
-   }
-
-   /**
-    * Convert the specified string to an input stream.
-    *
-    * @param str a string
-    *
-    * @return an input stream
-    */
-   public static InputStream toInputStream( String str )
-   {
-      LOG.debug(MSG.getMessage( Keys.ATTMPT_CNVRT_STRING_TO_INPTSTRM, str));
-      try
-      {
-         return ( new ByteArrayInputStream( str.getBytes( "UTF-8" ) ) );
-      }
-      catch ( UnsupportedEncodingException uee )
-      { // this should never occur - UTF-8 is always supported
-         uee.printStackTrace(  );
-
-         // return using the current locale encoding
-         return ( new ByteArrayInputStream( str.getBytes(  ) ) );
-      }
-   }
-
-   /**
-    * TODO
-    *
-    * @param in
-    *
-    * @return
-    *
-    * @throws IOException
-    */
-   public static String toString( InputStream in )
-   throws IOException
-   {
-      return toString( in,
-                       Converters.getDefaultEncodingName(  ) );
-   }
-
-   /**
-    * TODO
-    *
-    * @param in
-    * @param encoding
-    *
-    * @return
-    *
-    * @throws IOException
-    */
-   public static String toString( InputStream in,
-                                  String      encoding )
-   throws IOException
-   {
-      ByteArrayOutputStream out = new ByteArrayOutputStream(  );
-      copy( in, out );
-      return out.toString( encoding );
-   }
+    /**
+     * Converts a ByteArrayOutputStream into a ByteArrayInputStream.
+     *
+     * @param out
+     *
+     * @return ByteArrayInputStream
+     */
+    public static ByteArrayInputStream toByteArrayInputStream( ByteArrayOutputStream out )
+    {
+        return new ByteArrayInputStream( out.toByteArray() );
+    }
+
+    /**
+     * Convert the specified string to an input stream.
+     *
+     * @param str a string
+     *
+     * @return an input stream
+     */
+    public static InputStream toInputStream( String str )
+    {
+        LOG.debug( MSG.getMessage( Keys.ATTMPT_CNVRT_STRING_TO_INPTSTRM, str ) );
+        try
+        {
+            return ( new ByteArrayInputStream( str.getBytes( "UTF-8" ) ) );
+        }
+        catch ( UnsupportedEncodingException uee )
+        { // this should never occur - UTF-8 is always supported
+            uee.printStackTrace();
+
+            // return using the current locale encoding
+            return ( new ByteArrayInputStream( str.getBytes() ) );
+        }
+    }
 
 }

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/NameUtils.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/NameUtils.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/NameUtils.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/NameUtils.java Wed Jul 27 13:59:36 2005
@@ -78,10 +78,7 @@
       {
          start_index = prefix.lastIndexOf( ':' );
       }
-
-      //todo commented until better solution is completed
-      //boolean vs Boolean....this would generate the same prefix as it stands....
-      //prefix = prefix.substring( start_index + 1 ).toLowerCase();
+      
       prefix = prefix.substring( start_index + 1 );
 
       String newPrefix = prefix;

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/WsrfWsdlUtils.java Wed Jul 27 13:59:36 2005
@@ -60,7 +60,8 @@
         List specOps = specPortType.getOperations();
         if ( specOps.size() == 0 )
         {
-            return false; //todo need to determine if props are present for portTypes which have no methods.
+            return false;
+            // TODO (v1.1): need to determine if props are present for portTypes which have no ops.
         }
         boolean foundSome = false;
         for ( int i = 0; i < specOps.size(); i++ )
@@ -261,8 +262,7 @@
         {
             throw new PrefixResolutionException( prefix );
         }
-        QName qName = new QName( namespace, localName, prefix );
-        return qName;
+        return new QName( namespace, localName, prefix );        
     }
 
     private static String[] findImportsAndIncludes( Element schemaElem, String namespaceURI )
@@ -390,7 +390,7 @@
      * @param def a JWSDL definition
      *
      * @return array of DOM elements, representing any xsd:schema elements within the specified definition's types section
-     */ 
+     */
     public static Element[] getSchemaElements( Definition def )
     {
         List schemaElems = new ArrayList();

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/XmlBeanNameUtils.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/XmlBeanNameUtils.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/XmlBeanNameUtils.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/XmlBeanNameUtils.java Wed Jul 27 13:59:36 2005
@@ -20,11 +20,12 @@
 import javax.xml.namespace.QName;
 
 /**
- * TODO
+ * A set of utility methods for obtaining the names of the Java classes associated with
+ * a particular qualified element name.
  *
  * @author Ian Springer
  */
-public class XmlBeanNameUtils
+public abstract class XmlBeanNameUtils
 {
 
     /**
@@ -34,7 +35,7 @@
      *
      * @return DOCUMENT_ME
      */
-    public static String getElementXmlBeanClassName( final QName propsDocElemQName )
+    public static String getElementXmlBeanClassName( QName propsDocElemQName )
     {
        return getDocumentElementXmlBeanClassName( propsDocElemQName ) + "."
               + getElementXmlBeanUnqualifiedClassName( propsDocElemQName );

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/XmlBeanUtils.java Wed Jul 27 13:59:36 2005
@@ -52,12 +52,12 @@
     private static final Messages MSG = MessagesImpl.getInstance();
 
     /**
-     * TODO
+     * Returns an array containing all child elements, with the specified name, of the specified XMLBean.
      *
-     * @param xBean
-     * @param name  name to look for, or null to return all child elements
+     * @param xBean an XMLBean that represents an XML element
+     * @param name the name to look for, or null to return all child elements
      *
-     * @return
+     * @return an array containing all child elements, with the specified name, of the specified XMLBean
      */
     public static XmlObject[] getChildElements( XmlObject xBean,
                                                 QName name )
@@ -77,11 +77,11 @@
     }
 
     /**
-     * TODO
+     * Returns an array containing all child elements of the specified XMLBean.
      *
-     * @param xBean
+     * @param xBean an XMLBean that represents an XML element
      *
-     * @return
+     * @return an array containing all child elements of the specified XMLBean
      */
     public static XmlObject[] getChildElements( XmlObject xBean )
     {
@@ -89,11 +89,11 @@
     }
 
     /**
-     * DOCUMENT_ME
+     * Returns true if the specified XMLBean represents an XML document, or false if it does not.
      *
-     * @param xBean DOCUMENT_ME
+     * @param xBean an XMLBean
      *
-     * @return DOCUMENT_ME
+     * @return true if the specified XMLBean represents an XML document, or false if it does not
      */
     public static boolean isDocument( XmlObject xBean )
     {
@@ -286,49 +286,6 @@
     }
 
     /**
-     * Returns a Map keyed on Element QName to a List containing the "Any" XmlObjects types.
-     * <p/>
-     * The way we determine that an element is an Any is by asking for the element property of the schemaType for the
-     * element by the element's QName.
-     *
-     * @param xmlObjectToSearch The XmlObject to find the Any elements in.
-     *
-     * @return Map keyed on Element QName to a List containing the "Any" XmlObjects
-     */
-    public static Map getXmlBeanAnyMap( XmlObject xmlObjectToSearch )
-    {
-        Map qnameToListMap = new HashMap();
-        XmlCursor xCursor = xmlObjectToSearch.newCursor();
-        for ( boolean hasNext = xCursor.toFirstChild(); hasNext; hasNext = xCursor.toNextSibling() )
-        {
-            XmlObject siblingXmlObject = xCursor.getObject();
-            QName siblingXmlObjectQname = getName(siblingXmlObject);
-
-            // TODO: should this be tested against the original bean
-            //if it contains the ElementProperty, then it is not an Any
-            if ( siblingXmlObject.schemaType().getElementProperty( siblingXmlObjectQname ) != null )
-            {
-                continue;
-            }
-
-            //check to see if we have a xmlObjectList to add to for this QName
-            List xmlObjectList = (List) qnameToListMap.get( siblingXmlObjectQname );
-
-            if ( xmlObjectList == null )
-            {
-                xmlObjectList = new ArrayList();
-            }
-
-            xmlObjectList.add( siblingXmlObject );
-            qnameToListMap.put( siblingXmlObjectQname, xmlObjectList );
-        }
-
-        xCursor.dispose();
-
-        return qnameToListMap;
-    }
-
-    /**
      * Adds a copy of the XmlBean <code>newChild</code> as the last child
      * of the XmlBean <code>parent</code>.
      *
@@ -549,14 +506,18 @@
     }
 
     /**
-     * 
-     * @param elemName
-     * @return
+     * Creates a new XMLBean element with the specified name.
+     *
+     * @param elemName the element name
+     *
+     * @return a new XMLBean element with the specified name
      */
     public XmlObject newInstance( QName elemName )
     {
         XmlObject xBean = XmlObject.Factory.newInstance();
-        // TODO: finish implementing
+        XmlCursor xCursor = xBean.newCursor();
+        xCursor.setName( elemName );
+        xCursor.dispose();
         return xBean;
     }
 
@@ -642,6 +603,49 @@
        }
 
        return destXBeans;
+    }
+
+    /**
+     * Returns a Map keyed on Element QName to a List containing the "Any" XmlObjects types.
+     * <p/>
+     * The way we determine that an element is an Any is by asking for the element property of the schemaType for the
+     * element by the element's QName.
+     *
+     * @param xmlObjectToSearch The XmlObject to find the Any elements in.
+     *
+     * @return Map keyed on Element QName to a List containing the "Any" XmlObjects
+     */
+    public static Map getXmlBeanAnyMap( XmlObject xmlObjectToSearch )
+    {
+        Map qnameToListMap = new HashMap();
+        XmlCursor xCursor = xmlObjectToSearch.newCursor();
+        for ( boolean hasNext = xCursor.toFirstChild(); hasNext; hasNext = xCursor.toNextSibling() )
+        {
+            XmlObject siblingXmlObject = xCursor.getObject();
+            QName siblingXmlObjectQname = getName(siblingXmlObject);
+
+            // TODO (low priority): should this be tested against the original bean?
+            //if it contains the ElementProperty, then it is not an Any
+            if ( siblingXmlObject.schemaType().getElementProperty( siblingXmlObjectQname ) != null )
+            {
+                continue;
+            }
+
+            //check to see if we have a xmlObjectList to add to for this QName
+            List xmlObjectList = (List) qnameToListMap.get( siblingXmlObjectQname );
+
+            if ( xmlObjectList == null )
+            {
+                xmlObjectList = new ArrayList();
+            }
+
+            xmlObjectList.add( siblingXmlObject );
+            qnameToListMap.put( siblingXmlObjectQname, xmlObjectList );
+        }
+
+        xCursor.dispose();
+
+        return qnameToListMap;
     }
 
 }

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/i18n/doclet/ResourcePropertiesGeneratorDoclet.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/i18n/doclet/ResourcePropertiesGeneratorDoclet.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/i18n/doclet/ResourcePropertiesGeneratorDoclet.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/i18n/doclet/ResourcePropertiesGeneratorDoclet.java Wed Jul 27 13:59:36 2005
@@ -333,8 +333,7 @@
          s_file_out.newLine(  );
          s_file_out.write( "# Auto-generated " + new Date() + " from: " + keysFilePath );
          s_file_out.newLine(  );
-         s_file_out.newLine(  );
-         // TODO: bcp extract author name and include that (so translators know where to get answers about cryptic msgs)
+         s_file_out.newLine(  );         
       }
       catch ( IOException ioe )
       {

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/BasicBeanFactory.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/BasicBeanFactory.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/BasicBeanFactory.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/BasicBeanFactory.java Wed Jul 27 13:59:36 2005
@@ -1,10 +1,18 @@
-/*
- * This file or a portion of this file is licensed under the terms of the
- * Globus Toolkit Public License, found at
- * http://www.globus.org/toolkit/download/license.html.
- * If you redistribute this file, with or without modifications,
- * you must include this notice in the file.
- */
+/*=============================================================================*
+ *  Copyright 2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *=============================================================================*/
 package org.apache.ws.util.jndi;
 
 import org.apache.commons.logging.Log;
@@ -16,7 +24,12 @@
 import java.util.Hashtable;
 
 /**
- * LOG-DONE
+ * An extension of the Commons Naming {@link org.apache.naming.factory.BeanFactory}
+ * that overrides
+ * {@link org.apache.naming.factory.BeanFactory#getObjectInstance(Object, javax.naming.Name, javax.naming.Context, java.util.Hashtable)}
+ * to add support for calling init() on any bean that implements the {@link Initializable} interface.
+ *
+ * @author Globus
  */
 public class BasicBeanFactory extends org.apache.naming.factory.BeanFactory {
     

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/BeanFactory.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/BeanFactory.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/BeanFactory.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/BeanFactory.java Wed Jul 27 13:59:36 2005
@@ -1,10 +1,18 @@
-/*
- * This file or a portion of this file is licensed under the terms of the
- * Globus Toolkit Public License, found at
- * http://www.globus.org/toolkit/download/license.html.
- * If you redistribute this file, with or without modifications,
- * you must include this notice in the file.
- */
+/*=============================================================================*
+ *  Copyright 2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *=============================================================================*/
 package org.apache.ws.util.jndi;
 
 import org.apache.axis.AxisEngine;
@@ -18,13 +26,18 @@
 import java.util.Hashtable;
 
 /**
- * LOG-DONE
+ * Bean factory.
+ *
+ * @author Globus
+ *
+ * TODO (v1.1): remove Axis dependency from this class
  */
-public class BeanFactory extends BasicBeanFactory {
+public class BeanFactory extends BasicBeanFactory
+{
 
-    /**                  //todo axis package!
+    /**
      * Create a new Bean instance. If <code>obj</code> is of type
-     * {@link org.globus.wsrf.jndi.ServiceResourceRef ServiceResourceRef} the bean will be
+     * {@link ServiceResourceRef}, the bean will be
      * created and initialized with security credentials associated 
      * with the current thread if the service associated with this bean
      * has a security descriptor configured.

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/JNDIUtils.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/JNDIUtils.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/JNDIUtils.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/JNDIUtils.java Wed Jul 27 13:59:36 2005
@@ -25,12 +25,12 @@
 import java.util.StringTokenizer;
 
 /**
- * LOG-DONE A utility class containing methods for setting up the JNDI environment and performing JNDI lookups
+ * A utility class containing methods for setting up the JNDI environment and performing JNDI lookups.
  */
-public class JNDIUtils
+public abstract class JNDIUtils
 {
 
-    //TODO: most of these methods should be internal only
+    //TODO (low-priority): many of these methods should be made private
     private static Log LOG =
             LogFactory.getLog( JNDIUtils.class.getName() );
     /**

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/XmlBeanNamingContext.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/XmlBeanNamingContext.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/XmlBeanNamingContext.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/jndi/XmlBeanNamingContext.java Wed Jul 27 13:59:36 2005
@@ -33,332 +33,327 @@
 import java.util.Iterator;
 import java.util.Set;
 
-/**  LOG-DONE
- *  Note.  Could not extend NamingContext, there is no default constructor..
- * We should address this later..//todo
- *
- * @author $author$
- * @version $Revision: 1.4 $
+/**
+ * JNDI naming context.
  */
 public class XmlBeanNamingContext
 {
-   private static Log LOG  = LogFactory.getLog( XmlBeanNamingContext.class.getName(  ) );
-   private Context    m_context;
+    private static Log LOG = LogFactory.getLog( XmlBeanNamingContext.class.getName() );
+    private Context m_context;
 
-   /**
-    * Creates a new {@link XmlBeanNamingContext} object.
-    *
-    * @param context DOCUMENT_ME
-
-    */
-   public XmlBeanNamingContext( Context    context )
-   {
-      m_context    = context;
-   }
-
-   /**
-    * DOCUMENT_ME
-    *
-    * @param environment DOCUMENT_ME
-    *
-    * @throws IllegalArgumentException DOCUMENT_ME
-    * @throws NamingException          DOCUMENT_ME
-    */
-   public void addEnvironment( Environment environment )
-   throws IllegalArgumentException, 
-          NamingException
-   {
-      Object value = null;
-
-      // Instantiate a new instance of the correct object type, and
-      // initialize it.
-      String type = environment.getType(  );
-      LOG.debug("Attempting to add environment for type: " + type);
-      try
-      {
-         if ( type.equals( "java.lang.String" ) )
-         {
-            value = environment.getValue(  );
-         }
-         else if ( type.equals( "java.lang.Byte" ) )
-         {
-            if ( environment.getValue(  ) == null )
-            {
-               value = new Byte( (byte) 0 );
-            }
-            else
-            {
-               value = Byte.decode( environment.getValue(  ) );
-            }
-         }
-         else if ( type.equals( "java.lang.Short" ) )
-         {
-            if ( environment.getValue(  ) == null )
-            {
-               value = new Short( (short) 0 );
-            }
-            else
-            {
-               value = Short.decode( environment.getValue(  ) );
-            }
-         }
-         else if ( type.equals( "java.lang.Integer" ) )
-         {
-            if ( environment.getValue(  ) == null )
-            {
-               value = new Integer( 0 );
-            }
-            else
-            {
-               value = Integer.decode( environment.getValue(  ) );
-            }
-         }
-         else if ( type.equals( "java.lang.Long" ) )
-         {
-            if ( environment.getValue(  ) == null )
-            {
-               value = new Long( 0 );
-            }
-            else
-            {
-               value = Long.decode( environment.getValue(  ) );
-            }
-         }
-         else if ( type.equals( "java.lang.Boolean" ) )
-         {
-            value = Boolean.valueOf( environment.getValue(  ) );
-         }
-         else if ( type.equals( "java.lang.Double" ) )
-         {
-            if ( environment.getValue(  ) == null )
-            {
-               value = new Double( 0 );
+    /**
+     * Creates a new {@link XmlBeanNamingContext} object.
+     *
+     * @param context DOCUMENT_ME
+     */
+    public XmlBeanNamingContext( Context context )
+    {
+        m_context = context;
+    }
+
+    /**
+     * DOCUMENT_ME
+     *
+     * @param environment DOCUMENT_ME
+     *
+     * @throws IllegalArgumentException DOCUMENT_ME
+     * @throws NamingException          DOCUMENT_ME
+     */
+    public void addEnvironment( Environment environment )
+            throws IllegalArgumentException,
+            NamingException
+    {
+        Object value = null;
+
+        // Instantiate a new instance of the correct object type, and
+        // initialize it.
+        String type = environment.getType();
+        LOG.debug( "Attempting to add environment for type: " + type );
+        try
+        {
+            if ( type.equals( "java.lang.String" ) )
+            {
+                value = environment.getValue();
+            }
+            else if ( type.equals( "java.lang.Byte" ) )
+            {
+                if ( environment.getValue() == null )
+                {
+                    value = new Byte( (byte) 0 );
+                }
+                else
+                {
+                    value = Byte.decode( environment.getValue() );
+                }
+            }
+            else if ( type.equals( "java.lang.Short" ) )
+            {
+                if ( environment.getValue() == null )
+                {
+                    value = new Short( (short) 0 );
+                }
+                else
+                {
+                    value = Short.decode( environment.getValue() );
+                }
+            }
+            else if ( type.equals( "java.lang.Integer" ) )
+            {
+                if ( environment.getValue() == null )
+                {
+                    value = new Integer( 0 );
+                }
+                else
+                {
+                    value = Integer.decode( environment.getValue() );
+                }
+            }
+            else if ( type.equals( "java.lang.Long" ) )
+            {
+                if ( environment.getValue() == null )
+                {
+                    value = new Long( 0 );
+                }
+                else
+                {
+                    value = Long.decode( environment.getValue() );
+                }
+            }
+            else if ( type.equals( "java.lang.Boolean" ) )
+            {
+                value = Boolean.valueOf( environment.getValue() );
+            }
+            else if ( type.equals( "java.lang.Double" ) )
+            {
+                if ( environment.getValue() == null )
+                {
+                    value = new Double( 0 );
+                }
+                else
+                {
+                    value = Double.valueOf( environment.getValue() );
+                }
+            }
+            else if ( type.equals( "java.lang.Float" ) )
+            {
+                if ( environment.getValue() == null )
+                {
+                    value = new Float( 0 );
+                }
+                else
+                {
+                    value = Float.valueOf( environment.getValue() );
+                }
+            }
+            else if ( type.equals( "java.lang.Character" ) )
+            {
+                if ( environment.getValue() == null )
+                {
+                    value = new Character( (char) 0 );
+                }
+                else
+                {
+                    if ( environment.getValue().length() == 1 )
+                    {
+                        value = new Character( environment.getValue().charAt( 0 ) );
+                    }
+                    else
+                    {
+                        throw new IllegalArgumentException();
+                    }
+                }
             }
             else
             {
-               value = Double.valueOf( environment.getValue(  ) );
-            }
-         }
-         else if ( type.equals( "java.lang.Float" ) )
-         {
-            if ( environment.getValue(  ) == null )
-            {
-               value = new Float( 0 );
+                throw new IllegalArgumentException( "invalidType : " + type );
             }
-            else
-            {
-               value = Float.valueOf( environment.getValue(  ) );
-            }
-         }
-         else if ( type.equals( "java.lang.Character" ) )
-         {
-            if ( environment.getValue(  ) == null )
-            {
-               value = new Character( (char) 0 );
-            }
-            else
-            {
-               if ( environment.getValue(  ).length(  ) == 1 )
-               {
-                  value = new Character( environment.getValue(  ).charAt( 0 ) );
-               }
-               else
-               {
-                  throw new IllegalArgumentException(  );
-               }
-            }
-         }
-         else
-         {
-            throw new IllegalArgumentException( "invalidType : " + type );
-         }
-      }
-      catch ( NumberFormatException e )
-      {
-         String msg = "invalidValueForType : " + environment.getValue(  ) + " : " + type;
-         LOG.error( msg, e );
-         throw new IllegalArgumentException( msg );
-      }
-
-      // Bind the object to the appropriate name
-      createSubcontexts( environment.getName(  ) );
-      this.m_context.bind( environment.getName(  ),
-                         value );
-      if ( LOG.isDebugEnabled(  ) )
-      {
-         LOG.debug( "Added environment entry with name: " + environment.getName(  ) );
-         LOG.debug( "value: " + value + " and type: " + environment.getType(  ) );
-      }
-   }
-
-   /**
-    * DOCUMENT_ME
-    *
-    * @param resource DOCUMENT_ME
-    *
-    * @throws NamingException DOCUMENT_ME
-    */
-   public void addResource( Resource resource )
-   throws NamingException
-   {
-      Reference reference =
-         new ResourceRef( resource.getType(  ),
-                          resource.getDescription(  ),
-                          resource.getScope(  ),
-                          resource.getAuth(  ) );
-      this.addParameters( reference,
-                          resource.getParameters(  ) );
-      this.createSubcontexts( resource.getName(  ) );
-      this.m_context.bind( resource.getName(  ),
-                         reference );
-      LOG.debug( "Added resource entry with name: " + resource.getName(  ) );
-   }
-
-   public Context getContext()
-   {
-       return m_context;
-   }
-
-   public void bind(String name, Object ref) throws NamingException
-   {
-       this.m_context.bind( name, ref );
-   }
-   /**
-    * DOCUMENT_ME
-    *
-    * @param resourceLink DOCUMENT_ME
-    *
-    * @throws NamingException DOCUMENT_ME
-    */
-   public void addResourceLink( ResourceLink resourceLink )
-   throws NamingException
-   {
-      LinkRef link = new LinkRef( resourceLink.getTarget(  ) );
-      this.createSubcontexts( resourceLink.getName(  ) );
-      this.m_context.bind( resourceLink.getName(  ),
-                         link );
-      if ( LOG.isDebugEnabled(  ) )
-      {
-         LOG.debug( "Added resource link with name: " + resourceLink.getName(  ) );
-         LOG.debug( "Pointing to: " + resourceLink.getTarget(  ) );
-      }
-   }
-
-   /**
-    * DOCUMENT_ME
-    *
-    * @param subContext DOCUMENT_ME
-    *
-    * @throws NamingException DOCUMENT_ME
-    */
-   public void addService( ConfigContext subContext )
-   throws NamingException
-   {
-      String        serviceName  = subContext.getName(  );
-      Set           names;
-      Iterator      nameIterator;
-      XmlBeanNamingContext newContext;
-
-      JNDIUtils.createSubcontexts( m_context, serviceName );
-
-      try
-      {
-         newContext = new XmlBeanNamingContext( m_context.createSubcontext( serviceName )
-                                        );
-         LOG.debug( "Created new subcontext with name: " + serviceName );
-      }
-      catch ( Exception e )
-      {
-         newContext = new XmlBeanNamingContext( (Context) m_context.lookup( serviceName ) );
-         LOG.debug( "Adding entries to existing subcontext with name: " + serviceName );
-      }
-
-      names           = subContext.getEnvironmentNames(  );
-      nameIterator    = names.iterator(  );
-
-      while ( nameIterator.hasNext(  ) )
-      {
-         newContext.addEnvironment( subContext.getEnvironment( (String) nameIterator.next(  ) ) );
-      }
-
-      names           = subContext.getResourceNames(  );
-      nameIterator    = names.iterator(  );
-
-      while ( nameIterator.hasNext(  ) )
-      {
-         newContext.addServiceResource( subContext.getResource( (String) nameIterator.next(  ) ),
-                                        serviceName );
-      }
-
-      names           = subContext.getResourceLinkNames(  );
-      nameIterator    = names.iterator(  );
-
-      while ( nameIterator.hasNext(  ) )
-      {
-         newContext.addResourceLink( subContext.getResourceLink( (String) nameIterator.next(  ) ) );
-      }
-   }
-
-   /**
-    * DOCUMENT_ME
-    *
-    * @param resource    DOCUMENT_ME
-    * @param serviceName DOCUMENT_ME
-    *
-    * @throws NamingException DOCUMENT_ME
-    */
-   public void addServiceResource( Resource resource,
-                                   String   serviceName )
-   throws NamingException
-   {
-      Reference reference =
-         new XmlBeanServiceResourceRef( resource.getType(  ),
-                                 resource.getDescription(  ),
-                                 resource.getScope(  ),
-                                 resource.getAuth(  ), serviceName );
-      this.addParameters( reference,
-                          resource.getParameters(  ) );
-      this.createSubcontexts( resource.getName(  ) );
-      this.m_context.bind( resource.getName(  ),
-                         reference );
-      LOG.debug( "Added service resource entry with name: " + resource.getName(  ) );
-   }
-
-   /**
-    * DOCUMENT_ME
-    *
-    * @param subContext DOCUMENT_ME
-    *
-    * @throws NamingException DOCUMENT_ME
-    */
-   public void addSubContext( ConfigContext subContext )
-   throws NamingException
-   {
-      addService( subContext );
-   }
-
-   private void addParameters( Reference          reference,
-                               ResourceParameters parameters )
-   {
-      if ( parameters != null )
-      {
-         Set      names         = parameters.getParameterNames(  );
-         Iterator nameIterator  = names.iterator(  );
-         RefAddr  parameter;
-         String   parameterName;
-         while ( nameIterator.hasNext(  ) )
-         {
-            parameterName    = (String) nameIterator.next(  );
-            parameter        = new StringRefAddr( parameterName,
-                                                  parameters.getParameter( parameterName ) );
-            reference.add( parameter );
-         }
-      }
-   }
-
-   private void createSubcontexts( String name )
-   throws NamingException
-   {
-      JNDIUtils.createSubcontexts( this.m_context, name );
-   }
+        }
+        catch ( NumberFormatException e )
+        {
+            String msg = "invalidValueForType : " + environment.getValue() + " : " + type;
+            LOG.error( msg, e );
+            throw new IllegalArgumentException( msg );
+        }
+
+        // Bind the object to the appropriate name
+        createSubcontexts( environment.getName() );
+        this.m_context.bind( environment.getName(),
+                value );
+        if ( LOG.isDebugEnabled() )
+        {
+            LOG.debug( "Added environment entry with name: " + environment.getName() );
+            LOG.debug( "value: " + value + " and type: " + environment.getType() );
+        }
+    }
+
+    /**
+     * DOCUMENT_ME
+     *
+     * @param resource DOCUMENT_ME
+     *
+     * @throws NamingException DOCUMENT_ME
+     */
+    public void addResource( Resource resource )
+            throws NamingException
+    {
+        Reference reference =
+                new ResourceRef( resource.getType(),
+                        resource.getDescription(),
+                        resource.getScope(),
+                        resource.getAuth() );
+        this.addParameters( reference,
+                resource.getParameters() );
+        this.createSubcontexts( resource.getName() );
+        this.m_context.bind( resource.getName(),
+                reference );
+        LOG.debug( "Added resource entry with name: " + resource.getName() );
+    }
+
+    public Context getContext()
+    {
+        return m_context;
+    }
+
+    public void bind( String name, Object ref ) throws NamingException
+    {
+        this.m_context.bind( name, ref );
+    }
+
+    /**
+     * DOCUMENT_ME
+     *
+     * @param resourceLink DOCUMENT_ME
+     *
+     * @throws NamingException DOCUMENT_ME
+     */
+    public void addResourceLink( ResourceLink resourceLink )
+            throws NamingException
+    {
+        LinkRef link = new LinkRef( resourceLink.getTarget() );
+        this.createSubcontexts( resourceLink.getName() );
+        this.m_context.bind( resourceLink.getName(),
+                link );
+        if ( LOG.isDebugEnabled() )
+        {
+            LOG.debug( "Added resource link with name: " + resourceLink.getName() );
+            LOG.debug( "Pointing to: " + resourceLink.getTarget() );
+        }
+    }
+
+    /**
+     * DOCUMENT_ME
+     *
+     * @param subContext DOCUMENT_ME
+     *
+     * @throws NamingException DOCUMENT_ME
+     */
+    public void addService( ConfigContext subContext )
+            throws NamingException
+    {
+        String serviceName = subContext.getName();
+        Set names;
+        Iterator nameIterator;
+        XmlBeanNamingContext newContext;
+
+        JNDIUtils.createSubcontexts( m_context, serviceName );
+
+        try
+        {
+            newContext = new XmlBeanNamingContext( m_context.createSubcontext( serviceName ) );
+            LOG.debug( "Created new subcontext with name: " + serviceName );
+        }
+        catch ( Exception e )
+        {
+            newContext = new XmlBeanNamingContext( (Context) m_context.lookup( serviceName ) );
+            LOG.debug( "Adding entries to existing subcontext with name: " + serviceName );
+        }
+
+        names = subContext.getEnvironmentNames();
+        nameIterator = names.iterator();
+
+        while ( nameIterator.hasNext() )
+        {
+            newContext.addEnvironment( subContext.getEnvironment( (String) nameIterator.next() ) );
+        }
+
+        names = subContext.getResourceNames();
+        nameIterator = names.iterator();
+
+        while ( nameIterator.hasNext() )
+        {
+            newContext.addServiceResource( subContext.getResource( (String) nameIterator.next() ),
+                    serviceName );
+        }
+
+        names = subContext.getResourceLinkNames();
+        nameIterator = names.iterator();
+
+        while ( nameIterator.hasNext() )
+        {
+            newContext.addResourceLink( subContext.getResourceLink( (String) nameIterator.next() ) );
+        }
+    }
+
+    /**
+     * DOCUMENT_ME
+     *
+     * @param resource    DOCUMENT_ME
+     * @param serviceName DOCUMENT_ME
+     *
+     * @throws NamingException DOCUMENT_ME
+     */
+    public void addServiceResource( Resource resource,
+                                    String serviceName )
+            throws NamingException
+    {
+        Reference reference =
+                new XmlBeanServiceResourceRef( resource.getType(),
+                        resource.getDescription(),
+                        resource.getScope(),
+                        resource.getAuth(), serviceName );
+        this.addParameters( reference,
+                resource.getParameters() );
+        this.createSubcontexts( resource.getName() );
+        this.m_context.bind( resource.getName(),
+                reference );
+        LOG.debug( "Added service resource entry with name: " + resource.getName() );
+    }
+
+    /**
+     * DOCUMENT_ME
+     *
+     * @param subContext DOCUMENT_ME
+     *
+     * @throws NamingException DOCUMENT_ME
+     */
+    public void addSubContext( ConfigContext subContext )
+            throws NamingException
+    {
+        addService( subContext );
+    }
+
+    private void addParameters( Reference reference,
+                                ResourceParameters parameters )
+    {
+        if ( parameters != null )
+        {
+            Set names = parameters.getParameterNames();
+            Iterator nameIterator = names.iterator();
+            RefAddr parameter;
+            String parameterName;
+            while ( nameIterator.hasNext() )
+            {
+                parameterName = (String) nameIterator.next();
+                parameter = new StringRefAddr( parameterName,
+                        parameters.getParameter( parameterName ) );
+                reference.add( parameter );
+            }
+        }
+    }
+
+    private void createSubcontexts( String name )
+            throws NamingException
+    {
+        JNDIUtils.createSubcontexts( this.m_context, name );
+    }
 }

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerImpl.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerImpl.java Wed Jul 27 13:59:36 2005
@@ -34,10 +34,10 @@
    implements Timer
 {
    private static final Log LOG = LogFactory.getLog( TimerImpl.class );
-    public static final Messages MSG = MessagesImpl.getInstance();
-   private TimerTaskImpl timerTask;
-   private TimerListener        listener;
-   private long                 period;
+   private static final Messages MSG = MessagesImpl.getInstance();
+   private TimerTaskImpl m_timerTask;
+   private TimerListener m_listener;
+   private long          m_period;
 
    /**
     * Creates a new {@link TimerImpl} object.
@@ -48,8 +48,8 @@
    public TimerImpl( TimerListener listener,
                      long          period )
    {
-      this.period      = period;
-      this.listener    = listener;
+      this.m_period      = period;
+      this.m_listener    = listener;
    }
 
    /* (non-Javadoc)
@@ -57,7 +57,7 @@
     */
    public long getPeriod(  )
    {
-      return this.period;
+      return this.m_period;
    }
 
    /**
@@ -69,8 +69,8 @@
     */
    public long getScheduledExecutionTime(  )
    throws IllegalStateException
-   { //todo implement
-      return 0;
+   {
+      return 0; // TODO: implement
    }
 
    /* (non-Javadoc)
@@ -78,7 +78,7 @@
     */
    public TimerListener getTimerListener(  )
    {
-      return this.listener;
+      return this.m_listener;
    }
 
    /* (non-Javadoc)
@@ -87,13 +87,11 @@
    public boolean cancel(  )
    {
       LOG.debug(MSG.getMessage( Keys.CANCELLING));
-
-      if ( this.listener instanceof CancelTimerListener )
+      if ( this.m_listener instanceof CancelTimerListener )
       {
-         ( (CancelTimerListener) this.listener ).timerCancel( this );
+         ( (CancelTimerListener) this.m_listener ).timerCancel( this );
       }
-
-      return timerTask.cancel(  );
+      return m_timerTask.cancel(  );
    }
 
    /* (non-Javadoc)
@@ -101,7 +99,7 @@
     */
    public long scheduledExecutionTime(  )
    {
-      return this.timerTask.scheduledExecutionTime(  ) + this.period;
+      return this.m_timerTask.scheduledExecutionTime(  ) + this.m_period;
    }
 
    /**
@@ -109,7 +107,7 @@
     */
    protected void setTimerTask( TimerTaskImpl timerTask )
    {
-      this.timerTask = timerTask;
+      this.m_timerTask = timerTask;
    }
 
    /**
@@ -117,6 +115,6 @@
     */
    protected TimerTaskImpl getTimerTask(  )
    {
-      return this.timerTask;
+      return this.m_timerTask;
    }
 }

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerManagerImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerManagerImpl.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerManagerImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/timer/TimerManagerImpl.java Wed Jul 27 13:59:36 2005
@@ -42,20 +42,20 @@
    implements TimerManager
 {
    private static final Log LOG = LogFactory.getLog( TimerManagerImpl.class );
-   public static final Messages MSG = MessagesImpl.getInstance();
-   private int  poolSize     = 1;
-   private List taskList     = new LinkedList(  );
-   private List timerPool    = new ArrayList(  );
-   private int  currentTimer = 0;
+   private static final Messages MSG = MessagesImpl.getInstance();
+   private int  m_poolSize     = 1;
+   private List m_taskList     = new LinkedList(  );
+   private List m_timerPool    = new ArrayList(  );
+   private int  m_currentTimer = 0;
 
    /**
     * Creates a new {@link TimerManagerImpl} object.
     */
    public TimerManagerImpl(  )
    {
-      for ( int i = 0; i < this.poolSize; i++ )
+      for ( int i = 0; i < this.m_poolSize; i++ )
       {
-         timerPool.add( new java.util.Timer( true ) );
+         m_timerPool.add( new java.util.Timer( true ) );
       }
    }
 
@@ -68,12 +68,11 @@
    {
       LOG.debug(MSG.getMessage( Keys.SET_POOL_SIZE, Integer.toString(poolSize)));
       // don't allow shrinking of the pool
-      for ( int i = this.poolSize; i < poolSize; i++ )
+      for ( int i = this.m_poolSize; i < poolSize; i++ )
       {
-         timerPool.add( new java.util.Timer( true ) );
+         m_timerPool.add( new java.util.Timer( true ) );
       }
-
-      this.poolSize = poolSize;
+      this.m_poolSize = poolSize;
    }
 
    /**
@@ -83,7 +82,7 @@
     */
    public int getPoolSize(  )
    {
-      return this.poolSize;
+      return this.m_poolSize;
    }
 
    /**
@@ -132,7 +131,7 @@
    public synchronized void resume(  )
    {
       LOG.debug(MSG.getMessage( Keys.RESUMING));
-      Iterator taskIterator = this.taskList.iterator(  );
+      Iterator taskIterator = this.m_taskList.iterator(  );
       while ( taskIterator.hasNext(  ) )
       {
          ( (TimerTaskImpl) taskIterator.next(  ) ).resume(  );
@@ -152,11 +151,11 @@
                           Date          firstTime,
                           long          period )
    {
-      java.util.Timer timer = (java.util.Timer) timerPool.get( this.currentTimer );
-      this.currentTimer = ( this.currentTimer + 1 ) % this.poolSize;
+      java.util.Timer timer = (java.util.Timer) m_timerPool.get( this.m_currentTimer );
+      this.m_currentTimer = ( this.m_currentTimer + 1 ) % this.m_poolSize;
       Timer                newTimer = new TimerImpl( listener, period );
       TimerTaskImpl task = new TimerTaskImpl( newTimer, this );
-      this.taskList.add( task );
+      this.m_taskList.add( task );
       timer.schedule( task, firstTime, period );
       return newTimer;
    }
@@ -172,11 +171,11 @@
    public Timer schedule( TimerListener listener,
                           Date          time )
    {
-      java.util.Timer timer = (java.util.Timer) timerPool.get( this.currentTimer );
-      this.currentTimer = ( this.currentTimer + 1 ) % this.poolSize;
+      java.util.Timer timer = (java.util.Timer) m_timerPool.get( this.m_currentTimer );
+      this.m_currentTimer = ( this.m_currentTimer + 1 ) % this.m_poolSize;
       Timer                newTimer = new TimerImpl( listener, 0 );
       TimerTaskImpl task = new TimerTaskImpl( newTimer, this );
-      this.taskList.add( task );
+      this.m_taskList.add( task );
       timer.schedule( task, time );
       return newTimer;
    }
@@ -194,11 +193,11 @@
                           long          delay,
                           long          period )
    {
-      java.util.Timer timer = (java.util.Timer) timerPool.get( this.currentTimer );
-      this.currentTimer = ( this.currentTimer + 1 ) % this.poolSize;
+      java.util.Timer timer = (java.util.Timer) m_timerPool.get( this.m_currentTimer );
+      this.m_currentTimer = ( this.m_currentTimer + 1 ) % this.m_poolSize;
       Timer                newTimer = new TimerImpl( listener, period );
       TimerTaskImpl task = new TimerTaskImpl( newTimer, this );
-      this.taskList.add( task );
+      this.m_taskList.add( task );
       timer.schedule( task, delay, period );
       return newTimer;
    }
@@ -214,11 +213,11 @@
    public Timer schedule( TimerListener listener,
                           long          delay )
    {
-      java.util.Timer timer = (java.util.Timer) timerPool.get( this.currentTimer );
-      this.currentTimer = ( this.currentTimer + 1 ) % this.poolSize;
+      java.util.Timer timer = (java.util.Timer) m_timerPool.get( this.m_currentTimer );
+      this.m_currentTimer = ( this.m_currentTimer + 1 ) % this.m_poolSize;
       Timer                newTimer = new TimerImpl( listener, 0 );
       TimerTaskImpl task = new TimerTaskImpl( newTimer, this );
-      this.taskList.add( task );
+      this.m_taskList.add( task );
       timer.schedule( task, delay );
       return newTimer;
    }
@@ -236,11 +235,11 @@
                                      Date          firstTime,
                                      long          period )
    {
-      java.util.Timer timer = (java.util.Timer) timerPool.get( this.currentTimer );
-      this.currentTimer = ( this.currentTimer + 1 ) % this.poolSize;
+      java.util.Timer timer = (java.util.Timer) m_timerPool.get( this.m_currentTimer );
+      this.m_currentTimer = ( this.m_currentTimer + 1 ) % this.m_poolSize;
       Timer                newTimer = new TimerImpl( listener, period );
       TimerTaskImpl task = new TimerTaskImpl( newTimer, this );
-      this.taskList.add( task );
+      this.m_taskList.add( task );
       timer.scheduleAtFixedRate( task, firstTime, period );
       return newTimer;
    }
@@ -258,11 +257,11 @@
                                      long          delay,
                                      long          period )
    {
-      java.util.Timer timer = (java.util.Timer) timerPool.get( this.currentTimer );
-      this.currentTimer = ( this.currentTimer + 1 ) % this.poolSize;
+      java.util.Timer timer = (java.util.Timer) m_timerPool.get( this.m_currentTimer );
+      this.m_currentTimer = ( this.m_currentTimer + 1 ) % this.m_poolSize;
       Timer                newTimer = new TimerImpl( listener, period );
       TimerTaskImpl task = new TimerTaskImpl( newTimer, this );
-      this.taskList.add( task );
+      this.m_taskList.add( task );
       timer.scheduleAtFixedRate( task, delay, period );
       return newTimer;
    }
@@ -273,22 +272,18 @@
    public synchronized void stop(  )
    {
       LOG.debug(MSG.getMessage( Keys.STOPPING));
-      Iterator             taskIterator = this.taskList.iterator(  );
-      TimerTaskImpl task;
-      TimerListener        listener;
-
+      Iterator taskIterator = this.m_taskList.iterator(  );
       while ( taskIterator.hasNext(  ) )
       {
-         task = (TimerTaskImpl) taskIterator.next(  );
+         TimerTaskImpl task = (TimerTaskImpl) taskIterator.next(  );
          task.stop(  );
-         listener = task.getListener(  );
+         TimerListener listener = task.getListener(  );
          if ( listener instanceof StopTimerListener )
          {
             ( (StopTimerListener) listener ).timerStop( task.getTimer(  ) );
          }
       }
-
-      this.taskList.clear(  );
+      this.m_taskList.clear(  );
    }
 
    /**
@@ -297,7 +292,7 @@
    public synchronized void suspend(  )
    {
       LOG.debug(MSG.getMessage( Keys.SUSPENDING));
-      Iterator taskIterator = this.taskList.iterator(  );
+      Iterator taskIterator = this.m_taskList.iterator(  );
       while ( taskIterator.hasNext(  ) )
       {
          ( (TimerTaskImpl) taskIterator.next(  ) ).suspend(  );
@@ -348,6 +343,7 @@
    protected synchronized void removeTask( Object task )
    {
       LOG.debug(MSG.getMessage( Keys.REMOVING_TASK,task.toString()));
-      this.taskList.remove( task );
+      this.m_taskList.remove( task );
    }
-}
\ No newline at end of file
+
+}

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/work/WorkItemImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/work/WorkItemImpl.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/work/WorkItemImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/work/WorkItemImpl.java Wed Jul 27 13:59:36 2005
@@ -20,16 +20,13 @@
 import commonj.work.WorkItem;
 
 /**
- * LOG-DONE
- * DOCUMENT_ME
- *
- * @author $author$
- * @version $Revision: 1.5 $
+ * An implementation of the CommonJ work item interface.
  */
 public class WorkItemImpl
    implements WorkItem
 {
-   private int status = -1;
+
+   private int m_status = -1;
 
    /**
     * DOCUMENT_ME
@@ -40,8 +37,8 @@
     */
    public Work getResult(  )
    throws WorkException
-   { //todo fix
-      return null;
+   {
+      return null; // TODO: implement
    }
 
    /* (non-Javadoc)
@@ -49,7 +46,7 @@
     */
    public synchronized int getStatus(  )
    {
-      return this.status;
+      return m_status;
    }
 
    /**
@@ -60,19 +57,20 @@
     * @return DOCUMENT_ME
     */
    public int compareTo( Object o )
-   { //todo fix
-      return 0;
+   {
+      return 0; // TODO: implement
    }
 
    /**
-    * @param status The status to set.
+    * @param status the new status
     */
    protected synchronized void setStatus( int status )
    {
-      // only set status if new status is later in the sequence
-      if ( status > this.status )
+      // only update status if new status is later in the sequence
+      if ( status > m_status )
       {
-         this.status = status;
+         m_status = status;
       }
    }
+
 }

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/work/WorkManagerImpl.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/work/WorkManagerImpl.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/work/WorkManagerImpl.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/work/WorkManagerImpl.java Wed Jul 27 13:59:36 2005
@@ -390,7 +390,8 @@
        * @see java.lang.Runnable#run()
        */
       public void run(  )
-      { //todo fix this
+      {
+         // TODO: fix this (what's wrong with it?)
          WorkItem  workItem = new WorkItemImpl(  );
 
          WorkEvent event = new WorkEventImpl( WorkEvent.WORK_STARTED, workItem );

Modified: webservices/wsrf/trunk/src/java/org/apache/ws/util/xml/impl/DomNamespaceContext.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/java/org/apache/ws/util/xml/impl/DomNamespaceContext.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/java/org/apache/ws/util/xml/impl/DomNamespaceContext.java (original)
+++ webservices/wsrf/trunk/src/java/org/apache/ws/util/xml/impl/DomNamespaceContext.java Wed Jul 27 13:59:36 2005
@@ -85,14 +85,14 @@
 
     public String getPrefix( String namespaceURI )
     {
-        // TODO
+        // TODO (low-priority)
         return null;
     }
 
     public Iterator getPrefixes( String namespaceURI )
     {
         List prefixes = new ArrayList();
-        // TODO
+        // TODO (low-priority)
         return prefixes.iterator();
     }
 

Modified: webservices/wsrf/trunk/src/test/org/apache/ws/resource/metadataexchange/v2004_09/MetadataExchangePortTypeTest.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/test/org/apache/ws/resource/metadataexchange/v2004_09/MetadataExchangePortTypeTest.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/test/org/apache/ws/resource/metadataexchange/v2004_09/MetadataExchangePortTypeTest.java (original)
+++ webservices/wsrf/trunk/src/test/org/apache/ws/resource/metadataexchange/v2004_09/MetadataExchangePortTypeTest.java Wed Jul 27 13:59:36 2005
@@ -1,21 +1,7 @@
 package org.apache.ws.resource.metadataexchange.v2004_09;
 
 import org.apache.ws.resource.properties.v2004_06.porttype.impl.AbstractWsrpPortTypeImplTestCase;
-import org.apache.ws.resource.properties.SushiResourceContext;
-import org.apache.ws.resource.metadataexchange.v2004_09.porttype.impl.MetadataExchangePortTypeImpl;
 import org.apache.ws.util.jndi.XmlBeanJndiUtils;
-import org.apache.xmlbeans.XmlObject;
-import org.apache.wsfx.wsrf.jndi.config.MetadataConfigDocument;
-import org.apache.commons.io.CopyUtils;
-import org.xmlsoap.schemas.ws.x2004.x09.mex.AnyXmlType;
-import org.xmlsoap.schemas.ws.x2004.x09.mex.GetMetadataDocument;
-import org.xmlsoap.schemas.ws.x2004.x09.mex.MetadataDocument;
-
-import javax.naming.InitialContext;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-
 
 /**
  * @author Sal Campana
@@ -26,22 +12,25 @@
     protected void setUp() throws Exception
     {
         super.setUp();
-        XmlBeanJndiUtils.initFromInputStream(this.getClass().getClassLoader().getResourceAsStream("org/apache/ws/resource/metadataexchange/v2004_09/jndi-config.xml"));
+        XmlBeanJndiUtils.initFromInputStream(
+                this.getClass().getClassLoader().getResourceAsStream(
+                        "org/apache/ws/resource/metadataexchange/v2004_09/jndi-config.xml" ) );
     }
-       //todo figure out how to do this test with url, epr and filesystem in junit
+
+    //todo figure out how to do this test with url, epr and filesystem in junit
     public void testGetMetadata()
     {
-       /*SushiResourceContext context = new SushiResourceContext();
-       MetadataExchangePortTypeImpl portTypeImpl = new MetadataExchangePortTypeImpl(context);
-        GetMetadataDocument getMetadataDocument = GetMetadataDocument.Factory.newInstance();
-        GetMetadataDocument.GetMetadata request = getMetadataDocument.addNewGetMetadata();
-        request.setDialect("http://schemas.xmlsoap.org/wsdl");
+        /*SushiResourceContext context = new SushiResourceContext();
+        MetadataExchangePortTypeImpl portTypeImpl = new MetadataExchangePortTypeImpl(context);
+         GetMetadataDocument getMetadataDocument = GetMetadataDocument.Factory.newInstance();
+         GetMetadataDocument.GetMetadata request = getMetadataDocument.addNewGetMetadata();
+         request.setDialect("http://schemas.xmlsoap.org/wsdl");
 
-        MetadataDocument metadata = portTypeImpl.getMetadata(getMetadataDocument);
+         MetadataDocument metadata = portTypeImpl.getMetadata(getMetadataDocument);
 
-        assertNotNull(metadata);*/
+         assertNotNull(metadata);*/
 
-        assertTrue(true);
+        assertTrue( true );
     }
 
     public void testGet()
@@ -52,8 +41,7 @@
        AnyXmlType anyXmlType = portTypeImpl.get();
        assertNotNull(anyXmlType);
         */
-        assertTrue(true);
+        assertTrue( true );
     }
-
 
 }

Modified: webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/AbstractResourcePropertiesTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/AbstractResourcePropertiesTestCase.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/AbstractResourcePropertiesTestCase.java (original)
+++ webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/AbstractResourcePropertiesTestCase.java Wed Jul 27 13:59:36 2005
@@ -36,9 +36,9 @@
 import java.net.URLClassLoader;
 
 /**
- * TODO
+ * Base class for test cases for WSRP portType impls.
  *
- * @author Ian P. Springer (Hewlett-Packard Company)
+ * @author Ian Springer
  */
 public abstract class AbstractResourcePropertiesTestCase extends TestCase
 {

Modified: webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertySetTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertySetTestCase.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertySetTestCase.java (original)
+++ webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertySetTestCase.java Wed Jul 27 13:59:36 2005
@@ -164,7 +164,7 @@
    public void testToElement()
          throws Exception
    {
-      //TODO: Test goes here...
+      // TODO (low priority): implement
    }
 
    /**
@@ -175,9 +175,7 @@
    public void testToSOAPElement()
          throws Exception
    {
-      //TODO: Test goes here...
+      //TODO (low priority): implement
    }
 
-
-
-}
\ No newline at end of file
+}

Modified: webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertyTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertyTestCase.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertyTestCase.java (original)
+++ webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/impl/XmlBeansResourcePropertyTestCase.java Wed Jul 27 13:59:36 2005
@@ -214,18 +214,18 @@
    /**
     * Test for XmlBeansResourceProperty#toElements.
     */
-   public void testToElement()
+   public void testToElements()
          throws Exception
    {
-      //TODO: Test goes here...
+      // TODO (low priority): implement
    }
 
    /**
     * Test for XmlBeansResourceProperty#toSOAPElements.
     */
-   public void testToSOAPElement()
+   public void testToSOAPElements()
          throws Exception
    {
-      //TODO: Test goes here...
+      // TODO (low priority): implement
    }
 }

Modified: webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/AbstractWsrpPortTypeImplTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/AbstractWsrpPortTypeImplTestCase.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/AbstractWsrpPortTypeImplTestCase.java (original)
+++ webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/AbstractWsrpPortTypeImplTestCase.java Wed Jul 27 13:59:36 2005
@@ -30,11 +30,11 @@
 import javax.xml.namespace.QName;
 
 /**
- * TODO
+ * Base class for test cases for WSRP portType impls.
  *
- * @author Ian P. Springer (Hewlett-Packard Company)
+ * @author Ian Springer
  */
-public class AbstractWsrpPortTypeImplTestCase extends AbstractResourcePropertiesTestCase
+public abstract class AbstractWsrpPortTypeImplTestCase extends AbstractResourcePropertiesTestCase
 {
 
     protected static final String INITIAL_PROP_VALUE_FUGU = "dangerous!";

Modified: webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesProviderTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesProviderTestCase.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesProviderTestCase.java (original)
+++ webservices/wsrf/trunk/src/test/org/apache/ws/resource/properties/v2004_06/porttype/impl/SetResourcePropertiesProviderTestCase.java Wed Jul 27 13:59:36 2005
@@ -164,14 +164,10 @@
         }
     }
 
-    public void testDeleteOpenContent() throws Exception
+    public void testDeleteAnyPropFromOpenContentPropsDoc() throws Exception
     {
         m_resourceContext = new SushiResourceContext( true );
         deleteResourceProperty( SushiPropertyQNames.FUGU );
-        GetResourcePropertyResponseDocument.GetResourcePropertyResponse getResourcePropertyResponse = getResourceProperty(
-                SushiPropertyQNames.OHTORO );
-        //todo better way to validate
-        assertNotNull( getResourcePropertyResponse );
     }
 
     public void testDeleteResourcePropertiesCallback() throws Exception

Modified: webservices/wsrf/trunk/src/test/org/apache/ws/util/XmlBeanUtilsTestCase.java
URL: http://svn.apache.org/viewcvs/webservices/wsrf/trunk/src/test/org/apache/ws/util/XmlBeanUtilsTestCase.java?rev=225633&r1=225632&r2=225633&view=diff
==============================================================================
--- webservices/wsrf/trunk/src/test/org/apache/ws/util/XmlBeanUtilsTestCase.java (original)
+++ webservices/wsrf/trunk/src/test/org/apache/ws/util/XmlBeanUtilsTestCase.java Wed Jul 27 13:59:36 2005
@@ -154,13 +154,7 @@
      */
     public void testGetName()
     {
-        assertEquals( SushiPropertyQNames.OPEN_SUSHI_PROPERTIES,
-                XmlBeanUtils.getName( m_propsDoc ) );
-        // TODO: use reflection to reenable the below assertions
-        //assertEquals( SushiPropertyQNames.SUSHI_PROPERTIES,
-        //              XmlBeanUtils.getName( m_propsDoc.getSushiProperties() ) );
-        //assertEquals( SushiPropertyQNames.EBI,
-        //              XmlBeanUtils.getName( m_propsDoc.getSushiProperties(  ).xgetEbi(  ) ) );
+        assertEquals( SushiPropertyQNames.OPEN_SUSHI_PROPERTIES, XmlBeanUtils.getName( m_propsDoc ) );
     }
 
     /**



Mime
View raw message