jlaskowski    2005/06/19 18:40:33

  Modified:    modules/core/src/java/org/openejb/util ClasspathUtils.java
                        HashThreadLocal.java Logger.java
                        OpenEJBErrorHandler.java SafeToolkit.java
                        StringUtilities.java package.html
  Log:

  A step towards cutting the 1.0 release:
    o openejb:release goal to cut a release
    o polishing the sources so that javadoc is built without any errors or 
warnings
    o Add javadoc to release in openejb:release
  
  Revision  Changes    Path
  1.9       +5 -10     
openejb1/modules/core/src/java/org/openejb/util/ClasspathUtils.java
  
  Index: ClasspathUtils.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/util/ClasspathUtils.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ClasspathUtils.java       16 Jun 2005 22:29:53 -0000      1.8
  +++ ClasspathUtils.java       19 Jun 2005 22:40:33 -0000      1.9
  @@ -120,8 +120,7 @@
       /**
        * Appends the jar to the classpath of the classloader passed in.
        *
  -     * @param url
  -     *            the URL to be added to the search path of URLs
  +     * @param jar the URL to be added to the search path of URLs
        */
       public static void addJarToSystemPath(String jar) throws Exception {
           addJarToSystemPath(FileUtils.getHome().getFile(jar));
  @@ -130,8 +129,7 @@
       /**
        * Appends the jar to the classpath of the classloader passed in.
        *
  -     * @param url
  -     *            the URL to be added to the search path of URLs
  +     * @param jar the URL to be added to the search path of URLs
        */
       public static void addJarToSystemPath(final File jar) throws Exception {
           addJarToSystemPath(jar.toURL());
  @@ -140,8 +138,7 @@
       /**
        * Appends the jar to the classpath of the classloader passed in.
        *
  -     * @param url
  -     *            the URL to be added to the search path of URLs
  +     * @param jar the URL to be added to the search path of URLs
        */
       public static void addJarToSystemPath(final URL jar) throws Exception {
       }
  @@ -454,9 +451,7 @@
            * Tomcat integration, but doesn't require us to include or ship any
            * Tomcat libraries.
            *
  -         * @param clazz
  -         * @return @exception
  -         *         Exception
  +         * @return URLClassLoader.addURL method instance
            */
           private java.lang.reflect.Method getAddRepositoryMethod() throws 
Exception {
               if (addRepositoryMethod == null) {
  
  
  
  1.2       +2 -11     
openejb1/modules/core/src/java/org/openejb/util/HashThreadLocal.java
  
  Index: HashThreadLocal.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/util/HashThreadLocal.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HashThreadLocal.java      26 Mar 2004 21:42:59 -0000      1.1
  +++ HashThreadLocal.java      19 Jun 2005 22:40:33 -0000      1.2
  @@ -1,15 +1,6 @@
   package org.openejb.util;
  -import java.util.HashMap;
   
  -/**
  -* This class allows thread-specific storage (TSS) of values by key, so that 
object are
  -* stored by thread identity as well as an application specific key.  This 
makes it possible 
  -* have context sensitive TSS.
  -* 
  -* @author <a href="[EMAIL PROTECTED]">Richard Monson-Haefel</a>
  -* @version $ $
  -* @see org.openejb.core.SharedLocalConnectionManager;
  -*/
  +import java.util.HashMap;
   
   /*
   * This variation of ThreadLocal accomplishes thread-specific storage by 
thread as well
  @@ -18,7 +9,7 @@
   *
   * @see org.openejb.resource.SharedLocalConnectionManager
   * @author <a href="[EMAIL PROTECTED]">Richard Monson-Haefel</a>
  -* @version $ $
  +* @version $Rev$ $Id$
   */
   public class HashThreadLocal {
       HashMap keyMap = new HashMap();
  
  
  
  1.8       +7 -9      
openejb1/modules/core/src/java/org/openejb/util/Logger.java
  
  Index: Logger.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/util/Logger.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Logger.java       16 Jun 2005 22:29:53 -0000      1.7
  +++ Logger.java       19 Jun 2005 22:40:33 -0000      1.8
  @@ -77,8 +77,6 @@
       protected Category       _logger  = null;
       public    I18N           i18n     = null;
   
  -    private static Properties props;
  -
       public static void initialize(Properties props)
       {
           Log4jConfigUtils log4j = new Logger.Log4jConfigUtils(props);
  @@ -89,8 +87,8 @@
       /**
        * Returns a shared instance of Logger.
        *
  -     * @param class   the class whose name log4j category will use
  -     * @param name    the name log4j category will use
  +     * @param category the class whose name log4j category will use
  +     * @param resourceName the name log4j category will use
        *
        * @return Instance of logger.
        */
  @@ -128,9 +126,9 @@
        * Protected constructor.  Users must invoke getInstance() to
        * an instance of Logger.
        *
  -     * @param name   the name of the log4j category to use
  +     * @param resourceName the name of the log4j category to use
        *
  -     * @see getInstance()
  +     * @see I18N
        */
       protected Logger( String resourceName ) {
        i18n = new I18N( resourceName );
  @@ -1641,7 +1639,7 @@
            * Replace log4j file-related settings to reflect OpenEJB 
configuration
            * (openejb.home and openejb.base)
            *
  -         * @param props log4j initialization properties
  +         * @param log4jProps log4j initialization properties
            * @return properties with log4j File properties changed
            */
           public Properties filterProperties(Properties log4jProps) {
  
  
  
  1.2       +2 -2      
openejb1/modules/core/src/java/org/openejb/util/OpenEJBErrorHandler.java
  
  Index: OpenEJBErrorHandler.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/util/OpenEJBErrorHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- OpenEJBErrorHandler.java  26 Mar 2004 21:43:03 -0000      1.1
  +++ OpenEJBErrorHandler.java  19 Jun 2005 22:40:33 -0000      1.2
  @@ -253,7 +253,7 @@
        *
        * @param systemLocation        replaces {0} in the error message.
        * @param className             replaces {1} in the error message.
  -     * @param codeBase              replaces {2} in the error message.
  +     * @param codebase              replaces {2} in the error message.
        * @param exceptionClassName    replaces {3} in the error message.
        * @param message               replaces {4} in the error message.
        */
  
  
  
  1.3       +18 -20    
openejb1/modules/core/src/java/org/openejb/util/SafeToolkit.java
  
  Index: SafeToolkit.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/util/SafeToolkit.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SafeToolkit.java  25 Oct 2004 12:34:44 -0000      1.2
  +++ SafeToolkit.java  19 Jun 2005 22:40:33 -0000      1.3
  @@ -75,8 +75,8 @@
        * Attempts to find and load the specified class.
        *
        * @param className the name of the class to be loaded.
  -     * @returns the specified class.
  -     * @throws OpenEJBExcption if the class cannot be found.
  +     * @return the specified class.
  +     * @throws OpenEJBException if the class cannot be found.
        */
       public Class forName(String className) throws OpenEJBException {
           Class clazz = null;
  @@ -96,8 +96,8 @@
        *
        * @param className the name of the class to be loaded.
        * @param codebase the codebase to load the class from.
  -     * @returns the specified class.
  -     * @throws OpenEJBExcption if the class cannot be found.
  +     * @return the specified class.
  +     * @throws OpenEJBException if the class cannot be found.
        */
       public Class forName(String className, String codebase) throws 
OpenEJBException{
           //ClassLoader cl = Class.class.getClassLoader();
  @@ -132,7 +132,7 @@
        * Attempts to find and load the specified class then instaniate it.
        *
        * @param className the name of the class to be instantiated.
  -     * @returns an instance of the specified class.
  +     * @return an instance of the specified class.
        * @throws OpenEJBException if the class cannot be found or is not 
accessible .
        */
       public Object newInstance(String className) throws OpenEJBException{
  @@ -143,7 +143,7 @@
        * Attempts to find and load the specified class then instaniate it.
        *
        * @param className the name of the class to be instantiated.
  -     * @returns an instance of the specified class.
  +     * @return an instance of the specified class.
        * @throws OpenEJBException if the class cannot be found or is not 
accessible .
        */
       public Object newInstance(String className, String codebase) throws 
OpenEJBException{
  @@ -153,8 +153,8 @@
       /**
        * Attempts to instaniate the specified class.
        *
  -     * @param className the name of the class to be instantiated.
  -     * @returns an instance of the specified class.
  +     * @param clazz the name of the class to be instantiated.
  +     * @return an instance of the specified class.
        * @throws OpenEJBException if the class is not accessible .
        */
       public Object newInstance(Class clazz) throws OpenEJBException{
  @@ -187,8 +187,8 @@
       /**
        * Returns a new SafeProperties instance dedicated to this toolkit.
        *
  -     * @param className the name of the class to be instantiated.
  -     * @returns a new SafeProperties instance.
  +     * @param props properties
  +     * @return a new SafeProperties instance.
        * @throws OpenEJBException the properties object passed in is null.
        */
       public SafeProperties getSafeProperties(Properties props) throws 
OpenEJBException{
  @@ -200,10 +200,9 @@
        * codebase.  If the codebase is null, the bootstrap classloader
        * is used.
        *
  -     * @param className
  +     * @param className class name
        * @param codebase
  -     * @return
  -     * @exception ClassNotFoundException
  +     * @return class object
        * @exception OpenEJBException
        */
       public static Class loadClass(String className, String codebase) throws 
OpenEJBException {
  @@ -229,7 +228,7 @@
        * classloader is used if codebase is null.
        *
        * @param codebase
  -     * @return
  +     * @return ClassLoader
        * @exception OpenEJBException
        */
       protected static ClassLoader getCodebaseClassLoader(String codebase) 
throws OpenEJBException{
  @@ -264,7 +263,7 @@
        * classloader is used if codebase is null.
        *
        * @param codebase
  -     * @return
  +     * @return ClassLoader
        * @exception OpenEJBException
        */
       protected static ClassLoader getClassLoader(String codebase) throws 
OpenEJBException{
  @@ -314,8 +313,7 @@
        *
        * @param className
        * @param codebase
  -     * @return
  -     * @exception ClassNotFoundException
  +     * @return Class
        * @exception OpenEJBException
        */
       public static Class loadTempClass( String className, String codebase ) 
throws OpenEJBException {
  @@ -345,7 +343,7 @@
        * classloader is used if codebase is null.
        *
        * @param codebase
  -     * @return
  +     * @return ClassLoader
        * @exception OpenEJBException
        */
       protected static ClassLoader getCodebaseTempClassLoader( String codebase 
) throws OpenEJBException {
  @@ -381,7 +379,7 @@
        * classloader is used if codebase is null.
        *
        * @param codebase
  -     * @return
  +     * @return ClassLoader
        * @exception OpenEJBException
        */
       protected static ClassLoader getTempClassLoader( String codebase ) 
throws OpenEJBException {
  
  
  
  1.4       +2 -2      
openejb1/modules/core/src/java/org/openejb/util/StringUtilities.java
  
  Index: StringUtilities.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/util/StringUtilities.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StringUtilities.java      16 Jun 2005 22:29:53 -0000      1.3
  +++ StringUtilities.java      19 Jun 2005 22:40:33 -0000      1.4
  @@ -98,7 +98,7 @@
        /**
         * Checks a String to see if it's blank,
         * and if so returns null (the opposite of 
<code>nullToBlankString</code>.
  -      * @param stringToCheckForNull - the string to check for blank
  +      * @param stringToCheckForBlank the string to check for blank
         * @return the checked string or null
         */
        public static String blankToNullString(String stringToCheckForBlank) {
  
  
  
  1.3       +2 -3      
openejb1/modules/core/src/java/org/openejb/util/package.html
  
  Index: package.html
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb1/modules/core/src/java/org/openejb/util/package.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- package.html      8 Jul 2004 11:55:27 -0000       1.2
  +++ package.html      19 Jun 2005 22:40:33 -0000      1.3
  @@ -67,8 +67,7 @@
   
   <!-- Put @see and @since tags down here. -->
   @see org.openejb.core.ContainerSystem
  [EMAIL PROTECTED] org.openejb.core.ContainerManager
  [EMAIL PROTECTED] org.openejb.core.Container
  [EMAIL PROTECTED] org.openejb.Container
   @see org.openejb.core.DeploymentInfo
   </body>
   </html>
  
  
  

Reply via email to