hivemind-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From k...@apache.org
Subject svn commit: r209587 - in /jakarta/hivemind/trunk: framework/src/java/org/apache/hivemind/ framework/src/java/org/apache/hivemind/impl/ framework/src/java/org/apache/hivemind/internal/ framework/src/java/org/apache/hivemind/schema/rules/ framework/src/j...
Date Thu, 07 Jul 2005 11:13:05 GMT
Author: knut
Date: Thu Jul  7 04:13:02 2005
New Revision: 209587

URL: http://svn.apache.org/viewcvs?rev=209587&view=rev
Log:
- renamed getMappedConfiguration() to getConfigurationAsMap()
- renamed canConfigurationBeMapped() to isConfigurationMappable()
- added getConfigurationAsMap() and isConfigurationMappable() to RegistryInfrastructure and
Registry interfaces
- fixed some Javadoc @since tags (s/3.1/1.1/)

Modified:
    jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/Registry.java
    jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/ConfigurationPointImpl.java
    jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/ModuleImpl.java
    jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/RegistryImpl.java
    jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/RegistryInfrastructureImpl.java
    jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/internal/ConfigurationPoint.java
    jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/internal/Module.java
    jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/internal/RegistryInfrastructure.java
    jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/schema/rules/ConfigurationTranslator.java
    jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/service/impl/ConfigurationObjectProvider.java
    jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/test/AbstractArgumentMatcher.java
    jakarta/hivemind/trunk/framework/src/test/org/apache/hivemind/impl/TestSymbolExpander.java
    jakarta/hivemind/trunk/framework/src/test/org/apache/hivemind/service/impl/TestObjectProviders.java
    jakarta/hivemind/trunk/library/src/test/org/apache/hivemind/lib/chain/ChainInterface.java

Modified: jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/Registry.java
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/Registry.java?rev=209587&r1=209586&r2=209587&view=diff
==============================================================================
--- jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/Registry.java (original)
+++ jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/Registry.java Thu Jul  7
04:13:02 2005
@@ -16,6 +16,9 @@
 
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
+
+import org.apache.hivemind.internal.Module;
 
 /**
  * The HiveMind registry; primarily this is used to gain access to services.
@@ -67,6 +70,34 @@
     public List getConfiguration(String configurationId);
 
     /**
+     * Returns true if the elements contributed to the given configuration point can be
+     * {@link #getConfigurationAsMap(String) retrieved as a Map}.
+     * 
+     * @param configurationId
+     *            the fully qualified id of the configuration
+     * @throws ApplicationRuntimeException
+     *             if the configuration does not exist, etc.
+     * @see Module#isConfigurationMappable(String)
+     * @since 1.1
+     */
+    public boolean isConfigurationMappable(String configurationId);
+
+    /**
+     * Returns the elements of the given configuration point as an unmodifiable {@link Map}.
It may
+     * be empty, but not null.
+     * 
+     * @param configurationId
+     *            the fully qualified id of the configuration
+     * @throws ApplicationRuntimeException
+     *             if no public configuration point with the given id exists or if the elements
+     *             can't be mapped.
+     * @see Module#getConfigurationAsMap(String)
+     * @see #isConfigurationMappable(String)
+     * @since 1.1
+     */
+    public Map getConfigurationAsMap(String configurationId);
+
+    /**
      * Expands any substitution symbols in the input string, replacing each symbol with the
symbols
      * value (if known). If a symbol is unknown, then the symbol is passed through unchanged
      * (complete with the <code>${</code> and <code>}</code> delimiters)
and an error is logged.
@@ -118,9 +149,9 @@
 
     /**
      * Shuts down the registry; this notifies all
-     * {@link org.apache.hivemind.events.RegistryShutdownListener} services and objects.
Once
-     * the registry is shutdown, it is no longer valid to obtain new services or configurations,
or
-     * even use existing services and configurations.
+     * {@link org.apache.hivemind.events.RegistryShutdownListener} services and objects.
Once the
+     * registry is shutdown, it is no longer valid to obtain new services or configurations,
or even
+     * use existing services and configurations.
      */
 
     public void shutdown();
@@ -129,7 +160,7 @@
      * To be invoked at the start of each request in a multi-threaded environment. Ensures
that the
      * receiving Registry will be used if any service proxies are de-serialized.
      * 
-     * @since 3.1
+     * @since 1.1
      * @see org.apache.hivemind.internal.ser.ServiceSerializationHelper
      * @see org.apache.hivemind.internal.ser.ServiceSerializationSupport
      */
@@ -142,20 +173,22 @@
      */
 
     public void cleanupThread();
-    
+
     /**
-     * Returns a list of service ids for service points which implement
-     * the desired service interface.
+     * Returns a list of service ids for service points which implement the desired service
+     * interface.
      * 
      * @return Returns an empty List if no matching service points exist.
      * @since 1.1
      */
-    public List getServiceIds( Class serviceInterface );
-    
+    public List getServiceIds(Class serviceInterface);
+
     /**
      * Returns the Messages object for the specified module.
-     * @param moduleId the module id
+     * 
+     * @param moduleId
+     *            the module id
      * @return the Messages object for the specified module.
      */
-    public Messages getModuleMessages( String moduleId );
+    public Messages getModuleMessages(String moduleId);
 }

Modified: jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/ConfigurationPointImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/ConfigurationPointImpl.java?rev=209587&r1=209586&r2=209587&view=diff
==============================================================================
--- jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/ConfigurationPointImpl.java
(original)
+++ jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/ConfigurationPointImpl.java
Thu Jul  7 04:13:02 2005
@@ -134,7 +134,7 @@
         return _elementsProxy;
     }
 
-    public boolean canElementsBeMapped()
+    public boolean areElementsMappable()
     {
         return _canElementsBeMapped;
     }
@@ -143,9 +143,9 @@
      * Returns the contributed elements as an unmodifiable {@link Map}. Internally, a proxy
to the
      * real map is returned, such that the real map may not be constructed until actually
needed.
      */
-    public synchronized Map getMappedElements()
+    public synchronized Map getElementsAsMap()
     {
-        if (!canElementsBeMapped())
+        if (!areElementsMappable())
             throw new ApplicationRuntimeException(ImplMessages.unableToMapConfiguration(this));
 
         if (_mappedElements != null)
@@ -240,7 +240,7 @@
      * Processes the contribution elements using the
      * {@link org.apache.hivemind.schema.SchemaProcessor}. The processed contributions will
be
      * stored as an immutable list (in {@link #_elements}) and as an immutable map (in
-     * {@link #_mappedElements}) if applicable (see {@link #canElementsBeMapped()}).
+     * {@link #_mappedElements}) if applicable (see {@link #areElementsMappable()}).
      */
     private void processContributionElements()
     {
@@ -275,7 +275,7 @@
                     ex), ex);
         }
 
-        if (canElementsBeMapped())
+        if (areElementsMappable())
             _mappedElements = Collections.unmodifiableMap(processor.getMappedElements());
 
         _elements = Collections.unmodifiableList(processor.getElements());

Modified: jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/ModuleImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/ModuleImpl.java?rev=209587&r1=209586&r2=209587&view=diff
==============================================================================
--- jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/ModuleImpl.java (original)
+++ jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/ModuleImpl.java Thu
Jul  7 04:13:02 2005
@@ -59,18 +59,18 @@
         return _registry.getConfiguration(qualifiedId, this);
     }
 
-    public boolean canConfigurationBeMapped(String configurationId)
+    public boolean isConfigurationMappable(String configurationId)
     {
         String qualifiedId = IdUtils.qualify(_moduleId, configurationId);
 
-        return _registry.getConfigurationPoint(qualifiedId, this).canElementsBeMapped();
+        return _registry.getConfigurationPoint(qualifiedId, this).areElementsMappable();
     }
 
-    public Map getMappedConfiguration(String configurationId)
+    public Map getConfigurationAsMap(String configurationId)
     {
         String qualifiedId = IdUtils.qualify(_moduleId, configurationId);
 
-        return _registry.getConfigurationPoint(qualifiedId, this).getMappedElements();
+        return _registry.getConfigurationPoint(qualifiedId, this).getElementsAsMap();
     }
 
     public String getModuleId()

Modified: jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/RegistryImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/RegistryImpl.java?rev=209587&r1=209586&r2=209587&view=diff
==============================================================================
--- jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/RegistryImpl.java (original)
+++ jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/RegistryImpl.java Thu
Jul  7 04:13:02 2005
@@ -16,6 +16,7 @@
 
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 import org.apache.hivemind.Location;
 import org.apache.hivemind.Messages;
@@ -58,6 +59,16 @@
         return _infrastructure.getConfiguration(configurationId, null);
     }
 
+    public boolean isConfigurationMappable(String configurationId)
+    {
+        return _infrastructure.isConfigurationMappable(configurationId, null);
+    }
+
+    public Map getConfigurationAsMap(String configurationId)
+    {
+        return _infrastructure.getConfigurationAsMap(configurationId, null);
+    }
+
     public String expandSymbols(String input, Location location)
     {
         return _infrastructure.expandSymbols(input, location);
@@ -98,21 +109,21 @@
     {
         _infrastructure.setupThread();
     }
-    
+
     /**
      * @since 1.1
      */
-    public List getServiceIds( Class serviceInterface )
+    public List getServiceIds(Class serviceInterface)
     {
-        return _infrastructure.getServiceIds( serviceInterface );
+        return _infrastructure.getServiceIds(serviceInterface);
     }
-    
+
     /**
      * @since 1.1
      */
-    public Messages getModuleMessages( String moduleId )
+    public Messages getModuleMessages(String moduleId)
     {
-        final Module module = _infrastructure.getModule( moduleId );
+        final Module module = _infrastructure.getModule(moduleId);
         return module == null ? null : module.getMessages();
     }
 }

Modified: jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/RegistryInfrastructureImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/RegistryInfrastructureImpl.java?rev=209587&r1=209586&r2=209587&view=diff
==============================================================================
--- jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/RegistryInfrastructureImpl.java
(original)
+++ jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/impl/RegistryInfrastructureImpl.java
Thu Jul  7 04:13:02 2005
@@ -154,29 +154,30 @@
         ServicePoint result = (ServicePoint) _servicePoints.get(serviceId);
         if (result == null)
         {
-            if( serviceId.indexOf( '.' ) == -1 )
+            if (serviceId.indexOf('.') == -1)
             {
                 final List possibleMatches = getMatchingServiceIds(serviceId);
-                if( !possibleMatches.isEmpty() )
+                if (!possibleMatches.isEmpty())
                 {
                     final StringBuffer sb = new StringBuffer();
-                    for( Iterator i = possibleMatches.iterator(); i.hasNext(); )
+                    for (Iterator i = possibleMatches.iterator(); i.hasNext();)
                     {
-                        final String matching = ( String )i.next();
-                        sb.append( '\"' );
-                        sb.append( matching );
-                        sb.append( '\"' );
-                        if( i.hasNext() )
+                        final String matching = (String) i.next();
+                        sb.append('\"');
+                        sb.append(matching);
+                        sb.append('\"');
+                        if (i.hasNext())
                         {
-                            sb.append( ", " );
+                            sb.append(", ");
                         }
                     }
-                    throw new ApplicationRuntimeException(ImplMessages.unqualifiedServicePoint(serviceId,
sb.toString() ));
+                    throw new ApplicationRuntimeException(ImplMessages.unqualifiedServicePoint(
+                            serviceId,
+                            sb.toString()));
                 }
             }
             throw new ApplicationRuntimeException(ImplMessages.noSuchServicePoint(serviceId));
         }
-            
 
         if (!result.visibleToModule(module))
             throw new ApplicationRuntimeException(ImplMessages.serviceNotVisible(serviceId,
module));
@@ -187,12 +188,13 @@
     private List getMatchingServiceIds(String serviceId)
     {
         final List possibleMatches = new LinkedList();
-        for( Iterator i = _servicePoints.values().iterator(); i.hasNext(); )
+        for (Iterator i = _servicePoints.values().iterator(); i.hasNext();)
         {
-            final ServicePoint servicePoint = ( ServicePoint )i.next();
-            if( servicePoint.getExtensionPointId().equals( servicePoint.getModule().getModuleId()
+ "." + serviceId ) )
+            final ServicePoint servicePoint = (ServicePoint) i.next();
+            if (servicePoint.getExtensionPointId().equals(
+                    servicePoint.getModule().getModuleId() + "." + serviceId))
             {
-                possibleMatches.add( servicePoint.getExtensionPointId() );
+                possibleMatches.add(servicePoint.getExtensionPointId());
             }
         }
         return possibleMatches;
@@ -266,6 +268,20 @@
         return point.getElements();
     }
 
+    public boolean isConfigurationMappable(String configurationId, Module module)
+    {
+        ConfigurationPoint point = getConfigurationPoint(configurationId, module);
+
+        return point.areElementsMappable();
+    }
+
+    public Map getConfigurationAsMap(String configurationId, Module module)
+    {
+        ConfigurationPoint point = getConfigurationPoint(configurationId, module);
+
+        return point.getElementsAsMap();
+    }
+
     public String toString()
     {
         ToStringBuilder builder = new ToStringBuilder(this);
@@ -564,35 +580,38 @@
         ServiceSerializationHelper.setServiceSerializationSupport(this);
     }
 
-    public Module getModule( String moduleId )
+    public Module getModule(String moduleId)
     {
-        for( Iterator i = _servicePoints.values().iterator(); i.hasNext(); )
+        for (Iterator i = _servicePoints.values().iterator(); i.hasNext();)
         {
-            final ServicePoint servicePoint = ( ServicePoint )i.next();
-            
-            if( servicePoint.getModule().getModuleId().equals( moduleId ) )
+            final ServicePoint servicePoint = (ServicePoint) i.next();
+
+            if (servicePoint.getModule().getModuleId().equals(moduleId))
             {
                 return servicePoint.getModule();
             }
         }
         return null;
     }
-    
-    /* (non-Javadoc)
+
+    /*
+     * (non-Javadoc)
+     * 
      * @see org.apache.hivemind.internal.RegistryInfrastructure#getServiceIds(java.lang.Class)
      */
     public List getServiceIds(Class serviceInterface)
     {
         final List serviceIds = new LinkedList();
-        for( Iterator i = _servicePoints.values().iterator(); i.hasNext(); )
+        for (Iterator i = _servicePoints.values().iterator(); i.hasNext();)
         {
-            final ServicePoint servicePoint = ( ServicePoint )i.next();
-            
-            if( servicePoint.getServiceInterface().equals( serviceInterface ) &&
servicePoint.visibleToModule( null ) )
+            final ServicePoint servicePoint = (ServicePoint) i.next();
+
+            if (servicePoint.getServiceInterface().equals(serviceInterface)
+                    && servicePoint.visibleToModule(null))
             {
-                serviceIds.add( servicePoint.getExtensionPointId() );
+                serviceIds.add(servicePoint.getExtensionPointId());
             }
-            
+
         }
         return serviceIds;
     }

Modified: jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/internal/ConfigurationPoint.java
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/internal/ConfigurationPoint.java?rev=209587&r1=209586&r2=209587&view=diff
==============================================================================
--- jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/internal/ConfigurationPoint.java
(original)
+++ jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/internal/ConfigurationPoint.java
Thu Jul  7 04:13:02 2005
@@ -36,18 +36,19 @@
     public List getElements();
 
     /**
-     * Returns true if the elements contributed to this configuration point can be retrieved
as a
-     * Map. The contributions in the map are keyed on an attribute as specified by the contributions
-     * schema. Thus, as a requirement, this configuration point must have a defined schema,
which in
-     * turn must support keying of all valid instances.
+     * Returns true if the elements contributed to this configuration point can be
+     * {@link #getElementsAsMap() retrieved as a Map}. The contributions in the map are keyed
on
+     * an attribute as specified by the contributions schema. Thus, as a requirement, this
+     * configuration point must have a defined schema, which in turn must support
+     * {@link Schema#canInstancesBeKeyed() keying} of all valid instances.
      * 
      * @since 1.1
      */
-    public boolean canElementsBeMapped();
+    public boolean areElementsMappable();
 
     /**
-     * Returns the constructed extensions as a map of elements assembled from the various
-     * contributions. The returned map is unmodifiable and is keyed on the contribution elements'
+     * Returns the constructed extensions as a Map of elements assembled from the various
+     * contributions. The returned Map is unmodifiable and is keyed on the contribution elements'
      * {@link org.apache.hivemind.schema.ElementModel#getKeyAttribute() key attribute}. Just
as
      * {@link #getElements()} this method may also return a proxy.
      * <p>
@@ -56,7 +57,7 @@
      * 
      * @since 1.1
      */
-    public Map getMappedElements() throws ApplicationRuntimeException;
+    public Map getElementsAsMap() throws ApplicationRuntimeException;
 
     /**
      * Returns the Schema for contributions to the configuration point (which may be null
if the

Modified: jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/internal/Module.java
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/internal/Module.java?rev=209587&r1=209586&r2=209587&view=diff
==============================================================================
--- jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/internal/Module.java (original)
+++ jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/internal/Module.java Thu
Jul  7 04:13:02 2005
@@ -105,13 +105,13 @@
     public List getConfiguration(String configurationId);
 
     /**
-     * Returns true if the elements contributed to the given configuration point can be retrieved
as
-     * a Map.
+     * Returns true if the elements contributed to the given configuration point can be
+     * {@link #getConfigurationAsMap(String) retrieved as a Map}.
      * 
-     * @see ConfigurationPoint#canElementsBeMapped()
+     * @see ConfigurationPoint#areElementsMappable()
      * @since 1.1
      */
-    public boolean canConfigurationBeMapped(String configurationId);
+    public boolean isConfigurationMappable(String configurationId);
 
     /**
      * Returns the elements of the given configuration point as an unmodifiable {@link Map}.
It may
@@ -123,11 +123,11 @@
      * @throws ApplicationRuntimeException
      *             if no configuration point with the given id exists or if the elements
can't be
      *             mapped.
-     * @see #getMappedConfiguration(String)
-     * @see Module#canConfigurationBeMapped(String)
+     * @see ConfigurationPoint#getElementsAsMap()
+     * @see #isConfigurationMappable(String)
      * @since 1.1
      */
-    public Map getMappedConfiguration(String configurationId);
+    public Map getConfigurationAsMap(String configurationId);
 
     /**
      * Returns the resource resolver for this module. The resource resolver is used to locate

Modified: jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/internal/RegistryInfrastructure.java
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/internal/RegistryInfrastructure.java?rev=209587&r1=209586&r2=209587&view=diff
==============================================================================
--- jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/internal/RegistryInfrastructure.java
(original)
+++ jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/internal/RegistryInfrastructure.java
Thu Jul  7 04:13:02 2005
@@ -16,6 +16,7 @@
 
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 import org.apache.hivemind.ErrorHandler;
 import org.apache.hivemind.Location;
@@ -67,7 +68,7 @@
      * Returns the converted items contributed to the configuration point.
      * 
      * @param configurationId
-     *            the fully qualified id of the configuration *
+     *            the fully qualified id of the configuration
      * @param module
      *            the referencing module, used for visibility checks (null means no module,
which
      *            requires that the configuration be public)
@@ -79,6 +80,40 @@
     public List getConfiguration(String configurationId, Module module);
 
     /**
+     * Returns true if the elements contributed to the given configuration point can be
+     * {@link #getConfigurationAsMap(String) retrieved as a Map}.
+     * 
+     * @param configurationId
+     *            the fully qualified id of the configuration
+     * @param module
+     *            the referencing module, used for visibility checks (null means no module,
which
+     *            requires that the configuration be public)
+     * @throws ApplicationRuntimeException
+     *             if no visible configuration point with the given id exists
+     * @see Module#isConfigurationMappable(String)
+     * @since 1.1
+     */
+    public boolean isConfigurationMappable(String configurationId, Module module);
+
+    /**
+     * Returns the elements of the given configuration point as an unmodifiable {@link Map}.
It may
+     * be empty, but not null.
+     * 
+     * @param configurationId
+     *            the fully qualified id of the configuration
+     * @param module
+     *            the referencing module, used for visibility checks (null means no module,
which
+     *            requires that the configuration be public)
+     * @throws ApplicationRuntimeException
+     *             if no visible configuration point with the given id exists or if the elements
+     *             can't be mapped.
+     * @see Module#getConfigurationAsMap(String)
+     * @see #isConfigurationMappable(String)
+     * @since 1.1
+     */
+    public Map getConfigurationAsMap(String configurationId, Module module);
+
+    /**
      * Returns the configuration point.
      * 
      * @param configurationId
@@ -205,9 +240,9 @@
 
     /**
      * Shuts down the registry; this notifies all
-     * {@link org.apache.hivemind.events.RegistryShutdownListener} services and objects.
Once
-     * the registry is shutdown, it is no longer valid to obtain new services or configurations,
or
-     * even use existing services and configurations.
+     * {@link org.apache.hivemind.events.RegistryShutdownListener} services and objects.
Once the
+     * registry is shutdown, it is no longer valid to obtain new services or configurations,
or even
+     * use existing services and configurations.
      * 
      * @since 1.1
      */
@@ -218,7 +253,7 @@
      * To be invoked at the start of each request in a multi-threaded environment. Ensures
that the
      * receiving Registry will be used if any service proxies are de-serialized.
      * 
-     * @since 3.1
+     * @since 1.1
      * @see org.apache.hivemind.internal.ser.ServiceSerializationHelper
      * @see org.apache.hivemind.internal.ser.ServiceSerializationSupport
      */
@@ -238,11 +273,12 @@
      * @param serviceInterface
      */
     public List getServiceIds(Class serviceInterface);
-    
+
     /**
      * Returns the module with the corresponding module id.
+     * 
      * @param moduleId
      * @return the module with the corresponding module id
      */
-    public Module getModule( String moduleId );
+    public Module getModule(String moduleId);
 }

Modified: jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/schema/rules/ConfigurationTranslator.java
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/schema/rules/ConfigurationTranslator.java?rev=209587&r1=209586&r2=209587&view=diff
==============================================================================
--- jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/schema/rules/ConfigurationTranslator.java
(original)
+++ jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/schema/rules/ConfigurationTranslator.java
Thu Jul  7 04:13:02 2005
@@ -35,8 +35,8 @@
         if (HiveMind.isBlank(inputValue))
             return null;
 
-        if (propertyType == Map.class && contributingModule.canConfigurationBeMapped(inputValue))
-            return contributingModule.getMappedConfiguration(inputValue);
+        if (propertyType == Map.class && contributingModule.isConfigurationMappable(inputValue))
+            return contributingModule.getConfigurationAsMap(inputValue);
 
         return contributingModule.getConfiguration(inputValue);
     }

Modified: jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/service/impl/ConfigurationObjectProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/service/impl/ConfigurationObjectProvider.java?rev=209587&r1=209586&r2=209587&view=diff
==============================================================================
--- jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/service/impl/ConfigurationObjectProvider.java
(original)
+++ jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/service/impl/ConfigurationObjectProvider.java
Thu Jul  7 04:13:02 2005
@@ -35,8 +35,8 @@
     public Object provideObject(Module contributingModule, Class propertyType, String locator,
             Location location)
     {
-        if (propertyType == Map.class && contributingModule.canConfigurationBeMapped(locator))
-            return contributingModule.getMappedConfiguration(locator);
+        if (propertyType == Map.class && contributingModule.isConfigurationMappable(locator))
+            return contributingModule.getConfigurationAsMap(locator);
 
         return contributingModule.getConfiguration(locator);
     }

Modified: jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/test/AbstractArgumentMatcher.java
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/test/AbstractArgumentMatcher.java?rev=209587&r1=209586&r2=209587&view=diff
==============================================================================
--- jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/test/AbstractArgumentMatcher.java
(original)
+++ jakarta/hivemind/trunk/framework/src/java/org/apache/hivemind/test/AbstractArgumentMatcher.java
Thu Jul  7 04:13:02 2005
@@ -23,7 +23,7 @@
  * &nbsp;to compare a <em>single</em> argument, or on its own to match <em>all</em>
arguments.
  * 
  * @author Howard M. Lewis Ship
- * @since 3.1
+ * @since 1.1
  */
 public abstract class AbstractArgumentMatcher extends AbstractMatcher implements ArgumentMatcher
 {

Modified: jakarta/hivemind/trunk/framework/src/test/org/apache/hivemind/impl/TestSymbolExpander.java
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/framework/src/test/org/apache/hivemind/impl/TestSymbolExpander.java?rev=209587&r1=209586&r2=209587&view=diff
==============================================================================
--- jakarta/hivemind/trunk/framework/src/test/org/apache/hivemind/impl/TestSymbolExpander.java
(original)
+++ jakarta/hivemind/trunk/framework/src/test/org/apache/hivemind/impl/TestSymbolExpander.java
Thu Jul  7 04:13:02 2005
@@ -25,7 +25,7 @@
  * Tests for {@link org.apache.hivemind.impl.SymbolExpander}. 
  *
  * @author Howard Lewis Ship
- * @since 3.1
+ * @since 1.1
  */
 public class TestSymbolExpander extends HiveMindTestCase
 {

Modified: jakarta/hivemind/trunk/framework/src/test/org/apache/hivemind/service/impl/TestObjectProviders.java
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/framework/src/test/org/apache/hivemind/service/impl/TestObjectProviders.java?rev=209587&r1=209586&r2=209587&view=diff
==============================================================================
--- jakarta/hivemind/trunk/framework/src/test/org/apache/hivemind/service/impl/TestObjectProviders.java
(original)
+++ jakarta/hivemind/trunk/framework/src/test/org/apache/hivemind/service/impl/TestObjectProviders.java
Thu Jul  7 04:13:02 2005
@@ -80,10 +80,10 @@
         m.getConfiguration("barney");
         mc.setReturnValue(expectedList);
 
-        m.canConfigurationBeMapped("barney");
+        m.isConfigurationMappable("barney");
         mc.setReturnValue(true);
 
-        m.getMappedConfiguration("barney");
+        m.getConfigurationAsMap("barney");
         mc.setReturnValue(expectedMap);
 
         replayControls();

Modified: jakarta/hivemind/trunk/library/src/test/org/apache/hivemind/lib/chain/ChainInterface.java
URL: http://svn.apache.org/viewcvs/jakarta/hivemind/trunk/library/src/test/org/apache/hivemind/lib/chain/ChainInterface.java?rev=209587&r1=209586&r2=209587&view=diff
==============================================================================
--- jakarta/hivemind/trunk/library/src/test/org/apache/hivemind/lib/chain/ChainInterface.java
(original)
+++ jakarta/hivemind/trunk/library/src/test/org/apache/hivemind/lib/chain/ChainInterface.java
Thu Jul  7 04:13:02 2005
@@ -18,7 +18,7 @@
  * Used to test {@link org.apache.hivemind.lib.chain.ChainBuilderImpl}.
  * 
  * @author Howard M. Lewis Ship
- * @since 3.1
+ * @since 1.1
  */
 public interface ChainInterface
 {



---------------------------------------------------------------------
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