hivemind-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject cvs commit: jakarta-hivemind/framework/src/java/org/apache/hivemind/order Orderer.java
Date Tue, 28 Dec 2004 22:43:16 GMT
hlship      2004/12/28 14:43:16

  Modified:    library/src/test/hivemind/test/lib
                        TestSpringLookupFactory.java
               framework/src/test/hivemind/test/services
                        TestEventLinker.java ZapEvent.java
                        TestShutdown.java TestThreadedModel.java
               framework/src/java/org/apache/hivemind/impl
                        InvokeFactoryServiceConstructor.java
                        TranslatorManager.java
                        RegistryInfrastructureImpl.java
                        DefaultClassResolver.java
               framework/src/java/org/apache/hivemind
                        ServiceImplementationFactory.java
               examples/src/java/com/panorama/startup/impl
                        TaskExecutor.java Task.java
               framework/src/test/hivemind/test TestDependency.java
                        TestMisc.java TestLocation.java
               library/src/java/org/apache/hivemind/lib/impl
                        SpringLookupFactory.java
                        ServicePropertyFactory.java PlaceholderFactory.java
                        SpringBeanParameter.java
               framework/src/java/org/apache/hivemind/test
                        HiveMindTestCase.java RegexpMatcher.java
               library/src/java/org/apache/hivemind/lib/factory
                        FactoryMessages.java BeanFactoryImpl.java
               framework/src/test/org/apache/hivemind/impl
                        TestTranslatorManager.java StandardWorker.java
               framework/src/test/hivemind/test/rules
                        TestConfigurationTranslator.java
               framework/src/test/hivemind/test/config
                        TestConfigurationPoint.java
               library/src/test/org/apache/hivemind/lib/factory
                        TestBeanFactoryImpl.java
               framework/src/java/org/apache/hivemind/ant
                        ConstructRegistry.java RegistrySerializer.java
               framework/src/java/org/apache/hivemind/service/impl
                        HiveMindClassPool.java DefaultsSymbolSource.java
                        EventLinkerImpl.java
               library/src/test/org/apache/hivemind/lib/pipeline
                        TestPipelineAssembler.java
               framework/src/java/org/apache/hivemind/internal
                        ServicePoint.java
               library/src/java/org/apache/hivemind/lib/pipeline
                        PipelineFactory.java PipelineAssembler.java
                        BridgeBuilder.java
               framework/src/java/org/apache/hivemind/parse
                        DescriptorParser.java
               library/src/test/org/apache/hivemind/lib/impl
                        TestServicePropertyFactory.java
               framework/src/test/org/apache/hivemind/conditional
                        TestNode.java
               framework/src/java/org/apache/hivemind/order Orderer.java
  Log:
  Clean up a number of warnings.
  
  Revision  Changes    Path
  1.8       +0 -2      jakarta-hivemind/library/src/test/hivemind/test/lib/TestSpringLookupFactory.java
  
  Index: TestSpringLookupFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/library/src/test/hivemind/test/lib/TestSpringLookupFactory.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- TestSpringLookupFactory.java	19 Dec 2004 15:41:45 -0000	1.7
  +++ TestSpringLookupFactory.java	28 Dec 2004 22:43:14 -0000	1.8
  @@ -20,8 +20,6 @@
   import org.apache.hivemind.Registry;
   import org.apache.hivemind.ServiceImplementationFactoryParameters;
   import org.apache.hivemind.lib.SpringBeanFactoryHolder;
  -import org.apache.hivemind.lib.SpringBeanFactorySource;
  -import org.apache.hivemind.lib.impl.SpringBeanFactoryHolderImpl;
   import org.apache.hivemind.lib.impl.SpringBeanParameter;
   import org.apache.hivemind.lib.impl.SpringLookupFactory;
   import org.apache.hivemind.test.HiveMindTestCase;
  
  
  
  1.7       +0 -1      jakarta-hivemind/framework/src/test/hivemind/test/services/TestEventLinker.java
  
  Index: TestEventLinker.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/services/TestEventLinker.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TestEventLinker.java	2 Nov 2004 17:46:10 -0000	1.6
  +++ TestEventLinker.java	28 Dec 2004 22:43:14 -0000	1.7
  @@ -16,7 +16,6 @@
   
   import java.beans.PropertyChangeEvent;
   
  -import org.apache.hivemind.ErrorHandler;
   import org.apache.hivemind.ErrorLog;
   import org.apache.hivemind.Location;
   import org.apache.hivemind.Registry;
  
  
  
  1.3       +5 -5      jakarta-hivemind/framework/src/test/hivemind/test/services/ZapEvent.java
  
  Index: ZapEvent.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/services/ZapEvent.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ZapEvent.java	25 Jun 2004 20:19:57 -0000	1.2
  +++ ZapEvent.java	28 Dec 2004 22:43:14 -0000	1.3
  @@ -17,16 +17,16 @@
   import java.util.EventObject;
   
   /**
  - * Event used with the {@link } listener interface.
  - *
  + * Event used with the {@link hivemind.test.services.ZapListener}  listener interface.
  + * 
    * @author Howard Lewis Ship
    */
   public class ZapEvent extends EventObject
   {
   
  -    public ZapEvent(Object source)
  +    public ZapEvent(Object zsource)
       {
  -        super(source);
  +        super(zsource);
       }
   
  -}
  +}
  \ No newline at end of file
  
  
  
  1.10      +4 -5      jakarta-hivemind/framework/src/test/hivemind/test/services/TestShutdown.java
  
  Index: TestShutdown.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/services/TestShutdown.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TestShutdown.java	25 Sep 2004 17:08:35 -0000	1.9
  +++ TestShutdown.java	28 Dec 2004 22:43:14 -0000	1.10
  @@ -18,7 +18,6 @@
   
   import org.apache.hivemind.ApplicationRuntimeException;
   import org.apache.hivemind.Registry;
  -import org.apache.hivemind.internal.RegistryInfrastructure;
   
   /**
    * Tests shutdown on the registry and on deferred and threaded services.
  @@ -30,7 +29,7 @@
   
       public void testShutdownSingleton() throws Exception
       {
  -        Registry r = (Registry) buildFrameworkRegistry("SimpleModule.xml");
  +        Registry r = buildFrameworkRegistry("SimpleModule.xml");
           SimpleService s = (SimpleService) r.getService(
                   "hivemind.test.services.Simple",
                   SimpleService.class);
  @@ -79,7 +78,7 @@
   
       public void testShutdownThreaded() throws Exception
       {
  -        Registry r = (Registry) buildFrameworkRegistry("StringHolder.xml");
  +        Registry r = buildFrameworkRegistry("StringHolder.xml");
   
           StringHolder h = (StringHolder) r.getService(
                   "hivemind.test.services.StringHolder",
  @@ -106,7 +105,7 @@
   
       public void testSingletonCore() throws Exception
       {
  -        Registry r = (Registry) buildFrameworkRegistry("Shutdown.xml");
  +        Registry r = buildFrameworkRegistry("Shutdown.xml");
   
           Runnable s = (Runnable) r.getService("hivemind.test.services.Singleton", Runnable.class);
   
  @@ -123,7 +122,7 @@
   
       public void testPrimitiveCore() throws Exception
       {
  -        Registry r = (Registry) buildFrameworkRegistry("Shutdown.xml");
  +        Registry r = buildFrameworkRegistry("Shutdown.xml");
   
           Runnable s = (Runnable) r.getService("hivemind.test.services.Primitive", Runnable.class);
   
  
  
  
  1.14      +24 -29    jakarta-hivemind/framework/src/test/hivemind/test/services/TestThreadedModel.java
  
  Index: TestThreadedModel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/services/TestThreadedModel.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- TestThreadedModel.java	19 Aug 2004 22:24:01 -0000	1.13
  +++ TestThreadedModel.java	28 Dec 2004 22:43:14 -0000	1.14
  @@ -22,7 +22,7 @@
   
   /**
    * Tests for {@link org.apache.hivemind.impl.servicemodel.ThreadedServiceModel}.
  - *
  + * 
    * @author Howard Lewis Ship
    */
   public class TestThreadedModel extends FrameworkTestCase
  @@ -46,16 +46,17 @@
       }
   
       private String _otherStartValue;
  +
       private String _otherEndValue;
   
       public void testSingleThread() throws Exception
       {
           Registry r = buildFrameworkRegistry("StringHolder.xml");
   
  -        StringHolder h =
  -            (StringHolder) r.getService("hivemind.test.services.StringHolder", StringHolder.class);
  -        ThreadEventNotifier n =
  -            (ThreadEventNotifier) r.getService(
  +        StringHolder h = (StringHolder) r.getService(
  +                "hivemind.test.services.StringHolder",
  +                StringHolder.class);
  +        ThreadEventNotifier n = (ThreadEventNotifier) r.getService(
                   HiveMind.THREAD_EVENT_NOTIFIER_SERVICE,
                   ThreadEventNotifier.class);
   
  @@ -72,11 +73,11 @@
           assertNull(h.getValue());
   
           assertEquals(
  -            "<LoggingInterceptor for hivemind.test.services.StringHolder(hivemind.test.services.StringHolder)>",
  -            h.toString());
  +                "<LoggingInterceptor for hivemind.test.services.StringHolder(hivemind.test.services.StringHolder)>",
  +                h.toString());
   
  -        assertLoggedMessages(
  -            new String[] {
  +        assertLoggedMessages(new String[]
  +        {
                   "BEGIN getValue()",
                   "Constructing core service implementation for service hivemind.test.services.StringHolder",
                   "END getValue() [<null>]",
  @@ -97,8 +98,9 @@
       {
           Registry r = buildFrameworkRegistry("StringHolder.xml");
   
  -        StringHolder h =
  -            (StringHolder) r.getService("hivemind.test.services.StringHolder", StringHolder.class);
  +        StringHolder h = (StringHolder) r.getService(
  +                "hivemind.test.services.StringHolder",
  +                StringHolder.class);
   
           interceptLogging("hivemind.test.services.StringHolder");
   
  @@ -126,8 +128,8 @@
   
           assertEquals("fred", h.getValue());
   
  -        assertLoggedMessages(
  -            new String[] {
  +        assertLoggedMessages(new String[]
  +        {
                   "BEGIN getValue()",
                   "Constructing core service implementation for service hivemind.test.services.StringHolder",
                   "END getValue() [<null>]",
  @@ -137,12 +139,8 @@
                   "END getValue() [fred]",
                   "BEGIN getValue()",
                   "Constructing core service implementation for service hivemind.test.services.StringHolder",
  -                "END getValue() [<null>]",
  -                "BEGIN setValue(barney)",
  -                "END setValue()",
  -                "BEGIN getValue()",
  -                "END getValue() [barney]",
  -                "BEGIN getValue()",
  +                "END getValue() [<null>]", "BEGIN setValue(barney)", "END setValue()",
  +                "BEGIN getValue()", "END getValue() [barney]", "BEGIN getValue()",
                   "END getValue() [fred]" });
       }
   
  @@ -153,8 +151,8 @@
   
       protected void tearDown() throws Exception
       {
  -    	super.tearDown();
  -    	
  +        super.tearDown();
  +
           _didShutdown = false;
       }
   
  @@ -162,8 +160,7 @@
       {
           Registry r = buildFrameworkRegistry("ThreadedRegistryShutdown.xml");
   
  -        StringHolder h =
  -            (StringHolder) r.getService(
  +        StringHolder h = (StringHolder) r.getService(
                   "hivemind.test.services.ThreadedRegistryShutdown",
                   StringHolder.class);
   
  @@ -173,7 +170,7 @@
   
           assertLoggedMessage("Core implementation of service hivemind.test.services.ThreadedRegistryShutdown implements the RegistryCleanupListener interface, which is not supported by the threaded service model.");
   
  -        ((Registry) r).shutdown();
  +        r.shutdown();
   
           assertEquals(false, _didShutdown);
       }
  @@ -182,15 +179,13 @@
       {
           Registry r = buildFrameworkRegistry("ThreadedDiscardable.xml");
   
  -        StringHolder h =
  -            (StringHolder) r.getService(
  +        StringHolder h = (StringHolder) r.getService(
                   "hivemind.test.services.ThreadedDiscardable",
                   StringHolder.class);
   
           h.setValue("bar");
   
  -        ThreadEventNotifier n =
  -            (ThreadEventNotifier) r.getService(
  +        ThreadEventNotifier n = (ThreadEventNotifier) r.getService(
                   "hivemind.ThreadEventNotifier",
                   ThreadEventNotifier.class);
   
  @@ -200,4 +195,4 @@
   
           assertLoggedMessage("threadDidDiscardService() has been invoked.");
       }
  -}
  +}
  \ No newline at end of file
  
  
  
  1.10      +0 -2      jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/InvokeFactoryServiceConstructor.java
  
  Index: InvokeFactoryServiceConstructor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/InvokeFactoryServiceConstructor.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- InvokeFactoryServiceConstructor.java	2 Nov 2004 17:46:09 -0000	1.9
  +++ InvokeFactoryServiceConstructor.java	28 Dec 2004 22:43:14 -0000	1.10
  @@ -16,9 +16,7 @@
   
   import java.util.List;
   
  -import org.apache.commons.logging.Log;
   import org.apache.hivemind.ApplicationRuntimeException;
  -import org.apache.hivemind.ErrorHandler;
   import org.apache.hivemind.ErrorLog;
   import org.apache.hivemind.Occurances;
   import org.apache.hivemind.ServiceImplementationFactory;
  
  
  
  1.3       +0 -1      jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/TranslatorManager.java
  
  Index: TranslatorManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/TranslatorManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TranslatorManager.java	25 Sep 2004 17:08:34 -0000	1.2
  +++ TranslatorManager.java	28 Dec 2004 22:43:14 -0000	1.3
  @@ -25,7 +25,6 @@
   import org.apache.hivemind.ApplicationRuntimeException;
   import org.apache.hivemind.ErrorHandler;
   import org.apache.hivemind.Location;
  -import org.apache.hivemind.Registry;
   import org.apache.hivemind.internal.RegistryInfrastructure;
   import org.apache.hivemind.schema.Translator;
   import org.apache.hivemind.schema.rules.ClassTranslator;
  
  
  
  1.5       +0 -10     jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/RegistryInfrastructureImpl.java
  
  Index: RegistryInfrastructureImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/RegistryInfrastructureImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- RegistryInfrastructureImpl.java	22 Dec 2004 14:25:21 -0000	1.4
  +++ RegistryInfrastructureImpl.java	28 Dec 2004 22:43:14 -0000	1.5
  @@ -14,7 +14,6 @@
   
   package org.apache.hivemind.impl;
   
  -import java.util.Collection;
   import java.util.Collections;
   import java.util.HashMap;
   import java.util.Iterator;
  @@ -23,7 +22,6 @@
   import java.util.Locale;
   import java.util.Map;
   
  -import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.apache.hivemind.ApplicationRuntimeException;
   import org.apache.hivemind.ErrorHandler;
  @@ -52,8 +50,6 @@
   {
       private static final String SYMBOL_SOURCES = "hivemind.SymbolSources";
   
  -    private static final Log LOG = LogFactory.getLog(RegistryInfrastructureImpl.class);
  -
       /**
        * Map of {@link ServicePoint}keyed on fully qualified service id.
        */
  @@ -457,10 +453,4 @@
       {
           return _translatorManager.getTranslator(translator);
       }
  -
  -    private int size(Collection c)
  -    {
  -        return c == null ? 0 : c.size();
  -    }
  -
   }
  
  
  
  1.5       +0 -2      jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/DefaultClassResolver.java
  
  Index: DefaultClassResolver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/DefaultClassResolver.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultClassResolver.java	1 Nov 2004 01:55:47 -0000	1.4
  +++ DefaultClassResolver.java	28 Dec 2004 22:43:14 -0000	1.5
  @@ -15,8 +15,6 @@
   package org.apache.hivemind.impl;
   
   import java.net.URL;
  -import java.util.HashMap;
  -import java.util.Map;
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  
  
  
  1.7       +0 -5      jakarta-hivemind/framework/src/java/org/apache/hivemind/ServiceImplementationFactory.java
  
  Index: ServiceImplementationFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/ServiceImplementationFactory.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ServiceImplementationFactory.java	8 Nov 2004 14:14:25 -0000	1.6
  +++ ServiceImplementationFactory.java	28 Dec 2004 22:43:14 -0000	1.7
  @@ -14,11 +14,6 @@
   
   package org.apache.hivemind;
   
  -import java.util.List;
  -
  -import org.apache.commons.logging.Log;
  -import org.apache.hivemind.internal.Module;
  -
   /**
    * Interface for an object that can create a service's core implementation.
    * 
  
  
  
  1.6       +0 -1      jakarta-hivemind/examples/src/java/com/panorama/startup/impl/TaskExecutor.java
  
  Index: TaskExecutor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/examples/src/java/com/panorama/startup/impl/TaskExecutor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TaskExecutor.java	2 Nov 2004 17:46:08 -0000	1.5
  +++ TaskExecutor.java	28 Dec 2004 22:43:15 -0000	1.6
  @@ -18,7 +18,6 @@
   import java.util.List;
   
   import org.apache.commons.logging.Log;
  -import org.apache.hivemind.ErrorHandler;
   import org.apache.hivemind.ErrorLog;
   import org.apache.hivemind.Messages;
   import org.apache.hivemind.order.Orderer;
  
  
  
  1.4       +12 -8     jakarta-hivemind/examples/src/java/com/panorama/startup/impl/Task.java
  
  Index: Task.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/examples/src/java/com/panorama/startup/impl/Task.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Task.java	24 Jul 2004 22:18:13 -0000	1.3
  +++ Task.java	28 Dec 2004 22:43:15 -0000	1.4
  @@ -19,18 +19,22 @@
   import com.panorama.startup.Executable;
   
   /**
  - * An operation that may be executed. A Task exists to wrap
  - * an {@link com.panorama.startup.Executable} object with
  - * a title and ordering information (id, after, before).
  - *
  + * An operation that may be executed. A Task exists to wrap an
  + * {@link com.panorama.startup.Executable}object with a title and ordering information (id, after,
  + * before).
  + * 
    * @author Howard Lewis Ship
    */
   public class Task extends BaseLocatable implements Executable
   {
       private String _id;
  +
       private String _title;
  +
       private String _after;
  +
       private String _before;
  +
       private Executable _executable;
   
       public String getBefore()
  @@ -78,12 +82,12 @@
           _title = string;
       }
   
  -	/**
  -	 * Delegates to the {@link #setExecutable(Executable) executable} object.
  -	 */
  +    /**
  +     * Delegates to the {@link #setExecutable(Executable) executable}object.
  +     */
       public void execute() throws Exception
       {
           _executable.execute();
       }
   
  -}
  +}
  \ No newline at end of file
  
  
  
  1.5       +0 -1      jakarta-hivemind/framework/src/test/hivemind/test/TestDependency.java
  
  Index: TestDependency.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/TestDependency.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestDependency.java	5 Oct 2004 17:45:25 -0000	1.4
  +++ TestDependency.java	28 Dec 2004 22:43:15 -0000	1.5
  @@ -14,7 +14,6 @@
   
   package hivemind.test;
   
  -import org.apache.hivemind.Registry;
   import org.apache.hivemind.parse.DependencyDescriptor;
   import org.apache.hivemind.parse.ModuleDescriptor;
   
  
  
  
  1.21      +5 -6      jakarta-hivemind/framework/src/test/hivemind/test/TestMisc.java
  
  Index: TestMisc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/TestMisc.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- TestMisc.java	2 Nov 2004 17:47:22 -0000	1.20
  +++ TestMisc.java	28 Dec 2004 22:43:15 -0000	1.21
  @@ -20,7 +20,6 @@
   import java.util.List;
   
   import org.apache.hivemind.ApplicationRuntimeException;
  -import org.apache.hivemind.HiveMind;
   import org.apache.hivemind.SymbolSource;
   import org.apache.hivemind.impl.ContributionImpl;
   import org.apache.hivemind.impl.CreateClassServiceConstructor;
  @@ -35,15 +34,15 @@
   
   /**
    * Additional tests to fill in minor code coverage gaps.
  - *
  + * 
    * @author Howard Lewis Ship
    */
   public class TestMisc extends FrameworkTestCase
   {
       public void testApplicationRuntimeExceptionGetComponent()
       {
  -        ApplicationRuntimeException ex =
  -            new ApplicationRuntimeException("My Message", this, null, null);
  +        ApplicationRuntimeException ex = new ApplicationRuntimeException("My Message", this, null,
  +                null);
   
           assertSame(this, ex.getComponent());
       }
  @@ -150,8 +149,8 @@
           catch (Exception ex)
           {
               assertExceptionSubstring(
  -                ex,
  -                "Unable to find a constructor for class hivemind.test.PrivateBean.");
  +                    ex,
  +                    "Unable to find a constructor for class hivemind.test.PrivateBean.");
           }
   
           verifyControls();
  
  
  
  1.6       +10 -12    jakarta-hivemind/framework/src/test/hivemind/test/TestLocation.java
  
  Index: TestLocation.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/TestLocation.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TestLocation.java	25 Jun 2004 20:20:04 -0000	1.5
  +++ TestLocation.java	28 Dec 2004 22:43:15 -0000	1.6
  @@ -14,25 +14,22 @@
   
   package hivemind.test;
   
  -import org.apache.hivemind.util.ClasspathResource;
  -import org.apache.hivemind.ClassResolver;
   import org.apache.hivemind.Location;
   import org.apache.hivemind.Resource;
  -import org.apache.hivemind.impl.DefaultClassResolver;
   import org.apache.hivemind.impl.LocationImpl;
  +import org.apache.hivemind.util.ClasspathResource;
   
   /**
  - *  Test the {@link org.apache.hivemind.impl.LocationImpl} class.
  - *
  - *  @author Howard Lewis Ship
  + * Test the {@link org.apache.hivemind.impl.LocationImpl}class.
  + * 
  + * @author Howard Lewis Ship
    */
   public class TestLocation extends FrameworkTestCase
   {
  -    private static final ClassResolver _resolver = new DefaultClassResolver();
  -    private static final Resource _resource1 =
  -        new ClasspathResource(_resolver, "/somepackage/somefile");
  -    private static final Resource _resource2 =
  -        new ClasspathResource(_resolver, "/someotherpackage/someotherfile");
  +    private final Resource _resource1 = new ClasspathResource(_resolver, "/somepackage/somefile");
  +
  +    private final Resource _resource2 = new ClasspathResource(_resolver,
  +            "/someotherpackage/someotherfile");
   
       private Resource _location = new ClasspathResource(null, "/META-INF/foo.bar");
   
  @@ -74,6 +71,7 @@
   
           assertEquals("classpath:/META-INF/foo.bar, line 97, column 3", l.toString());
       }
  +
       public void testEqualsBare()
       {
           Location l1 = new LocationImpl(_resource1);
  @@ -128,4 +126,4 @@
           assertEquals(l1.hashCode(), l2.hashCode());
       }
   
  -}
  +}
  \ No newline at end of file
  
  
  
  1.7       +0 -5      jakarta-hivemind/library/src/java/org/apache/hivemind/lib/impl/SpringLookupFactory.java
  
  Index: SpringLookupFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/library/src/java/org/apache/hivemind/lib/impl/SpringLookupFactory.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SpringLookupFactory.java	19 Dec 2004 15:41:45 -0000	1.6
  +++ SpringLookupFactory.java	28 Dec 2004 22:43:15 -0000	1.7
  @@ -14,14 +14,9 @@
   
   package org.apache.hivemind.lib.impl;
   
  -import java.util.List;
  -
  -import org.apache.commons.logging.Log;
   import org.apache.hivemind.ServiceImplementationFactory;
   import org.apache.hivemind.ServiceImplementationFactoryParameters;
   import org.apache.hivemind.impl.BaseLocatable;
  -import org.apache.hivemind.internal.Module;
  -import org.apache.hivemind.lib.SpringBeanFactorySource;
   import org.springframework.beans.factory.BeanFactory;
   
   /**
  
  
  
  1.10      +0 -4      jakarta-hivemind/library/src/java/org/apache/hivemind/lib/impl/ServicePropertyFactory.java
  
  Index: ServicePropertyFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/library/src/java/org/apache/hivemind/lib/impl/ServicePropertyFactory.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ServicePropertyFactory.java	9 Nov 2004 20:58:19 -0000	1.9
  +++ ServicePropertyFactory.java	28 Dec 2004 22:43:15 -0000	1.10
  @@ -14,15 +14,11 @@
   
   package org.apache.hivemind.lib.impl;
   
  -import java.lang.reflect.Method;
   import java.lang.reflect.Modifier;
  -import java.util.List;
   
  -import org.apache.commons.logging.Log;
   import org.apache.hivemind.ApplicationRuntimeException;
   import org.apache.hivemind.ServiceImplementationFactory;
   import org.apache.hivemind.ServiceImplementationFactoryParameters;
  -import org.apache.hivemind.internal.Module;
   import org.apache.hivemind.service.BodyBuilder;
   import org.apache.hivemind.service.ClassFab;
   import org.apache.hivemind.service.ClassFabUtils;
  
  
  
  1.5       +1 -6      jakarta-hivemind/library/src/java/org/apache/hivemind/lib/impl/PlaceholderFactory.java
  
  Index: PlaceholderFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/library/src/java/org/apache/hivemind/lib/impl/PlaceholderFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PlaceholderFactory.java	8 Nov 2004 14:14:25 -0000	1.4
  +++ PlaceholderFactory.java	28 Dec 2004 22:43:15 -0000	1.5
  @@ -14,13 +14,9 @@
   
   package org.apache.hivemind.lib.impl;
   
  -import java.util.List;
  -
  -import org.apache.commons.logging.Log;
   import org.apache.hivemind.ServiceImplementationFactory;
   import org.apache.hivemind.ServiceImplementationFactoryParameters;
   import org.apache.hivemind.impl.BaseLocatable;
  -import org.apache.hivemind.internal.Module;
   import org.apache.hivemind.lib.DefaultImplementationBuilder;
   
   /**
  @@ -36,8 +32,7 @@
       public Object createCoreServiceImplementation(
               ServiceImplementationFactoryParameters factoryParameters)
       {
  -        return _builder.buildDefaultImplementation(
  -                factoryParameters.getServiceInterface());
  +        return _builder.buildDefaultImplementation(factoryParameters.getServiceInterface());
       }
   
       public void setBuilder(DefaultImplementationBuilder builder)
  
  
  
  1.4       +0 -1      jakarta-hivemind/library/src/java/org/apache/hivemind/lib/impl/SpringBeanParameter.java
  
  Index: SpringBeanParameter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/library/src/java/org/apache/hivemind/lib/impl/SpringBeanParameter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SpringBeanParameter.java	19 Dec 2004 15:41:45 -0000	1.3
  +++ SpringBeanParameter.java	28 Dec 2004 22:43:15 -0000	1.4
  @@ -15,7 +15,6 @@
   package org.apache.hivemind.lib.impl;
   
   import org.apache.hivemind.impl.BaseLocatable;
  -import org.apache.hivemind.lib.SpringBeanFactorySource;
   import org.springframework.beans.factory.BeanFactory;
   
   /**
  
  
  
  1.20      +0 -1      jakarta-hivemind/framework/src/java/org/apache/hivemind/test/HiveMindTestCase.java
  
  Index: HiveMindTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/test/HiveMindTestCase.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- HiveMindTestCase.java	5 Dec 2004 16:43:19 -0000	1.19
  +++ HiveMindTestCase.java	28 Dec 2004 22:43:15 -0000	1.20
  @@ -33,7 +33,6 @@
   import org.apache.hivemind.impl.LocationImpl;
   import org.apache.hivemind.impl.RegistryBuilder;
   import org.apache.hivemind.impl.XmlModuleDescriptorProvider;
  -import org.apache.hivemind.service.ClassFabUtils;
   import org.apache.hivemind.util.ClasspathResource;
   import org.apache.hivemind.util.PropertyUtils;
   import org.apache.hivemind.util.URLResource;
  
  
  
  1.2       +0 -1      jakarta-hivemind/framework/src/java/org/apache/hivemind/test/RegexpMatcher.java
  
  Index: RegexpMatcher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/test/RegexpMatcher.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RegexpMatcher.java	25 Sep 2004 17:08:34 -0000	1.1
  +++ RegexpMatcher.java	28 Dec 2004 22:43:15 -0000	1.2
  @@ -18,7 +18,6 @@
   import org.apache.oro.text.regex.Pattern;
   import org.apache.oro.text.regex.Perl5Compiler;
   import org.apache.oro.text.regex.Perl5Matcher;
  -import org.easymock.AbstractMatcher;
   
   /**
    * A {@link org.apache.hivemind.test.ArgumentMatcher}implementation treates the expected value as a
  
  
  
  1.7       +10 -13    jakarta-hivemind/library/src/java/org/apache/hivemind/lib/factory/FactoryMessages.java
  
  Index: FactoryMessages.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/library/src/java/org/apache/hivemind/lib/factory/FactoryMessages.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FactoryMessages.java	27 Sep 2004 14:38:01 -0000	1.6
  +++ FactoryMessages.java	28 Dec 2004 22:43:15 -0000	1.7
  @@ -1,4 +1,4 @@
  -//  Copyright 2004 The Apache Software Foundation
  +// 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.
  @@ -14,30 +14,27 @@
   
   package org.apache.hivemind.lib.factory;
   
  -import org.apache.hivemind.HiveMind;
   import org.apache.hivemind.impl.MessageFormatter;
   import org.apache.hivemind.service.ClassFabUtils;
   
   final class FactoryMessages
   {
  -    private static final MessageFormatter _formatter =
  -        new MessageFormatter(FactoryMessages.class, "FactoryStrings");
  +    private static final MessageFormatter _formatter = new MessageFormatter(FactoryMessages.class,
  +            "FactoryStrings");
   
       public static String wrongContributionType(BeanFactoryContribution c, Class vendType)
       {
           return _formatter.format(
  -            "wrong-contribution-type",
  -            c.getName(),
  -            c.getBeanClass().getName(),
  -            vendType);
  +                "wrong-contribution-type",
  +                c.getName(),
  +                c.getBeanClass().getName(),
  +                vendType);
       }
   
       public static String invalidContributionClass(BeanFactoryContribution c)
       {
  -        return _formatter.format(
  -            "invalid-contribution-class",
  -            c.getName(),
  -            ClassFabUtils.getJavaClassName(c.getBeanClass()));
  +        return _formatter.format("invalid-contribution-class", c.getName(), ClassFabUtils
  +                .getJavaClassName(c.getBeanClass()));
       }
   
       public static String unknownContribution(String name)
  @@ -54,4 +51,4 @@
       {
           return _formatter.format("invalid-bean-translator-format", inputValue);
       }
  -}
  +}
  \ No newline at end of file
  
  
  
  1.6       +0 -1      jakarta-hivemind/library/src/java/org/apache/hivemind/lib/factory/BeanFactoryImpl.java
  
  Index: BeanFactoryImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/library/src/java/org/apache/hivemind/lib/factory/BeanFactoryImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BeanFactoryImpl.java	2 Nov 2004 17:46:10 -0000	1.5
  +++ BeanFactoryImpl.java	28 Dec 2004 22:43:15 -0000	1.6
  @@ -20,7 +20,6 @@
   import java.util.List;
   import java.util.Map;
   
  -import org.apache.commons.logging.Log;
   import org.apache.hivemind.ApplicationRuntimeException;
   import org.apache.hivemind.ErrorLog;
   import org.apache.hivemind.HiveMind;
  
  
  
  1.4       +0 -1      jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestTranslatorManager.java
  
  Index: TestTranslatorManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/TestTranslatorManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TestTranslatorManager.java	25 Sep 2004 17:08:34 -0000	1.3
  +++ TestTranslatorManager.java	28 Dec 2004 22:43:15 -0000	1.4
  @@ -19,7 +19,6 @@
   
   import org.apache.hivemind.ApplicationRuntimeException;
   import org.apache.hivemind.ErrorHandler;
  -import org.apache.hivemind.Registry;
   import org.apache.hivemind.internal.RegistryInfrastructure;
   import org.apache.hivemind.test.HiveMindTestCase;
   import org.easymock.MockControl;
  
  
  
  1.2       +6 -2      jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/StandardWorker.java
  
  Index: StandardWorker.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/impl/StandardWorker.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StandardWorker.java	13 Aug 2004 13:19:15 -0000	1.1
  +++ StandardWorker.java	28 Dec 2004 22:43:15 -0000	1.2
  @@ -21,7 +21,7 @@
   
   /**
    * A service referenced by {@link org.apache.hivemind.impl.TestServiceModelThreading}.
  - *
  + * 
    * @author Howard Lewis Ship
    */
   public class StandardWorker implements Worker
  @@ -29,9 +29,13 @@
       // The issue may be in wiring/autowiring properties ... so add a bunch!
   
       private ClassFactory _classFactory;
  +
       private ShutdownCoordinator _shutdownCoordinator;
  +
       private Messages _messages;
  +
       private String _serviceId;
  +
       private ThreadLocalStorage _threadLocalStorage;
   
       public void initializeService()
  @@ -70,4 +74,4 @@
           _threadLocalStorage = storage;
       }
   
  -}
  +}
  \ No newline at end of file
  
  
  
  1.15      +1 -1      jakarta-hivemind/framework/src/test/hivemind/test/rules/TestConfigurationTranslator.java
  
  Index: TestConfigurationTranslator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/rules/TestConfigurationTranslator.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- TestConfigurationTranslator.java	20 Dec 2004 15:25:22 -0000	1.14
  +++ TestConfigurationTranslator.java	28 Dec 2004 22:43:15 -0000	1.15
  @@ -59,7 +59,7 @@
   
       public void testFailure() throws Exception
       {
  -        Registry r = (Registry) buildFrameworkRegistry("ConfigurationTranslator.xml");
  +        Registry r = buildFrameworkRegistry("ConfigurationTranslator.xml");
   
           interceptLogging("hivemind.test.rules");
   
  
  
  
  1.24      +1 -1      jakarta-hivemind/framework/src/test/hivemind/test/config/TestConfigurationPoint.java
  
  Index: TestConfigurationPoint.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/config/TestConfigurationPoint.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- TestConfigurationPoint.java	28 Sep 2004 10:24:02 -0000	1.23
  +++ TestConfigurationPoint.java	28 Dec 2004 22:43:15 -0000	1.24
  @@ -426,7 +426,7 @@
           builder.addModuleDescriptorProvider(new XmlModuleDescriptorProvider(_resolver,
                   moduleResource));
   
  -        Registry r = (Registry) builder.constructRegistry(Locale.FRENCH);
  +        Registry r = builder.constructRegistry(Locale.FRENCH);
   
           List l = r.getConfiguration("hivemind.test.config.ResourceTranslator");
   
  
  
  
  1.9       +1 -4      jakarta-hivemind/library/src/test/org/apache/hivemind/lib/factory/TestBeanFactoryImpl.java
  
  Index: TestBeanFactoryImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/library/src/test/org/apache/hivemind/lib/factory/TestBeanFactoryImpl.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TestBeanFactoryImpl.java	2 Nov 2004 17:46:11 -0000	1.8
  +++ TestBeanFactoryImpl.java	28 Dec 2004 22:43:15 -0000	1.9
  @@ -20,13 +20,10 @@
   import java.util.List;
   import java.util.Map;
   
  -import org.apache.commons.logging.Log;
   import org.apache.hivemind.ApplicationRuntimeException;
  -import org.apache.hivemind.ErrorHandler;
   import org.apache.hivemind.ErrorLog;
   import org.apache.hivemind.Registry;
   import org.apache.hivemind.ServiceImplementationFactoryParameters;
  -import org.apache.hivemind.internal.Module;
   import org.apache.hivemind.lib.BeanFactory;
   import org.apache.hivemind.test.HiveMindTestCase;
   import org.easymock.MockControl;
  @@ -199,7 +196,7 @@
           ServiceImplementationFactoryParameters fp = (ServiceImplementationFactoryParameters) fpc
                   .getMock();
   
  -         fp.getParameters();
  +        fp.getParameters();
           fpc.setReturnValue(Collections.singletonList(p));
   
           fp.getErrorLog();
  
  
  
  1.18      +0 -4      jakarta-hivemind/framework/src/java/org/apache/hivemind/ant/ConstructRegistry.java
  
  Index: ConstructRegistry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/ant/ConstructRegistry.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- ConstructRegistry.java	10 Nov 2004 13:26:22 -0000	1.17
  +++ ConstructRegistry.java	28 Dec 2004 22:43:15 -0000	1.18
  @@ -55,8 +55,6 @@
    */
   public class ConstructRegistry extends Task
   {
  -    private int _uid = 1;
  -
       private File _output;
   
       private Path _descriptorsPath;
  @@ -65,8 +63,6 @@
        * List of {@link org.apache.hivemind.Resource}of additional descriptors to parse.
        */
       private List _resourceQueue = new ArrayList();
  -
  -    private List processedModules = new ArrayList();
   
       public void execute() throws BuildException
       {
  
  
  
  1.7       +1 -1      jakarta-hivemind/framework/src/java/org/apache/hivemind/ant/RegistrySerializer.java
  
  Index: RegistrySerializer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/ant/RegistrySerializer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- RegistrySerializer.java	17 Nov 2004 11:30:04 -0000	1.6
  +++ RegistrySerializer.java	28 Dec 2004 22:43:15 -0000	1.7
  @@ -535,7 +535,7 @@
           if (s.getId() != null)
               schema.setAttribute("id", qualify(s.getId()));
   
  -        if (((SchemaImpl) s).getVisibility() == Visibility.PRIVATE)
  +        if (s.getVisibility() == Visibility.PRIVATE)
               schema.setAttribute("visibility", "private");
   
           schema.appendChild(_document.createTextNode(s.getAnnotation()));
  
  
  
  1.5       +1 -3      jakarta-hivemind/framework/src/java/org/apache/hivemind/service/impl/HiveMindClassPool.java
  
  Index: HiveMindClassPool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/service/impl/HiveMindClassPool.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HiveMindClassPool.java	8 Nov 2004 14:14:24 -0000	1.4
  +++ HiveMindClassPool.java	28 Dec 2004 22:43:15 -0000	1.5
  @@ -14,9 +14,7 @@
   
   package org.apache.hivemind.service.impl;
   
  -import java.util.HashMap;
   import java.util.HashSet;
  -import java.util.Map;
   import java.util.Set;
   
   import javassist.CannotCompileException;
  @@ -37,7 +35,7 @@
       private ClassFactoryClassLoader _loader = new ClassFactoryClassLoader();
   
       /**
  -     * Used to identify which class loaders have already been integrated into the pool. 
  +     * Used to identify which class loaders have already been integrated into the pool.
        */
       private Set _loaders = new HashSet();
   
  
  
  
  1.7       +0 -4      jakarta-hivemind/framework/src/java/org/apache/hivemind/service/impl/DefaultsSymbolSource.java
  
  Index: DefaultsSymbolSource.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/service/impl/DefaultsSymbolSource.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultsSymbolSource.java	2 Nov 2004 17:46:09 -0000	1.6
  +++ DefaultsSymbolSource.java	28 Dec 2004 22:43:15 -0000	1.7
  @@ -18,10 +18,6 @@
   import java.util.List;
   import java.util.Map;
   
  -import org.apache.commons.logging.Log;
  -import org.apache.hivemind.ErrorHandler;
  -import org.apache.hivemind.ErrorLog;
  -import org.apache.hivemind.Location;
   import org.apache.hivemind.SymbolSource;
   import org.apache.hivemind.impl.BaseLocatable;
   
  
  
  
  1.9       +0 -2      jakarta-hivemind/framework/src/java/org/apache/hivemind/service/impl/EventLinkerImpl.java
  
  Index: EventLinkerImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/service/impl/EventLinkerImpl.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- EventLinkerImpl.java	2 Nov 2004 17:46:09 -0000	1.8
  +++ EventLinkerImpl.java	28 Dec 2004 22:43:15 -0000	1.9
  @@ -22,8 +22,6 @@
   import java.util.HashMap;
   import java.util.Map;
   
  -import org.apache.commons.logging.Log;
  -import org.apache.hivemind.ErrorHandler;
   import org.apache.hivemind.ErrorLog;
   import org.apache.hivemind.HiveMind;
   import org.apache.hivemind.Location;
  
  
  
  1.10      +0 -2      jakarta-hivemind/library/src/test/org/apache/hivemind/lib/pipeline/TestPipelineAssembler.java
  
  Index: TestPipelineAssembler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/library/src/test/org/apache/hivemind/lib/pipeline/TestPipelineAssembler.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TestPipelineAssembler.java	8 Nov 2004 14:14:25 -0000	1.9
  +++ TestPipelineAssembler.java	28 Dec 2004 22:43:15 -0000	1.10
  @@ -21,8 +21,6 @@
   import org.apache.hivemind.ErrorLog;
   import org.apache.hivemind.Registry;
   import org.apache.hivemind.ServiceImplementationFactoryParameters;
  -import org.apache.hivemind.impl.DefaultClassResolver;
  -import org.apache.hivemind.internal.Module;
   import org.apache.hivemind.lib.impl.DefaultImplementationBuilderImpl;
   import org.apache.hivemind.service.ClassFactory;
   import org.apache.hivemind.service.impl.ClassFactoryImpl;
  
  
  
  1.8       +32 -43    jakarta-hivemind/framework/src/java/org/apache/hivemind/internal/ServicePoint.java
  
  Index: ServicePoint.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/internal/ServicePoint.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ServicePoint.java	22 Dec 2004 14:25:21 -0000	1.7
  +++ ServicePoint.java	28 Dec 2004 22:43:15 -0000	1.8
  @@ -14,77 +14,66 @@
   
   package org.apache.hivemind.internal;
   
  -import org.apache.commons.logging.Log;
   import org.apache.hivemind.Occurances;
   import org.apache.hivemind.schema.Schema;
   
   /**
  - * Sub-interface of {@link org.apache.hivemind.ExtensionPoint}
  - * that defines a service extension point.  A service may have
  - * a single factory contribution, and any number of interceptor
  + * Sub-interface of {@link org.apache.hivemind.ExtensionPoint}that defines a service extension
  + * point. A service may have a single factory contribution, and any number of interceptor
    * contributions.
  - *
  + * 
    * @author Howard Lewis Ship
    */
   public interface ServicePoint extends ExtensionPoint
   {
       /**
  -     * Returns the type of the service, the interface the service
  -     * implements.
  +     * Returns the type of the service, the interface the service implements.
        */
       public Class getServiceInterface();
  -    
  +
       /**
  -     * Returns the fully qualified class name of the service interface. This
  -     * is useful so that loading the actual service interface class can
  -     * be deferred as late as possible.
  +     * Returns the fully qualified class name of the service interface. This is useful so that
  +     * loading the actual service interface class can be deferred as late as possible.
        * 
        * @since 1.1
        */
  -    
  +
       public String getServiceInterfaceClassName();
   
       /**
  -     * Obtains the full service implementation for this service extension point, an
  -     * object that implements the service interface. Because of the different service models,
  -     * and because of the possibility of interceptors, the exact class and object returned
  -     * can't be specified (and may vary at different times), but that is not relevant
  -     * to client code, which is assured that it can invoke
  -     * the service methods defined by the service interface.
  -     * 
  -     * 
  -     * @param interfaceClass the class that the service will be cast to;
  -     * a check is made that the service is assignable to
  -     * the indicated interface.  It does not have to, necessarily,
  -     * match the service interface (it could be a super-interface, for example).
  -     * 
  -     * @return the outermost interceptor for the service, or the
  -     * core implementation if there are no interceptors.
  -     * 
  -     * @throws org.apache.tapestry.ApplicationRuntimeException if there
  -     * is any problem creating the service.
  +     * Obtains the full service implementation for this service extension point, an object that
  +     * implements the service interface. Because of the different service models, and because of the
  +     * possibility of interceptors, the exact class and object returned can't be specified (and may
  +     * vary at different times), but that is not relevant to client code, which is assured that it
  +     * can invoke the service methods defined by the service interface.
  +     * 
  +     * @param interfaceClass
  +     *            the class that the service will be cast to; a check is made that the service is
  +     *            assignable to the indicated interface. It does not have to, necessarily, match the
  +     *            service interface (it could be a super-interface, for example).
  +     * @return the outermost interceptor for the service, or the core implementation if there are no
  +     *         interceptors.
  +     * @throws org.apache.tapestry.ApplicationRuntimeException
  +     *             if there is any problem creating the service.
        */
       public Object getService(Class interfaceClass);
   
       /**
  -     * Returns the {@link Schema} used to process any parameters
  -     * passed to the service.  Service implementation factories
  -     * and service interceptor factories allow parameters.
  -     * 
  -     **/
  +     * Returns the {@link Schema}used to process any parameters passed to the service. Service
  +     * implementation factories and service interceptor factories allow parameters.
  +     */
   
       public Schema getParametersSchema();
  -    
  +
       /**
  -     * Returns the number of parameter object expected; generally this
  -     * is the default of exactly one ({@link Occurances#REQUIRED}).
  +     * Returns the number of parameter object expected; generally this is the default of exactly one (
  +     * {@link Occurances#REQUIRED}).
        */
       public Occurances getParametersCount();
  -    
  +
       /**
  -     * Forces the service to be fully instantiated immediately, rather than
  -     * lazily.
  +     * Forces the service to be fully instantiated immediately, rather than lazily.
        */
  -    
  +
       public void forceServiceInstantiation();
  -}
  +}
  \ No newline at end of file
  
  
  
  1.7       +0 -3      jakarta-hivemind/library/src/java/org/apache/hivemind/lib/pipeline/PipelineFactory.java
  
  Index: PipelineFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/library/src/java/org/apache/hivemind/lib/pipeline/PipelineFactory.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PipelineFactory.java	8 Nov 2004 14:14:25 -0000	1.6
  +++ PipelineFactory.java	28 Dec 2004 22:43:15 -0000	1.7
  @@ -17,13 +17,10 @@
   import java.util.Iterator;
   import java.util.List;
   
  -import org.apache.commons.logging.Log;
  -import org.apache.hivemind.ErrorHandler;
   import org.apache.hivemind.ErrorLog;
   import org.apache.hivemind.ServiceImplementationFactory;
   import org.apache.hivemind.ServiceImplementationFactoryParameters;
   import org.apache.hivemind.impl.BaseLocatable;
  -import org.apache.hivemind.internal.Module;
   import org.apache.hivemind.lib.DefaultImplementationBuilder;
   import org.apache.hivemind.service.ClassFactory;
   
  
  
  
  1.6       +0 -3      jakarta-hivemind/library/src/java/org/apache/hivemind/lib/pipeline/PipelineAssembler.java
  
  Index: PipelineAssembler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/library/src/java/org/apache/hivemind/lib/pipeline/PipelineAssembler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PipelineAssembler.java	8 Nov 2004 14:14:25 -0000	1.5
  +++ PipelineAssembler.java	28 Dec 2004 22:43:15 -0000	1.6
  @@ -19,7 +19,6 @@
   import org.apache.hivemind.ErrorLog;
   import org.apache.hivemind.Location;
   import org.apache.hivemind.impl.BaseLocatable;
  -import org.apache.hivemind.internal.Module;
   import org.apache.hivemind.lib.DefaultImplementationBuilder;
   import org.apache.hivemind.order.Orderer;
   import org.apache.hivemind.service.ClassFactory;
  @@ -43,8 +42,6 @@
       private ClassFactory _classFactory;
   
       private DefaultImplementationBuilder _defaultBuilder;
  -
  -    private Module _module;
   
       private Orderer _orderer;
   
  
  
  
  1.7       +0 -2      jakarta-hivemind/library/src/java/org/apache/hivemind/lib/pipeline/BridgeBuilder.java
  
  Index: BridgeBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/library/src/java/org/apache/hivemind/lib/pipeline/BridgeBuilder.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BridgeBuilder.java	9 Nov 2004 20:58:20 -0000	1.6
  +++ BridgeBuilder.java	28 Dec 2004 22:43:15 -0000	1.7
  @@ -20,10 +20,8 @@
   import java.util.Iterator;
   import java.util.List;
   
  -import org.apache.commons.logging.Log;
   import org.apache.hivemind.ApplicationRuntimeException;
   import org.apache.hivemind.ErrorLog;
  -import org.apache.hivemind.internal.Module;
   import org.apache.hivemind.service.BodyBuilder;
   import org.apache.hivemind.service.ClassFab;
   import org.apache.hivemind.service.ClassFabUtils;
  
  
  
  1.44      +0 -6      jakarta-hivemind/framework/src/java/org/apache/hivemind/parse/DescriptorParser.java
  
  Index: DescriptorParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/parse/DescriptorParser.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- DescriptorParser.java	20 Dec 2004 15:25:23 -0000	1.43
  +++ DescriptorParser.java	28 Dec 2004 22:43:15 -0000	1.44
  @@ -47,7 +47,6 @@
   import org.apache.hivemind.schema.rules.SetModuleRule;
   import org.apache.hivemind.schema.rules.SetParentRule;
   import org.apache.hivemind.schema.rules.SetPropertyRule;
  -import org.apache.hivemind.util.IdUtils;
   import org.apache.oro.text.regex.MalformedPatternException;
   import org.apache.oro.text.regex.Pattern;
   import org.apache.oro.text.regex.Perl5Compiler;
  @@ -1369,11 +1368,6 @@
                       getLocation(),
                       ex), getLocation(), ex);
           }
  -    }
  -
  -    private String qualify(String id)
  -    {
  -        return IdUtils.qualify(_moduleDescriptor.getModuleId(), id);
       }
   
       /** @since 1.1 */
  
  
  
  1.7       +0 -2      jakarta-hivemind/library/src/test/org/apache/hivemind/lib/impl/TestServicePropertyFactory.java
  
  Index: TestServicePropertyFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/library/src/test/org/apache/hivemind/lib/impl/TestServicePropertyFactory.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TestServicePropertyFactory.java	8 Nov 2004 14:14:25 -0000	1.6
  +++ TestServicePropertyFactory.java	28 Dec 2004 22:43:15 -0000	1.7
  @@ -21,8 +21,6 @@
   import org.apache.hivemind.HiveMind;
   import org.apache.hivemind.Registry;
   import org.apache.hivemind.ServiceImplementationFactoryParameters;
  -import org.apache.hivemind.impl.DefaultClassResolver;
  -import org.apache.hivemind.internal.Module;
   import org.apache.hivemind.service.impl.ClassFactoryImpl;
   import org.apache.hivemind.test.HiveMindTestCase;
   import org.easymock.MockControl;
  
  
  
  1.2       +0 -1      jakarta-hivemind/framework/src/test/org/apache/hivemind/conditional/TestNode.java
  
  Index: TestNode.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/conditional/TestNode.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestNode.java	19 Dec 2004 15:42:45 -0000	1.1
  +++ TestNode.java	28 Dec 2004 22:43:15 -0000	1.2
  @@ -19,7 +19,6 @@
   import org.apache.hivemind.condtional.Node;
   import org.apache.hivemind.condtional.NodeImpl;
   import org.apache.hivemind.test.HiveMindTestCase;
  -import org.apache.xalan.extensions.ExpressionContext;
   import org.easymock.MockControl;
   
   /**
  
  
  
  1.12      +2 -2      jakarta-hivemind/framework/src/java/org/apache/hivemind/order/Orderer.java
  
  Index: Orderer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/order/Orderer.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Orderer.java	5 Nov 2004 15:58:35 -0000	1.11
  +++ Orderer.java	28 Dec 2004 22:43:15 -0000	1.12
  @@ -360,8 +360,8 @@
                   throw new ApplicationRuntimeException(
                           "A cycle has been detected from the initial object [" + _name + "]",
                           HiveMind.getLocation(_object), null);
  -            else
  -                _dependencies.add(n);
  +
  +            _dependencies.add(n);
           }
   
           private boolean isReachable(Node n)
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: hivemind-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: hivemind-cvs-help@jakarta.apache.org


Mime
View raw message