juddi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svi...@apache.org
Subject cvs commit: ws-juddi/src/java/org/apache/juddi/registry RegistryServlet.java
Date Fri, 04 Jun 2004 13:46:43 GMT
sviens      2004/06/04 06:46:43

  Modified:    src/java/org/apache/juddi/function AbstractFunction.java
                        FindBusinessFunction.java FindBindingFunction.java
               src/java/org/apache/juddi/datastore/jdbc JDBCDataStore.java
                        FindBindingByCategoryQuery.java
                        FindServiceByCategoryQuery.java
                        OperationalInfoTable.java
                        OperationalInfoChildTable.java
               src/java/org/apache/juddi/validator Validator.java
                        ValidatorFactory.java DefaultValidator.java
               src/java/org/apache/juddi/util/jdbc ConnectionManager.java
                        DynamicQuery.java
               src/java/org/apache/juddi/datatype/response
                        RegistryInfo.java Result.java
               src/java/org/apache/juddi/util Release.java Config.java
               src/java/org/apache/juddi/proxy AxisTransport.java
                        RegistryProxy.java
               src/java/org/apache/juddi AbstractRegistry.java
               src/java/org/apache/juddi/handler RegistryInfoHandler.java
               src/java/org/apache/juddi/auth JBossAuthenticator.java
               src/java/org/apache/juddi/datastore DataStoreFactory.java
               src/java/org/apache/juddi/registry RegistryServlet.java
  Log:
  Replacing tabs with spaces (as reported by CheckStyle)
  
  Revision  Changes    Path
  1.5       +3 -3      ws-juddi/src/java/org/apache/juddi/function/AbstractFunction.java
  
  Index: AbstractFunction.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/AbstractFunction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractFunction.java	4 Apr 2004 17:18:00 -0000	1.4
  +++ AbstractFunction.java	4 Jun 2004 13:46:41 -0000	1.5
  @@ -22,7 +22,7 @@
   import org.apache.juddi.error.AuthTokenRequiredException;
   import org.apache.juddi.error.RegistryException;
   import org.apache.juddi.registry.RegistryEngine;
  -
  + 
   /**
    * @author Steve Viens (sviens@apache.org)
    */
  @@ -36,7 +36,7 @@
      */
     protected AbstractFunction(RegistryEngine registry)
     {
  -  	this.registry = registry;
  +    this.registry = registry;
     }
     
     /**
  @@ -44,7 +44,7 @@
      */
     public RegistryEngine getRegistry()
     {
  -  	return this.registry;
  +    return this.registry;
     }
     
     /**
  
  
  
  1.7       +2 -2      ws-juddi/src/java/org/apache/juddi/function/FindBusinessFunction.java
  
  Index: FindBusinessFunction.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/FindBusinessFunction.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FindBusinessFunction.java	3 Jun 2004 14:27:10 -0000	1.6
  +++ FindBusinessFunction.java	4 Jun 2004 13:46:41 -0000	1.7
  @@ -134,7 +134,7 @@
             String name = ((Name) nameVector.elementAt(i)).getValue();
             if (name.length() > maxNameLength)
               throw new NameTooLongException(name + 
  -            		"(max=" + maxNameLength + ")");
  +                "(max=" + maxNameLength + ")");
           }
         }
   
  @@ -250,7 +250,7 @@
       finally
       {
         if (dataStore != null)
  -      	dataStore.release();
  +        dataStore.release();
       }
     }
   
  
  
  
  1.6       +1 -1      ws-juddi/src/java/org/apache/juddi/function/FindBindingFunction.java
  
  Index: FindBindingFunction.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/function/FindBindingFunction.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FindBindingFunction.java	30 Apr 2004 03:52:25 -0000	1.5
  +++ FindBindingFunction.java	4 Jun 2004 13:46:42 -0000	1.6
  @@ -180,7 +180,7 @@
       finally
       {
         if (dataStore != null)
  -      	dataStore.release();
  +        dataStore.release();
       }
     }
   
  
  
  
  1.5       +2 -2      ws-juddi/src/java/org/apache/juddi/datastore/jdbc/JDBCDataStore.java
  
  Index: JDBCDataStore.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/JDBCDataStore.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JDBCDataStore.java	1 May 2004 02:19:15 -0000	1.4
  +++ JDBCDataStore.java	4 Jun 2004 13:46:42 -0000	1.5
  @@ -98,8 +98,8 @@
       try {
         if (connection != null)
         {
  -      	this.connection.close();
  -      	this.connection = null;
  +        this.connection.close();
  +        this.connection = null;
         }
       }
       catch(SQLException sqlex) {
  
  
  
  1.3       +32 -32    ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBindingByCategoryQuery.java
  
  Index: FindBindingByCategoryQuery.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindBindingByCategoryQuery.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FindBindingByCategoryQuery.java	1 May 2004 00:55:12 -0000	1.2
  +++ FindBindingByCategoryQuery.java	4 Jun 2004 13:46:42 -0000	1.3
  @@ -124,38 +124,38 @@
         sql.addValue(serviceKey);
       }
       
  -	  if(categoryBag != null)
  -	  {
  -	    Vector keyedRefVector = categoryBag.getKeyedReferenceVector();
  -	
  -	    if(keyedRefVector != null)
  -	    {
  -	      int vectorSize = keyedRefVector.size();
  -	      if (vectorSize > 0)
  -	      {
  -	        sql.append("AND (");
  -	
  -	        for (int i=0; i<vectorSize; i++)
  -	        {
  -	          KeyedReference keyedRef = (KeyedReference)keyedRefVector.elementAt(i);
  -	          String name = keyedRef.getKeyName();
  -	          String value = keyedRef.getKeyValue();
  -	
  -	          if ((name != null) && (value != null))
  -	          {
  -	            sql.append("(C.KEY_NAME = ? AND C.KEY_VALUE = ?)");
  -	            sql.addValue(name);
  -	            sql.addValue(value);
  -	
  -	            if (i+1 < vectorSize)
  -	              sql.append(" OR ");
  -	          }
  -	        }
  -	
  -	        sql.append(") ");
  -	      }
  -	    }
  -	  }
  +    if(categoryBag != null)
  +    {
  +      Vector keyedRefVector = categoryBag.getKeyedReferenceVector();
  +  
  +      if(keyedRefVector != null)
  +      {
  +        int vectorSize = keyedRefVector.size();
  +        if (vectorSize > 0)
  +        {
  +          sql.append("AND (");
  +  
  +          for (int i=0; i<vectorSize; i++)
  +          {
  +            KeyedReference keyedRef = (KeyedReference)keyedRefVector.elementAt(i);
  +            String name = keyedRef.getKeyName();
  +            String value = keyedRef.getKeyValue();
  +  
  +            if ((name != null) && (value != null))
  +            {
  +              sql.append("(C.KEY_NAME = ? AND C.KEY_VALUE = ?)");
  +              sql.addValue(name);
  +              sql.addValue(value);
  +  
  +              if (i+1 < vectorSize)
  +                sql.append(" OR ");
  +            }
  +          }
  +  
  +          sql.append(") ");
  +        }
  +      }
  +    }
     }
   
     /**
  
  
  
  1.5       +32 -32    ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindServiceByCategoryQuery.java
  
  Index: FindServiceByCategoryQuery.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindServiceByCategoryQuery.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FindServiceByCategoryQuery.java	1 May 2004 00:55:12 -0000	1.4
  +++ FindServiceByCategoryQuery.java	4 Jun 2004 13:46:42 -0000	1.5
  @@ -123,38 +123,38 @@
         sql.addValue(businessKey);
       }
       
  -	  if(categoryBag != null)
  -	  {
  -	    Vector keyedRefVector = categoryBag.getKeyedReferenceVector();
  -	
  -	    if(keyedRefVector != null)
  -	    {
  -	      int vectorSize = keyedRefVector.size();
  -	      if (vectorSize > 0)
  -	      {
  -	        sql.append("AND (");
  -	
  -	        for (int i=0; i<vectorSize; i++)
  -	        {
  -	          KeyedReference keyedRef = (KeyedReference)keyedRefVector.elementAt(i);
  -	          String name = keyedRef.getKeyName();
  -	          String value = keyedRef.getKeyValue();
  -	
  -	          if ((name != null) && (value != null))
  -	          {
  -	            sql.append("(C.KEY_NAME = ? AND C.KEY_VALUE = ?)");
  -	            sql.addValue(name);
  -	            sql.addValue(value);
  -	
  -	            if (i+1 < vectorSize)
  -	              sql.append(" OR ");
  -	          }
  -	        }
  -	
  -	        sql.append(") ");
  -	      }
  -	    }
  -	  }
  +    if(categoryBag != null)
  +    {
  +      Vector keyedRefVector = categoryBag.getKeyedReferenceVector();
  +  
  +      if(keyedRefVector != null)
  +      {
  +        int vectorSize = keyedRefVector.size();
  +        if (vectorSize > 0)
  +        {
  +          sql.append("AND (");
  +  
  +          for (int i=0; i<vectorSize; i++)
  +          {
  +            KeyedReference keyedRef = (KeyedReference)keyedRefVector.elementAt(i);
  +            String name = keyedRef.getKeyName();
  +            String value = keyedRef.getKeyValue();
  +  
  +            if ((name != null) && (value != null))
  +            {
  +              sql.append("(C.KEY_NAME = ? AND C.KEY_VALUE = ?)");
  +              sql.addValue(name);
  +              sql.addValue(value);
  +  
  +              if (i+1 < vectorSize)
  +                sql.append(" OR ");
  +            }
  +          }
  +  
  +          sql.append(") ");
  +        }
  +      }
  +    }
     }
   
     /**
  
  
  
  1.3       +3 -3      ws-juddi/src/java/org/apache/juddi/datastore/jdbc/OperationalInfoTable.java
  
  Index: OperationalInfoTable.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/OperationalInfoTable.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- OperationalInfoTable.java	23 May 2004 20:48:43 -0000	1.2
  +++ OperationalInfoTable.java	4 Jun 2004 13:46:42 -0000	1.3
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2001-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.
  
  
  
  1.3       +3 -3      ws-juddi/src/java/org/apache/juddi/datastore/jdbc/OperationalInfoChildTable.java
  
  Index: OperationalInfoChildTable.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/OperationalInfoChildTable.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- OperationalInfoChildTable.java	23 May 2004 20:48:43 -0000	1.2
  +++ OperationalInfoChildTable.java	4 Jun 2004 13:46:42 -0000	1.3
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2001-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.
  
  
  
  1.2       +4 -4      ws-juddi/src/java/org/apache/juddi/validator/Validator.java
  
  Index: Validator.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/validator/Validator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Validator.java	2 Jun 2004 22:20:45 -0000	1.1
  +++ Validator.java	4 Jun 2004 13:46:42 -0000	1.2
  @@ -18,7 +18,7 @@
   import org.apache.juddi.datatype.CategoryBag;
   import org.apache.juddi.datatype.IdentifierBag;
   import org.apache.juddi.datatype.KeyedReference;
  -import org.apache.juddi.error.RegistryException;
  +import org.apache.juddi.error.RegistryException; 
   
   /**
    * @author Steve Viens (sviens@apache.org)
  @@ -32,7 +32,7 @@
      * @throws RegistryException
      */
     boolean validate(CategoryBag bag)
  -  	throws RegistryException;
  +    throws RegistryException;
   
     /**
      *
  @@ -41,7 +41,7 @@
      * @throws RegistryException
      */
     boolean validate(IdentifierBag bag)
  -  	throws RegistryException;
  +    throws RegistryException;
   
     /**
      *
  @@ -50,5 +50,5 @@
      * @throws RegistryException
      */
     boolean validate(KeyedReference ref)
  -  	throws RegistryException;
  +    throws RegistryException;
   }
  
  
  
  1.2       +2 -2      ws-juddi/src/java/org/apache/juddi/validator/ValidatorFactory.java
  
  Index: ValidatorFactory.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/validator/ValidatorFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ValidatorFactory.java	2 Jun 2004 22:20:45 -0000	1.1
  +++ ValidatorFactory.java	4 Jun 2004 13:46:42 -0000	1.2
  @@ -116,9 +116,9 @@
           System.out.println("Got a Validation instance: "+validation.getClass().getName());
   
           if (validation.validate(new CategoryBag()))
  -        	System.out.println("The objct was successfully validated.");
  +          System.out.println("The objct was successfully validated.");
           else
  -        	System.out.println("Sorry validation failed.");
  +          System.out.println("Sorry validation failed.");
         }
         else
           System.out.println("Couldn't get a Validation instance.");
  
  
  
  1.2       +4 -4      ws-juddi/src/java/org/apache/juddi/validator/DefaultValidator.java
  
  Index: DefaultValidator.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/validator/DefaultValidator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultValidator.java	2 Jun 2004 22:20:45 -0000	1.1
  +++ DefaultValidator.java	4 Jun 2004 13:46:42 -0000	1.2
  @@ -20,7 +20,7 @@
   import org.apache.juddi.datatype.CategoryBag;
   import org.apache.juddi.datatype.IdentifierBag;
   import org.apache.juddi.datatype.KeyedReference;
  -import org.apache.juddi.error.RegistryException;
  +import org.apache.juddi.error.RegistryException; 
   
   /**
    * This is a simple implementation of jUDDI's Validation interface.
  @@ -45,7 +45,7 @@
     public boolean validate(CategoryBag bag)
       throws RegistryException
     {
  -  	return true;
  +    return true;
     }
   
     /**
  @@ -54,7 +54,7 @@
     public boolean validate(IdentifierBag bag)
       throws RegistryException
     {
  -  	return true;
  +    return true;
     }
   
     /**
  @@ -63,7 +63,7 @@
     public boolean validate(KeyedReference ref)
       throws RegistryException
     {
  -  	return true;
  +    return true;
     }
   
   
  
  
  
  1.4       +7 -7      ws-juddi/src/java/org/apache/juddi/util/jdbc/ConnectionManager.java
  
  Index: ConnectionManager.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/util/jdbc/ConnectionManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ConnectionManager.java	3 Jun 2004 14:29:42 -0000	1.3
  +++ ConnectionManager.java	4 Jun 2004 13:46:42 -0000	1.4
  @@ -21,7 +21,7 @@
   import javax.naming.InitialContext;
   import javax.naming.NamingException;
   import javax.sql.DataSource;
  -
  + 
   import org.apache.commons.dbcp.ConnectionFactory;
   import org.apache.commons.dbcp.DriverManagerConnectionFactory;
   import org.apache.commons.dbcp.PoolableConnectionFactory;
  @@ -45,8 +45,8 @@
   
     // DBCP DataSource property keys and default values
     private static final String USE_CONNECTION_POOL_VALUE_KEY = "juddi.useConnectionPool";
  -	private static final boolean DEFAULT_USE_CONNECTION_POOL_VALUE = false;
  -	
  +  private static final boolean DEFAULT_USE_CONNECTION_POOL_VALUE = false;
  +  
     private static final String JDBC_DRIVER_KEY = "juddi.jdbcDriver";
     private static final String DEFAULT_JDBC_DRIVER = "com.mysql.jdbc.Driver";
   
  @@ -95,9 +95,9 @@
         return dataSource;
   
       boolean useInternalConnectionPool = 
  -    	Config.getBooleanProperty(USE_CONNECTION_POOL_VALUE_KEY,
  -    			DEFAULT_USE_CONNECTION_POOL_VALUE);
  -		
  +      Config.getBooleanProperty(USE_CONNECTION_POOL_VALUE_KEY,
  +          DEFAULT_USE_CONNECTION_POOL_VALUE);
  +    
       if (useInternalConnectionPool)
       {
         if (dataSource == null)
  @@ -195,7 +195,7 @@
       {
         String dataSourceName =
           Config.getStringProperty(RegistryEngine.PROPNAME_DATASOURCE_NAME,
  -        		RegistryEngine.DEFAULT_DATASOURCE_NAME);
  +            RegistryEngine.DEFAULT_DATASOURCE_NAME);
   
         log.info("Using JNDI to aquire a JDBC DataSource with " +
           "name: "+dataSourceName);
  
  
  
  1.2       +23 -23    ws-juddi/src/java/org/apache/juddi/util/jdbc/DynamicQuery.java
  
  Index: DynamicQuery.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/util/jdbc/DynamicQuery.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DynamicQuery.java	30 Apr 2004 03:49:26 -0000	1.1
  +++ DynamicQuery.java	4 Jun 2004 13:46:42 -0000	1.2
  @@ -36,30 +36,30 @@
      */
     public DynamicQuery()
     {
  -  	this.values = new Vector();
  -  	this.sql = new StringBuffer();
  +    this.values = new Vector();
  +    this.sql = new StringBuffer();
     } 
     
     public DynamicQuery(String sql)
     {
  -  	this.values = new Vector();
  -  	this.sql = new StringBuffer(sql);
  +    this.values = new Vector();
  +    this.sql = new StringBuffer(sql);
     }
     
     public void append(String sql)
  -	{
  -  	this.sql.append(sql);
  -	}
  +  {
  +    this.sql.append(sql);
  +  }
     
     public void addValue(Object obj)
     {
  -  	this.values.addElement(obj);
  +    this.values.addElement(obj);
     }
     
     public PreparedStatement buildPreparedStatement(Connection connection)
  -  	throws SQLException
  +    throws SQLException
     {
  -  	PreparedStatement stmt = connection.prepareStatement(sql.toString());
  +    PreparedStatement stmt = connection.prepareStatement(sql.toString());
       for (int i=0; i<values.size(); i++)
         stmt.setObject(i+1,values.elementAt(i));
       
  @@ -68,21 +68,21 @@
     
     public String toString()
     { 
  -  	StringBuffer buffer = new StringBuffer(sql.toString());
  -  	buffer.append("\n\n");
  -  	
  +    StringBuffer buffer = new StringBuffer(sql.toString());
  +    buffer.append("\n\n");
  +    
       for (int i=0; i<values.size(); i++)
       {
  -    	Object obj = values.elementAt(i);
  -    	
  -    	buffer.append(i+1);
  -    	buffer.append("\t");
  -    	buffer.append(obj.getClass().getName());
  -    	buffer.append("\t");
  -    	buffer.append(obj.toString());
  -    	buffer.append("\n");
  +      Object obj = values.elementAt(i);
  +      
  +      buffer.append(i+1);
  +      buffer.append("\t");
  +      buffer.append(obj.getClass().getName());
  +      buffer.append("\t");
  +      buffer.append(obj.toString());
  +      buffer.append("\n");
       }
  -  	
  -  	return buffer.toString();
  +    
  +    return buffer.toString();
     }
   }
  
  
  
  1.2       +40 -41    ws-juddi/src/java/org/apache/juddi/datatype/response/RegistryInfo.java
  
  Index: RegistryInfo.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datatype/response/RegistryInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RegistryInfo.java	28 May 2004 04:46:25 -0000	1.1
  +++ RegistryInfo.java	4 Jun 2004 13:46:42 -0000	1.2
  @@ -19,7 +19,6 @@
   
   import org.apache.juddi.datatype.RegistryObject;
   
  -
   /**
    * @author Steve Viens (sviens@apache.org)
    */
  @@ -27,49 +26,49 @@
   {
     String generic;
     String operator;
  -	Properties properties;
  +  Properties properties;
   
     /**
      * Constructs a new initialized Addressline instance.
      */
     public RegistryInfo()
     {
  -  	properties = new Properties();
  +    properties = new Properties();
     } 
   
  -	/**
  -	 *
  -	 * @param genericValue
  -	 */
  -	public void setGeneric(String genericValue)
  -	{
  -	  this.generic = genericValue;
  -	}
  -
  -	/**
  -	 *
  -	 * @return String UDDI generic value.
  -	 */
  -	public String getGeneric()
  -	{
  -	  return this.generic;
  -	}
  -
  -	/**
  -	 *
  -	 */
  -	public void setOperator(String operator)
  -	{
  -	  this.operator = operator;
  -	}
  -
  -	/**
  -	 *
  -	 */
  -	public String getOperator()
  -	{
  -	  return this.operator;
  -	}
  +  /**
  +   *
  +   * @param genericValue
  +   */
  +  public void setGeneric(String genericValue)
  +  {
  +    this.generic = genericValue;
  +  }
  +
  +  /**
  +   *
  +   * @return String UDDI generic value.
  +   */
  +  public String getGeneric()
  +  {
  +    return this.generic;
  +  }
  +
  +  /**
  +   *
  +   */
  +  public void setOperator(String operator)
  +  {
  +    this.operator = operator;
  +  }
  +
  +  /**
  +   *
  +   */
  +  public String getOperator()
  +  {
  +    return this.operator;
  +  }
     
     /**
      * @param name The name of the property being added.
  @@ -98,10 +97,10 @@
      */
     public void addProperty(Property prop)
     {
  -  	if (prop == null)
  -  		return;
  -  	
  -  	properties.put(prop.getName(),prop.getValue());
  +    if (prop == null)
  +      return;
  +    
  +    properties.put(prop.getName(),prop.getValue());
     }
     
     /**
  @@ -109,6 +108,6 @@
      */
     public Properties getProperties()
     {
  -  	return properties;
  +    return properties;
     }
   }
  
  
  
  1.4       +6 -6      ws-juddi/src/java/org/apache/juddi/datatype/response/Result.java
  
  Index: Result.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datatype/response/Result.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Result.java	27 May 2004 01:44:11 -0000	1.3
  +++ Result.java	4 Jun 2004 13:46:42 -0000	1.4
  @@ -260,9 +260,9 @@
     public static final int E_INVALID_TIME = 40030;
     public static final String E_INVALID_TIME_CODE = "E_invalidTime";
     public static final String E_INVALID_TIME_MSG = "Signifies that the time " +
  -		"period, the date/time, or the pair of date/time is invalid. The error " +
  -		"structure signifies the condition that occurred and the error text " +
  -		"clearly calls out the cause of the problem.";
  +    "period, the date/time, or the pair of date/time is invalid. The error " +
  +    "structure signifies the condition that occurred and the error text " +
  +    "clearly calls out the cause of the problem.";
   
     // Signifies that the UDDI node deems that a result set from an inquiry 
     // is too large, and requests to obtain the results are not honored, even 
  @@ -271,9 +271,9 @@
     public static final int E_RESULT_SET_TOO_LARGE = 40300;
     public static final String E_RESULT_SET_TOO_LARGE_CODE = "E_resultSetTooLarge";
     public static final String E_RESULT_SET_TOO_LARGE_MSG = "Signifies that the " +
  -		"UDDI node deems that a result set from an inquiry is too large, and " +
  -		"requests to obtain the results are not honored, even using subsets.  " +
  -		"The inquiry that triggered this error should be refined and re-issued.";
  +    "UDDI node deems that a result set from an inquiry is too large, and " +
  +    "requests to obtain the results are not honored, even using subsets.  " +
  +    "The inquiry that triggered this error should be refined and re-issued.";
   
     int errno;
     ErrInfo errInfo;
  
  
  
  1.2       +49 -49    ws-juddi/src/java/org/apache/juddi/util/Release.java
  
  Index: Release.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/util/Release.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Release.java	23 May 2004 06:37:14 -0000	1.1
  +++ Release.java	4 Jun 2004 13:46:42 -0000	1.2
  @@ -26,24 +26,24 @@
    */
   public class Release 
   {
  -	private static final String VERSION = "0.9rc1";
  -	
  +  private static final String VERSION = "0.9rc1";
  +  
     public static String getVersion()
     {
       return VERSION;
     }
  -	
  -	public static String getLastModified()
  -	{
  -		String filePath = getClassFileLocation(Release.class);
  -		if (filePath == null)
  -			return "Unknown";
  -		  
  -		File file = new File(filePath);
  -		long lastMod = file.lastModified();
     
  -	  return DateFormat.getDateTimeInstance(DateFormat.LONG,DateFormat.LONG).format(new Date(lastMod));
  -	}
  +  public static String getLastModified()
  +  {
  +    String filePath = getClassFileLocation(Release.class);
  +    if (filePath == null)
  +      return "Unknown";
  +      
  +    File file = new File(filePath);
  +    long lastMod = file.lastModified();
  +  
  +    return DateFormat.getDateTimeInstance(DateFormat.LONG,DateFormat.LONG).format(new Date(lastMod));
  +  }
   
     /**
      * Determine the jar file or class file containing a Java 
  @@ -53,44 +53,44 @@
      * @return the file path to the jar file or class 
      *  file where the class byte code is located.
      */
  -	private static String getClassFileLocation(Class clazz)
  +  private static String getClassFileLocation(Class clazz)
     {
       // class was found, now get it's URL
  -	  URL url = null;
  -	  try {
  -	  	url = clazz.getProtectionDomain().getCodeSource().getLocation();
  -	    if (url == null)
  -	      return "";
  -	  }
  -	  catch(Throwable t) {
  -	    return "";
  -	  }
  +    URL url = null;
  +    try {
  +      url = clazz.getProtectionDomain().getCodeSource().getLocation();
  +      if (url == null)
  +        return "";
  +    }
  +    catch(Throwable t) {
  +      return "";
  +    }
   
  -	  try
  -	  {
  -	    String location = url.toString();
  -	    if (location.startsWith("jar:file:/"))
  -	    {
  -	      File file = new File(url.getFile());
  -	      return file.getPath().substring(6);
  -	    }
  -	    else if (location.startsWith("jar")) 
  -	    {
  -	      url = ((JarURLConnection)url.openConnection()).getJarFileURL();
  -	      return url.toString();
  -	    }
  -	    else if (location.startsWith("file")) 
  -	    {
  -	      File file = new File(url.getFile());
  -	      return file.getAbsolutePath();
  -	    }
  -	    else
  -	    {
  -	      return url.toString();
  -	    }
  -	  } 
  -	  catch (Throwable t) { 
  -	    return null;
  -	  }
  +    try
  +    {
  +      String location = url.toString();
  +      if (location.startsWith("jar:file:/"))
  +      {
  +        File file = new File(url.getFile());
  +        return file.getPath().substring(6);
  +      }
  +      else if (location.startsWith("jar")) 
  +      {
  +        url = ((JarURLConnection)url.openConnection()).getJarFileURL();
  +        return url.toString();
  +      }
  +      else if (location.startsWith("file")) 
  +      {
  +        File file = new File(url.getFile());
  +        return file.getAbsolutePath();
  +      }
  +      else
  +      {
  +        return url.toString();
  +      }
  +    } 
  +    catch (Throwable t) { 
  +      return null;
  +    }
     }
   }
  
  
  
  1.10      +4 -4      ws-juddi/src/java/org/apache/juddi/util/Config.java
  
  Index: Config.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/util/Config.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Config.java	3 Jun 2004 14:31:45 -0000	1.9
  +++ Config.java	4 Jun 2004 13:46:42 -0000	1.10
  @@ -80,7 +80,7 @@
     public static String getOperator()
     {
       return getStringProperty(RegistryEngine.PROPNAME_OPERATOR_NAME,
  -    					RegistryEngine.DEFAULT_OPERATOR_NAME);    
  +              RegistryEngine.DEFAULT_OPERATOR_NAME);    
     }
   
     /**
  @@ -89,7 +89,7 @@
     public static String getOperatorURL()
     {
       return getStringProperty(RegistryEngine.PROPNAME_OPERATOR_URL,
  -    		      RegistryEngine.DEFAULT_OPERATOR_URL);
  +              RegistryEngine.DEFAULT_OPERATOR_URL);
     }
   
     /**
  @@ -98,7 +98,7 @@
     public static int getMaxNameLengthAllowed()
     {
       return getIntProperty(RegistryEngine.PROPNAME_MAX_NAME_LENGTH,
  -    					RegistryEngine.DEFAULT_MAX_NAME_LENGTH);
  +              RegistryEngine.DEFAULT_MAX_NAME_LENGTH);
     }
   
     /**
  @@ -107,7 +107,7 @@
     public static int getMaxNameElementsAllowed()
     {
       return getIntProperty(RegistryEngine.PROPNAME_MAX_NAME_ELEMENTS,
  -    					RegistryEngine.DEFAULT_MAX_NAME_ELEMENTS);
  +              RegistryEngine.DEFAULT_MAX_NAME_ELEMENTS);
     }
   
     /**
  
  
  
  1.3       +10 -10    ws-juddi/src/java/org/apache/juddi/proxy/AxisTransport.java
  
  Index: AxisTransport.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/proxy/AxisTransport.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AxisTransport.java	1 May 2004 00:51:40 -0000	1.2
  +++ AxisTransport.java	4 Jun 2004 13:46:43 -0000	1.3
  @@ -39,22 +39,22 @@
     private static Log log = LogFactory.getLog(AxisTransport.class);
   
     public Element send(Element request,URL endpointURL)
  -  	throws RegistryException
  +    throws RegistryException
     {
  -  	return this.send(request,endpointURL,false,null,0);
  +    return this.send(request,endpointURL,false,null,0);
     }
     
     public Element send(Element request,URL endpointURL,boolean proxySet,String proxyHost,int proxyPort)
       throws RegistryException
     {
  -  	// make sure we're using the correct proxy
  -  	if (proxySet)
  -  	{
  -  		System.setProperty("http.proxySet",String.valueOf(proxySet));
  -  		System.setProperty("http.proxyHost",proxyHost);
  -  		System.setProperty("http.proxyPort",String.valueOf(proxyPort));
  -  	}
  -  	
  +    // make sure we're using the correct proxy
  +    if (proxySet)
  +    {
  +      System.setProperty("http.proxySet",String.valueOf(proxySet));
  +      System.setProperty("http.proxyHost",proxyHost);
  +      System.setProperty("http.proxyPort",String.valueOf(proxyPort));
  +    }
  +    
       Service service = null;
       Call call = null;
       Element response = null;
  
  
  
  1.13      +14 -14    ws-juddi/src/java/org/apache/juddi/proxy/RegistryProxy.java
  
  Index: RegistryProxy.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/proxy/RegistryProxy.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- RegistryProxy.java	30 May 2004 11:39:39 -0000	1.12
  +++ RegistryProxy.java	4 Jun 2004 13:46:43 -0000	1.13
  @@ -114,7 +114,7 @@
           props.load(stream);
       }
       catch (IOException ioex) {
  -    	ioex.printStackTrace();
  +      ioex.printStackTrace();
       }
   
       this.init(props);
  @@ -197,8 +197,8 @@
       if (proxySet != null)
         this.setHttpProxySet(Boolean.getBoolean(proxySet));
       else
  -    	this.setHttpProxySet(Boolean.getBoolean(DEFAULT_HTTP_PROXY_SET));
  -    	
  +      this.setHttpProxySet(Boolean.getBoolean(DEFAULT_HTTP_PROXY_SET));
  +      
       String proxyHost = props.getProperty(HTTP_PROXY_HOST_PROPERTY_NAME);
       if (proxyHost != null)
         this.setHttpProxyHost(proxyHost);
  @@ -215,7 +215,7 @@
       if (transClass != null)
         this.setTransport(this.getTransport(transClass));
       else
  -    	this.setTransport(this.getTransport(DEFAULT_TRANSPORT_CLASS));
  +      this.setTransport(this.getTransport(DEFAULT_TRANSPORT_CLASS));
     }
      
      /**
  @@ -351,7 +351,7 @@
      */
     public boolean isHttpProxySet() 
     {
  -  	return httpProxySet;
  +    return httpProxySet;
     }
     
     /**
  @@ -359,7 +359,7 @@
      */
     public void setHttpProxySet(boolean httpProxySet) 
     {
  -  	this.httpProxySet = httpProxySet;
  +    this.httpProxySet = httpProxySet;
     }
   
     /**
  @@ -367,7 +367,7 @@
      */
     public String getHttpProxyHost() 
     {
  -  	return httpProxyHost;
  +    return httpProxyHost;
     }
     
     /**
  @@ -375,7 +375,7 @@
      */
     public void setHttpProxyHost(String httpProxyHost) 
     {
  -  	this.httpProxyHost = httpProxyHost;
  +    this.httpProxyHost = httpProxyHost;
     }
     
     /**
  @@ -383,7 +383,7 @@
      */
     public int getHttpProxyPort() 
     {
  -  	return httpProxyPort;
  +    return httpProxyPort;
     }
     
     /**
  @@ -391,7 +391,7 @@
      */
     public void setHttpProxyPort(int httpProxyPort) 
     {
  -  	this.httpProxyPort = httpProxyPort;
  +    this.httpProxyPort = httpProxyPort;
     }
   
     /**
  @@ -531,10 +531,10 @@
       //IRegistry registry = new RegistryProxy();
       
       // Option #2 (import proxy property values from a specified properties file)
  -  	//Properties props = new Properties();
  -  	//props.load(new FileInputStream("proxy.properties"));
  -  	//IRegistry registry = new RegistryProxy(props);
  -  	
  +    //Properties props = new Properties();
  +    //props.load(new FileInputStream("proxy.properties"));
  +    //IRegistry registry = new RegistryProxy(props);
  +    
       // Option #3 (explicitly set the proxy property values)
       //Properties props = new Properties();
       //props.setProperty(ADMIN_ENDPOINT_PROPERTY_NAME,"http://localhost:8080/uddi/admin");
  
  
  
  1.2       +18 -18    ws-juddi/src/java/org/apache/juddi/AbstractRegistry.java
  
  Index: AbstractRegistry.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/AbstractRegistry.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractRegistry.java	30 May 2004 11:39:39 -0000	1.1
  +++ AbstractRegistry.java	4 Jun 2004 13:46:43 -0000	1.2
  @@ -353,10 +353,10 @@
     public BindingDetail getBindingDetail(String bindingKey)
       throws RegistryException
     {
  -  	Vector keys = new Vector(1);
  -  	keys.addElement(bindingKey);
  -  	
  -  	return getBindingDetail(keys);
  +    Vector keys = new Vector(1);
  +    keys.addElement(bindingKey);
  +    
  +    return getBindingDetail(keys);
     }
   
     /**
  @@ -383,8 +383,8 @@
     public BusinessDetail getBusinessDetail(String businessKey)
       throws RegistryException
     {
  -  	Vector keys = new Vector(1);
  -  	keys.addElement(businessKey);
  +    Vector keys = new Vector(1);
  +    keys.addElement(businessKey);
   
       return getBusinessDetail(keys);
     }
  @@ -413,8 +413,8 @@
     public BusinessDetailExt getBusinessDetailExt(String businessKey)
       throws RegistryException
     {
  -  	Vector keys = new Vector(1);
  -  	keys.addElement(businessKey);
  +    Vector keys = new Vector(1);
  +    keys.addElement(businessKey);
   
       return getBusinessDetailExt(keys);
     }
  @@ -496,8 +496,8 @@
     public ServiceDetail getServiceDetail(String serviceKey)
       throws RegistryException
     {
  -  	Vector keys = new Vector(1);
  -  	keys.addElement(serviceKey);
  +    Vector keys = new Vector(1);
  +    keys.addElement(serviceKey);
   
       return getServiceDetail(keys);
     }
  @@ -526,8 +526,8 @@
     public TModelDetail getTModelDetail(String tModelKey)
       throws RegistryException
     {
  -  	Vector keys = new Vector(1);
  -  	keys.addElement(tModelKey);
  +    Vector keys = new Vector(1);
  +    keys.addElement(tModelKey);
   
       return getTModelDetail(keys);
     }
  @@ -644,12 +644,12 @@
      */
     public DispositionReport validateValues(Vector businessVector,Vector serviceVector,Vector tModelVector)
       throws RegistryException
  -	{
  -  	ValidateValues request = new ValidateValues();
  -  	request.setBusinessEntityVector(businessVector);
  -  	request.setBusinessServiceVector(serviceVector);
  -  	request.setTModelVector(tModelVector);
  +  {
  +    ValidateValues request = new ValidateValues();
  +    request.setBusinessEntityVector(businessVector);
  +    request.setBusinessServiceVector(serviceVector);
  +    request.setTModelVector(tModelVector);
   
       return (DispositionReport)execute(request);
  -	}
  +  }
   }
  
  
  
  1.2       +25 -25    ws-juddi/src/java/org/apache/juddi/handler/RegistryInfoHandler.java
  
  Index: RegistryInfoHandler.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/handler/RegistryInfoHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RegistryInfoHandler.java	28 May 2004 04:46:25 -0000	1.1
  +++ RegistryInfoHandler.java	4 Jun 2004 13:46:43 -0000	1.2
  @@ -96,31 +96,31 @@
     public static void main(String args[])
       throws Exception
     {
  -		HandlerMaker maker = HandlerMaker.getInstance();
  -		AbstractHandler handler = maker.lookup(RegistryInfoHandler.TAG_NAME);
  -		
  -		Element parent = XMLUtils.newRootElement();
  -		Element child = null;
  -		
  -		RegistryInfo regInfo = new RegistryInfo();
  -		regInfo.addProperty(new Property("first_name","Steve"));
  -		regInfo.addProperty(new Property("last_name","Viens"));
  -		regInfo.addProperty(new Property("version","1.0b1"));
  +    HandlerMaker maker = HandlerMaker.getInstance();
  +    AbstractHandler handler = maker.lookup(RegistryInfoHandler.TAG_NAME);
  +    
  +    Element parent = XMLUtils.newRootElement();
  +    Element child = null;
  +    
  +    RegistryInfo regInfo = new RegistryInfo();
  +    regInfo.addProperty(new Property("first_name","Steve"));
  +    regInfo.addProperty(new Property("last_name","Viens"));
  +    regInfo.addProperty(new Property("version","1.0b1"));
   
  -		System.out.println();
  -		
  -		RegistryObject regObject = regInfo;
  -		handler.marshal(regObject,parent);
  -		child = (Element)parent.getFirstChild();
  -		parent.removeChild(child);
  -		XMLUtils.writeXML(child,System.out);
  -		
  -		System.out.println();
  -		
  -		regObject = handler.unmarshal(child);
  -		handler.marshal(regObject,parent);
  -		child = (Element)parent.getFirstChild();
  -		parent.removeChild(child);
  -		XMLUtils.writeXML(child,System.out);
  +    System.out.println();
  +    
  +    RegistryObject regObject = regInfo;
  +    handler.marshal(regObject,parent);
  +    child = (Element)parent.getFirstChild();
  +    parent.removeChild(child);
  +    XMLUtils.writeXML(child,System.out);
  +    
  +    System.out.println();
  +    
  +    regObject = handler.unmarshal(child);
  +    handler.marshal(regObject,parent);
  +    child = (Element)parent.getFirstChild();
  +    parent.removeChild(child);
  +    XMLUtils.writeXML(child,System.out);
     }
   }
  
  
  
  1.3       +54 -54    ws-juddi/src/java/org/apache/juddi/auth/JBossAuthenticator.java
  
  Index: JBossAuthenticator.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/auth/JBossAuthenticator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JBossAuthenticator.java	2 Jun 2004 20:57:34 -0000	1.2
  +++ JBossAuthenticator.java	4 Jun 2004 13:46:43 -0000	1.3
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2001-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.
  @@ -46,62 +46,62 @@
    */
   public class JBossAuthenticator implements Authenticator 
   {
  -	// private reference to the jUDDI logger
  -	private static Log log = LogFactory.getLog(JBossAuthenticator.class);
  -	
  -	// static default security-domain to use.
  -	private static final String SECURITY_DOMAIN_KEY = "juddi.securityDomain";
  -	private static final String DEFAULT_SECURITY_DOMAIN = "java:/jaas/other";
  -	
  -	// JBoss authentication manager
  -	AuthenticationManager authManager;
  -
  -	/**
  -	 *
  -	 */
  -	public JBossAuthenticator() 
  -	{
  -		init();
  -	}
  -	
  -	/**
  -	 *
  -	 */
  -	public String authenticate(final String userID, final String credential)
  -		throws RegistryException 
  -	{
  -		if (userID == null) {
  -		  throw new UnknownUserException("Invalid user ID = "+userID);
  -		}
  -	
  -		// Create a principal for the userID
  -		Principal principal = new Principal() 
  -		{
  -	    public String getName() {
  -	      return userID;
  -	    }
  -		};
  -		
  -		if (!authManager.isValid(principal, credential)) {
  -		  throw new UnknownUserException("Invalid credentials");
  -		}
  -		
  -		return userID;
  -	}
  +  // private reference to the jUDDI logger
  +  private static Log log = LogFactory.getLog(JBossAuthenticator.class);
  +  
  +  // static default security-domain to use.
  +  private static final String SECURITY_DOMAIN_KEY = "juddi.securityDomain";
  +  private static final String DEFAULT_SECURITY_DOMAIN = "java:/jaas/other";
  +  
  +  // JBoss authentication manager
  +  AuthenticationManager authManager;
  +
  +  /**
  +   *
  +   */
  +  public JBossAuthenticator() 
  +  {
  +    init();
  +  }
  +  
  +  /**
  +   *
  +   */
  +  public String authenticate(final String userID, final String credential)
  +    throws RegistryException 
  +  {
  +    if (userID == null) {
  +      throw new UnknownUserException("Invalid user ID = "+userID);
  +    }
  +  
  +    // Create a principal for the userID
  +    Principal principal = new Principal() 
  +    {
  +      public String getName() {
  +        return userID;
  +      }
  +    };
  +    
  +    if (!authManager.isValid(principal, credential)) {
  +      throw new UnknownUserException("Invalid credentials");
  +    }
  +    
  +    return userID;
  +  }
   
   
  -	private void init() 
  -	{
  +  private void init() 
  +  {
       String securityDomain = Config.getStringProperty(SECURITY_DOMAIN_KEY,DEFAULT_SECURITY_DOMAIN);
   
       try {
  -			// lookup for the authentication manager.
  -			Context ctx = new InitialContext();
  -			authManager = (AuthenticationManager) ctx.lookup(securityDomain);
  -			ctx.close();
  +      // lookup for the authentication manager.
  +      Context ctx = new InitialContext();
  +      authManager = (AuthenticationManager) ctx.lookup(securityDomain);
  +      ctx.close();
       } catch (NamingException e) {
  -			log.error("JNDI Exception looking for autentication manager: " + 
  -				securityDomain, e);
  +      log.error("JNDI Exception looking for autentication manager: " + 
  +        securityDomain, e);
       }
  -	}
  +  }
   }
  
  
  
  1.4       +17 -17    ws-juddi/src/java/org/apache/juddi/datastore/DataStoreFactory.java
  
  Index: DataStoreFactory.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/DataStoreFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DataStoreFactory.java	30 Apr 2004 03:52:26 -0000	1.3
  +++ DataStoreFactory.java	4 Jun 2004 13:46:43 -0000	1.4
  @@ -50,21 +50,21 @@
      */
     public static DataStore getDataStore()
     {
  -  	DataStore dataStore = null;
  -  	
  +    DataStore dataStore = null;
  +    
       try
       {
  -    	// make sure we know what class to create
  -    	if (implClass == null)
  -    		implClass = loadImplClass();
  +      // make sure we know what class to create
  +      if (implClass == null)
  +        implClass = loadImplClass();
   
  -    	// true if a configuration problem exists
  -    	if (implClass == null)
  -    		throw new RegistryException("The registry is not configured " +
  -    				"correctly.");
  -    		
  +      // true if a configuration problem exists
  +      if (implClass == null)
  +        throw new RegistryException("The registry is not configured " +
  +            "correctly.");
  +        
         // try to instantiate a new DataStore
  -    	dataStore = (DataStore)implClass.newInstance();
  +      dataStore = (DataStore)implClass.newInstance();
       }
       catch(Exception e)
       {
  @@ -84,9 +84,9 @@
      */
     private static synchronized Class loadImplClass()
     {
  -  	if (implClass != null)
  -  		return implClass;
  -  	
  +    if (implClass != null)
  +      return implClass;
  +    
       // grab class name of the DataStore implementation to create
       String className = Config.getStringProperty(IMPL_KEY,DEFAULT_IMPL);
   
  @@ -96,13 +96,13 @@
       try
       {
         // Use Loader to locate & load the DataStore implementation
  -    	implClass = Loader.getClassForName(className);
  +      implClass = Loader.getClassForName(className);
       }
       catch(ClassNotFoundException e)
       {
         log.error("The registry is not configured correctly. The specified " +
  -      					"DataStore class '" + className + "' was not found in " +
  -								"classpath.");
  +                "DataStore class '" + className + "' was not found in " +
  +                "classpath.");
         log.error(e);
       }
       
  
  
  
  1.3       +23 -23    ws-juddi/src/java/org/apache/juddi/registry/RegistryServlet.java
  
  Index: RegistryServlet.java
  ===================================================================
  RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/registry/RegistryServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RegistryServlet.java	3 Jun 2004 14:35:05 -0000	1.2
  +++ RegistryServlet.java	4 Jun 2004 13:46:43 -0000	1.3
  @@ -123,67 +123,67 @@
           // juddi.properties file found in the 
           // WEB-INF directory.
   
  -      	props.load(new FileInputStream(propertyFile));
  +        props.load(new FileInputStream(propertyFile));
         }
         else
         {
           // A juddi.properties file doesn't exist
  -      	// yet so create one in the WEB-INF directory
  -      	// populated with default properties.
  -      	
  +        // yet so create one in the WEB-INF directory
  +        // populated with default properties.
  +        
           props.put(RegistryEngine.PROPNAME_OPERATOR_NAME,
  -        		      RegistryEngine.DEFAULT_OPERATOR_NAME);
  +                  RegistryEngine.DEFAULT_OPERATOR_NAME);
           
           props.put(RegistryEngine.PROPNAME_OPERATOR_URL,
  -        		      RegistryEngine.DEFAULT_OPERATOR_URL);
  +                  RegistryEngine.DEFAULT_OPERATOR_URL);
           
           props.put(RegistryEngine.PROPNAME_ADMIN_EMAIL_ADDRESS,
  -        		      RegistryEngine.DEFAULT_ADMIN_EMAIL_ADDRESS);
  +                  RegistryEngine.DEFAULT_ADMIN_EMAIL_ADDRESS);
           
           props.put(RegistryEngine.PROPNAME_DATASOURCE_NAME,
  -        		      RegistryEngine.DEFAULT_DATASOURCE_NAME);
  +                  RegistryEngine.DEFAULT_DATASOURCE_NAME);
                 
           props.put(RegistryEngine.PROPNAME_AUTH_CLASS_NAME,
  -        		      RegistryEngine.DEFAULT_AUTH_CLASS_NAME);
  +                  RegistryEngine.DEFAULT_AUTH_CLASS_NAME);
           
           props.put(RegistryEngine.PROPNAME_CRYPTOR_CLASS_NAME,
  -        		      RegistryEngine.DEFAULT_CRYPTOR_CLASS_NAME);
  +                  RegistryEngine.DEFAULT_CRYPTOR_CLASS_NAME);
           
           props.put(RegistryEngine.PROPNAME_DATASTORE_CLASS_NAME,
  -        		      RegistryEngine.DEFAULT_DATASTORE_CLASS_NAME);
  +                  RegistryEngine.DEFAULT_DATASTORE_CLASS_NAME);
           
           props.put(RegistryEngine.PROPNAME_MONITOR_CLASS_NAME,
  -        		      RegistryEngine.DEFAULT_MONITOR_CLASS_NAME);
  +                  RegistryEngine.DEFAULT_MONITOR_CLASS_NAME);
           
           props.put(RegistryEngine.PROPNAME_UUIDGEN_CLASS_NAME,
  -        		      RegistryEngine.DEFAULT_UUIDGEN_CLASS_NAME);
  +                  RegistryEngine.DEFAULT_UUIDGEN_CLASS_NAME);
           
           props.put(RegistryEngine.PROPNAME_VALIDATOR_CLASS_NAME,
  -        		      RegistryEngine.DEFAULT_VALIDATOR_CLASS_NAME);  
  +                  RegistryEngine.DEFAULT_VALIDATOR_CLASS_NAME);  
   
           props.put(RegistryEngine.PROPNAME_MAX_NAME_ELEMENTS,
  -        		      Integer.toString(RegistryEngine.DEFAULT_MAX_NAME_ELEMENTS));
  +                  Integer.toString(RegistryEngine.DEFAULT_MAX_NAME_ELEMENTS));
           
           props.put(RegistryEngine.PROPNAME_MAX_NAME_LENGTH,
  -        		      Integer.toString(RegistryEngine.DEFAULT_MAX_NAME_LENGTH));
  +                  Integer.toString(RegistryEngine.DEFAULT_MAX_NAME_LENGTH));
   
           props.put(RegistryEngine.PROPNAME_MAX_MESSAGE_SIZE,
  -        		      Integer.toString(RegistryEngine.DEFAULT_MAX_MESSAGE_SIZE));        
  +                  Integer.toString(RegistryEngine.DEFAULT_MAX_MESSAGE_SIZE));        
   
           props.put(RegistryEngine.PROPNAME_MAX_BUSINESS_ENTITIES_PER_USER,
  -        		      Integer.toString(RegistryEngine.DEFAULT_MAX_BUSINESS_ENTITIES_PER_USER));
  +                  Integer.toString(RegistryEngine.DEFAULT_MAX_BUSINESS_ENTITIES_PER_USER));
           
           props.put(RegistryEngine.PROPNAME_MAX_BUSINESS_SERVICES_PER_BUSINESS,
  -        		      Integer.toString(RegistryEngine.DEFAULT_MAX_BUSINESS_SERVICES_PER_BUSINESS));
  +                  Integer.toString(RegistryEngine.DEFAULT_MAX_BUSINESS_SERVICES_PER_BUSINESS));
           
           props.put(RegistryEngine.PROPNAME_MAX_BINDING_TEMPLATES_PER_SERVICE,
  -        		      Integer.toString(RegistryEngine.DEFAULT_MAX_BINDING_TEMPLATES_PER_SERVICE));
  +                  Integer.toString(RegistryEngine.DEFAULT_MAX_BINDING_TEMPLATES_PER_SERVICE));
           
           props.put(RegistryEngine.PROPNAME_MAX_TMODELS_PER_USER,
  -        		      Integer.toString(RegistryEngine.DEFAULT_MAX_TMODELS_PER_USER));
  +                  Integer.toString(RegistryEngine.DEFAULT_MAX_TMODELS_PER_USER));
           
  -        props.put(RegistryEngine.PROPNAME_MAX_ROWS_LIMIT,        		
  -        		      Integer.toString(RegistryEngine.DEFAULT_MAX_ROWS_LIMIT));
  +        props.put(RegistryEngine.PROPNAME_MAX_ROWS_LIMIT,           
  +                  Integer.toString(RegistryEngine.DEFAULT_MAX_ROWS_LIMIT));
           
           // Create a new "juddi.properties" file in
           // the WEB-INF directory.
  
  
  

Mime
View raw message