hivemind-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahue...@apache.org
Subject svn commit: r489663 - in /hivemind/branches/branch-2-0-annot: framework/src/java/org/apache/hivemind/definition/ framework/src/java/org/apache/hivemind/impl/ xml/src/descriptor/META-INF/ xml/src/java/org/apache/hivemind/impl/ xml/src/java/org/apache/hi...
Date Fri, 22 Dec 2006 14:36:46 GMT
Author: ahuegen
Date: Fri Dec 22 06:36:45 2006
New Revision: 489663

URL: http://svn.apache.org/viewvc?view=rev&rev=489663
Log:
renamed container-class-name attribute to type

Modified:
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationParser.java
    hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java
    hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/hivemodule.xml
    hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java
    hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/ConfigurationPointDescriptor.java
    hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/DescriptorParser.java
    hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/DescriptorParser.properties
    hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorFactory.xml

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationParser.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationParser.java?view=diff&rev=489663&r1=489662&r2=489663
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationParser.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/ConfigurationParser.java
Fri Dec 22 06:36:45 2006
@@ -4,5 +4,11 @@
 
 public interface ConfigurationParser
 {
+    /**
+     * Parses a configuration and returns the converted data.
+     * @param context  context
+     * @param data     the data to parse. What kind of data is expected here is parser specific.

+     * @return  the converted data.
+     */
     public Object parse(ContributionContext context, Object data);
 }

Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java?view=diff&rev=489663&r1=489662&r2=489663
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java
(original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java
Fri Dec 22 06:36:45 2006
@@ -107,6 +107,15 @@
     {
         return _registryDefinition;
     }
+ 
+    /**
+     * Constructs the registry from its {@link RegistryDefinition}. Default locale is used.
+     * @see #constructRegistry(Locale)
+     */
+    public Registry constructRegistry()
+    {
+        return constructRegistry();
+    }
     
     /**
      * Constructs the registry from its {@link RegistryDefinition}.

Modified: hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/hivemodule.xml
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/hivemodule.xml?view=diff&rev=489663&r1=489662&r2=489663
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/hivemodule.xml (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/descriptor/META-INF/hivemodule.xml Fri Dec
22 06:36:45 2006
@@ -511,7 +511,7 @@
       </element>
   </schema>
   
-  <configuration-point id="ObjectProviders" container-class="java.util.Map">
+  <configuration-point id="ObjectProviders" type="java.util.Map">
     
     Services that can provide objects for the object translator.
       

Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java?view=diff&rev=489663&r1=489662&r2=489663
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java
(original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java
Fri Dec 22 06:36:45 2006
@@ -253,7 +253,7 @@
 
             XmlConfigurationPointDefinitionImpl configurationPoint = new XmlConfigurationPointDefinitionImpl(
                     module, cpd.getId(), cpd.getLocation(), cpd.getVisibility(), 
-                    cpd.getContainerClassName(), cpd.getCount());
+                    cpd.getType(), cpd.getCount());
             module.addConfigurationPoint(configurationPoint);
             
             // If schema is embedded we can add a parser now, otherwise it must

Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/ConfigurationPointDescriptor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/ConfigurationPointDescriptor.java?view=diff&rev=489663&r1=489662&r2=489663
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/ConfigurationPointDescriptor.java
(original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/ConfigurationPointDescriptor.java
Fri Dec 22 06:36:45 2006
@@ -40,10 +40,9 @@
     private Visibility _visibility = Visibility.PUBLIC;
 
     /**
-     * Implementation class that holds the configuration data.
-     * @since 1.2
+     * Type of the configuration
      */
-    private String _containerClassName;
+    private String _type;
     
     public String toString()
     {
@@ -116,13 +115,13 @@
         _visibility = visibility;
     }
 
-    public String getContainerClassName()
+    public String getType()
     {
-        return _containerClassName;
+        return _type;
     }
 
-    public void setContainerClassName(String containerClassName)
+    public void setType(String type)
     {
-        _containerClassName = containerClassName;
+        _type = type;
     }
 }

Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/DescriptorParser.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/DescriptorParser.java?view=diff&rev=489663&r1=489662&r2=489663
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/DescriptorParser.java
(original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/DescriptorParser.java
Fri Dec 22 06:36:45 2006
@@ -778,15 +778,15 @@
 
         // Get the type of the configuration container
         // For backward compatibility, List is the default
-        String containerClassName = getAttribute("container-class", List.class.getName());
+        String typeName = getAttribute("type", List.class.getName());
 
         // Qualify the interface name with the defined package name (which will
         // often implicitly or explicitly match the module id).
 
         String fullContainerTypeName = IdUtils.qualify(
                 _moduleDescriptor.getPackageName(),
-                containerClassName);
-        cpd.setContainerClassName(fullContainerTypeName);
+                typeName);
+        cpd.setType(fullContainerTypeName);
 
         md.addConfigurationPoint(cpd);
     }

Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/DescriptorParser.properties
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/DescriptorParser.properties?view=diff&rev=489663&r1=489662&r2=489663
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/DescriptorParser.properties
(original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/DescriptorParser.properties
Fri Dec 22 06:36:45 2006
@@ -23,7 +23,7 @@
 required.configuration-point.occurs=false
 required.configuration-point.schema-id=false
 required.configuration-point.visibility=false
-required.configuration-point.container-class=false
+required.configuration-point.type=false
 
 required.service-point.id=true
 required.service-point.interface=false

Modified: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorFactory.xml
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorFactory.xml?view=diff&rev=489663&r1=489662&r2=489663
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorFactory.xml
(original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorFactory.xml
Fri Dec 22 06:36:45 2006
@@ -101,7 +101,7 @@
   	</invoke-factory>	
   </service-point>
 
-  <configuration-point id="DummyConfiguration" container-class="java.util.Map">
+  <configuration-point id="DummyConfiguration" type="java.util.Map">
 	<schema root-element-class="java.util.HashMap">
 		<element name="element" >
 			<attribute name="key"/>



Mime
View raw message