You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by hl...@apache.org on 2003/10/10 21:25:43 UTC

cvs commit: jakarta-commons-sandbox/hivemind/library .cvsignore

hlship      2003/10/10 12:25:43

  Modified:    hivemind/framework/src/test/hivemind/test/config
                        TestConfigurationPoint.java Frobable.java
               hivemind/xdocs descriptor.xml case1.xml rules.xml
               hivemind/framework/src/test/hivemind/test/rules
                        WrongType.xml
               hivemind/framework/src/test/hivemind/test/config/impl
                        FrobableHolder.java FrobImpl.java
               hivemind/framework/src/descriptor/META-INF hivemodule.xml
               hivemind/framework/src/java/org/apache/commons/hivemind/parse
                        DescriptorParser.java
               hivemind/library .cvsignore
  Added:       hivemind/framework/src/test/hivemind/test/config
                        ObjectTranslator.xml
               hivemind/framework/src/java/org/apache/commons/hivemind/schema/rules
                        ObjectTranslator.java
               hivemind/framework/src/test/hivemind/test/rules
                        TestObjectTranslator.java
  Removed:     hivemind/framework/src/test/hivemind/test/config
                        ClassTranslator.xml
               hivemind/framework/src/java/org/apache/commons/hivemind/schema/rules
                        ClassTranslator.java
               hivemind/framework/src/test/hivemind/test/rules
                        TestClassTranslator.java
  Log:
  Rename the "class" translator to "object".
  
  Revision  Changes    Path
  1.5       +4 -4      jakarta-commons-sandbox/hivemind/framework/src/test/hivemind/test/config/TestConfigurationPoint.java
  
  Index: TestConfigurationPoint.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/test/hivemind/test/config/TestConfigurationPoint.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestConfigurationPoint.java	1 Oct 2003 20:43:23 -0000	1.4
  +++ TestConfigurationPoint.java	10 Oct 2003 19:25:41 -0000	1.5
  @@ -276,11 +276,11 @@
   
       }
   
  -    public void testClassTranslator() throws Exception
  +    public void testObjectTranslator() throws Exception
       {
  -        Registry r = buildFrameworkRegistry("ClassTranslator.xml");
  +        Registry r = buildFrameworkRegistry("ObjectTranslator.xml");
   
  -        List l = r.getConfiguration("hivemind.test.config.ClassTranslator");
  +        List l = r.getConfiguration("hivemind.test.config.ObjectTranslator");
   
           assertEquals(1, l.size());
   
  
  
  
  1.2       +2 -2      jakarta-commons-sandbox/hivemind/framework/src/test/hivemind/test/config/Frobable.java
  
  Index: Frobable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/test/hivemind/test/config/Frobable.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Frobable.java	16 Sep 2003 18:51:18 -0000	1.1
  +++ Frobable.java	10 Oct 2003 19:25:41 -0000	1.2
  @@ -58,7 +58,7 @@
   package hivemind.test.config;
   
   /**
  - * Interface used for testing {@link org.apache.commons.hivemind.schema.rules.ClassTranslator}.
  + * Interface used for testing {@link org.apache.commons.hivemind.schema.rules.ObjectTranslator}.
    *
    * @author Howard Lewis Ship
    * @version $Id$
  
  
  
  1.1                  jakarta-commons-sandbox/hivemind/framework/src/test/hivemind/test/config/ObjectTranslator.xml
  
  Index: ObjectTranslator.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <!-- $Id: ObjectTranslator.xml,v 1.1 2003/10/10 19:25:41 hlship Exp $ -->
  <module id="hivemind.test.config" version="1.0.0">
  	<configuration-point id="ObjectTranslator">
  		<schema>
  			<element name="frobable">
  			  <attribute name="class" required="true"/>
  				<rules>
  					<create-object class="hivemind.test.config.impl.FrobableHolder"/>
  					<read-attribute property="frobable" attribute="class" translator="object"/>
  					<invoke-parent method="addElement"/>
  				</rules>
  			</element>
  		</schema>
  	</configuration-point>
  	<contribution configuration-id="ObjectTranslator">
  		<frobable class="hivemind.test.config.impl.FrobImpl"/>
  	</contribution>
  </module>
  
  
  
  1.28      +71 -69    jakarta-commons-sandbox/hivemind/xdocs/descriptor.xml
  
  Index: descriptor.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/xdocs/descriptor.xml,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- descriptor.xml	6 Oct 2003 18:22:30 -0000	1.27
  +++ descriptor.xml	10 Oct 2003 19:25:41 -0000	1.28
  @@ -12,8 +12,9 @@
   	<body>
   		<section name="Purpose">
   			<p>The purpose of the module descriptor is to provide a runtime and
  -				compile-time descriptioin of a module: its dependencies, services,
  -				configurations and contributions.</p>
  +				compile-time description of each HiveMind module in terms of
  +				service and configuration extension points and contributions to
  +				those extension points.</p>
   			<p>The descriptor is named <code>hivemodule.xml</code> and is stored in
   				the META-INF directory of the module.</p>
   				<p>
  @@ -56,73 +57,7 @@
   				</p>
   			
   		</section>
  -		
  -		<section name="create-instance">
  -			<p> &_create-instance; is used, within &service-point; and &implementation;
  -				to create the core service implementation for a service
  -				by instantiating a class.  This is appropriate for simple
  -				services that require no explicit configuration. </p>
  -			
  -			<table>
  -				<tr>
  -					<th>Attribute</th>
  -					<th>Type</th>
  -					<th>Required ?</th>
  -					<th>Description</th>
  -				</tr>
  -				<tr>
  -					<td>class</td>
  -					<td>class name</td>
  -					<td>yes</td>
  -					<td>Fully qualified class name to instantiate.</td>
  -				</tr>
   
  -			</table>
  -		</section>		
  -		
  -		<section name="description">
  -			<p>The &_description; element provides a user-readable description as the
  -				content of the element.  This description is used
  -				in the generated
  -				<a href="registry.html">registry documentation</a></p>
  -		</section>
  -
  -	<section name="element">
  -	
  -	<p>The &_element; element is used to define an element in a the &schema;.  &_element;
  -		may also be nested within another &_element;, to indicate an XML element that may be
  -		enclosed within another element.</p>	
  -	
  -				<table>
  -				<tr>
  -					<th>Attribute</th>
  -					<th>Type</th>
  -					<th>Required ?</th>
  -					<th>Description</th>
  -				</tr>
  -				<tr>
  -					<td>name</td>	
  -					<td>string</td>
  -					<td>yes</td>
  -					<td>The name of the element.</td>
  -				</tr>	
  -		</table>
  -		
  -		<p>
  -		Contains: &attribute;, &description;, &element;, &rules;
  -		</p>
  -		
  -	
  -		<p>
  -		Future enhancements to the HiveMind framework will include greater sophistication
  -		in defining XML content.	
  -		</p>
  -	</section>
  - 
  -
  -		
  -
  -		
   		<section name="configuration-point">
   			<p>The &_configuration-point; element defines a configuration extension point.</p>
   					
  @@ -194,6 +129,73 @@
   			
   
   		</section>
  +		
  +		<section name="create-instance">
  +			<p> &_create-instance; is used, within &service-point; and &implementation;
  +				to create the core service implementation for a service
  +				by instantiating a class.  This is appropriate for simple
  +				services that require no explicit configuration. </p>
  +			
  +			<table>
  +				<tr>
  +					<th>Attribute</th>
  +					<th>Type</th>
  +					<th>Required ?</th>
  +					<th>Description</th>
  +				</tr>
  +				<tr>
  +					<td>class</td>
  +					<td>class name</td>
  +					<td>yes</td>
  +					<td>Fully qualified class name to instantiate.</td>
  +				</tr>
  +
  +			</table>
  +		</section>		
  +		
  +		<section name="description">
  +			<p>The &_description; element provides a user-readable description as the
  +				content of the element.  This description is used
  +				in the generated
  +				<a href="registry.html">registry documentation</a></p>
  +		</section>
  +
  +	<section name="element">
  +	
  +	<p>The &_element; element is used to define an element in a the &schema;.  &_element;
  +		may also be nested within another &_element;, to indicate an XML element that may be
  +		enclosed within another element.</p>	
  +	
  +				<table>
  +				<tr>
  +					<th>Attribute</th>
  +					<th>Type</th>
  +					<th>Required ?</th>
  +					<th>Description</th>
  +				</tr>
  +				<tr>
  +					<td>name</td>	
  +					<td>string</td>
  +					<td>yes</td>
  +					<td>The name of the element.</td>
  +				</tr>	
  +		</table>
  +		
  +		<p>
  +		Contains: &attribute;, &description;, &element;, &rules;
  +		</p>
  +		
  +	
  +		<p>
  +		Future enhancements to the HiveMind framework will include greater sophistication
  +		in defining XML content.	
  +		</p>
  +	</section>
  + 
  +
  +		
  +
  +		
   		
   		<section name="implementation">
   			<p>The &implementation; element contributes a core implementation or
  
  
  
  1.10      +2 -2      jakarta-commons-sandbox/hivemind/xdocs/case1.xml
  
  Index: case1.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/xdocs/case1.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- case1.xml	29 Sep 2003 16:16:35 -0000	1.9
  +++ case1.xml	10 Oct 2003 19:25:41 -0000	1.10
  @@ -116,7 +116,7 @@
   						translator="int"/>
   					<read-attribute attribute="title" property="title"/>
   					<read-attribute attribute="class" property="executable"
  -						translator="class"/>
  +						translator="object"/>
   					<read-attribute attribute="service-id" property="executable" 
   						translator="service"/>
   					<invoke-parent method="addElement"/>
  
  
  
  1.11      +10 -8     jakarta-commons-sandbox/hivemind/xdocs/rules.xml
  
  Index: rules.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/xdocs/rules.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- rules.xml	3 Oct 2003 20:00:16 -0000	1.10
  +++ rules.xml	10 Oct 2003 19:25:41 -0000	1.11
  @@ -326,14 +326,7 @@
   
   </subsection>
   
  -<subsection name="class">
   
  -<p>
  -	The class translator converts a fully qualified class name into an object instance.  The class must implement
  -a public no-arguments constructor.
  -</p>
  -	
  -</subsection>
   
   <subsection name="enumeration">
   
  @@ -402,6 +395,15 @@
   The long translator is identitical to the int translator, except that the input is converted to a long (64 bit) integer.	
   </p>
   	
  +	
  +</subsection>
  +
  +<subsection name="object">
  +
  +<p>
  +	The object translator converts a fully qualified class name into an object instance.  The class must implement
  +a public no-arguments constructor.
  +</p>
   	
   </subsection>
   
  
  
  
  1.1                  jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/schema/rules/ObjectTranslator.java
  
  Index: ObjectTranslator.java
  ===================================================================
  /*
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2003 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   */
  
  package org.apache.commons.hivemind.schema.rules;
  
  import org.apache.commons.hivemind.Element;
  import org.apache.commons.hivemind.HiveMind;
  import org.apache.commons.hivemind.ClassResolver;
  import org.apache.commons.hivemind.LocationHolder;
  import org.apache.commons.hivemind.schema.SchemaProcessor;
  import org.apache.commons.hivemind.schema.Translator;
  import org.apache.commons.lang.StringUtils;
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
  
  /**
   * Used to translate from a class name to an instance of the class.
   *
   * @author Howard Lewis Ship
   * @version $Id: ObjectTranslator.java,v 1.1 2003/10/10 19:25:41 hlship Exp $
   */
  public class ObjectTranslator implements Translator
  {
      private static final Log LOG = LogFactory.getLog(ObjectTranslator.class);
  
      /**
       * Converts the value from a class name to an instance of the class.  Null input
       * returns null.  If an exception is thrown, then it is logged and null is returned.
       */
      public Object translate(SchemaProcessor processor, Element element, String inputValue)
      {
          if (StringUtils.isBlank(inputValue))
              return null;
  
          try
          {
              ClassResolver resolver = processor.getContributingModule().getClassResolver();
  
              Class objectClass = resolver.findClass(inputValue);
  
              Object result = objectClass.newInstance();
  
              if (result instanceof LocationHolder)
              {
                  LocationHolder holder = (LocationHolder) result;
                  holder.setLocation(element.getLocation());
              }
  
              return result;
          }
          catch (Exception ex)
          {
              LOG.error(
                  HiveMind.format(
                      "ClassTranslator.bad-class-name",
                      inputValue,
                      element.getLocation(),
                      ex.getMessage()),
                  ex);
  
              return null;
          }
      }
  
  }
  
  
  
  1.3       +2 -2      jakarta-commons-sandbox/hivemind/framework/src/test/hivemind/test/rules/WrongType.xml
  
  Index: WrongType.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/test/hivemind/test/rules/WrongType.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WrongType.xml	18 Sep 2003 19:00:58 -0000	1.2
  +++ WrongType.xml	10 Oct 2003 19:25:41 -0000	1.3
  @@ -17,7 +17,7 @@
   				
   				<element name="value">
   						<rules>
  -							<read-content property="value" translator="class"/>	
  +							<read-content property="value" translator="object"/>	
   						</rules>
   				</element>
   			</element>
  
  
  
  1.1                  jakarta-commons-sandbox/hivemind/framework/src/test/hivemind/test/rules/TestObjectTranslator.java
  
  Index: TestObjectTranslator.java
  ===================================================================
  /*
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2003 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   */
  
  package hivemind.test.rules;
  
  import hivemind.test.FrameworkTestCase;
  
  import java.util.List;
  
  import org.apache.commons.hivemind.Location;
  import org.apache.commons.hivemind.Registry;
  import org.apache.commons.hivemind.impl.BaseLocatable;
  import org.apache.commons.hivemind.impl.ElementImpl;
  import org.apache.commons.hivemind.impl.LocationImpl;
  import org.apache.commons.hivemind.schema.SchemaProcessor;
  import org.apache.commons.hivemind.schema.rules.ObjectTranslator;
  
  /**
   * Fill in some gaps in
   * {@link org.apache.commons.hivemind.schema.rules.ObjectTranslator}.
   *
   * @author Howard Lewis Ship
   * @version $Id: TestObjectTranslator.java,v 1.1 2003/10/10 19:25:41 hlship Exp $
   */
  public class TestObjectTranslator extends FrameworkTestCase
  {
  
      public TestObjectTranslator(String name)
      {
          super(name);
      }
  
      public void testNull()
      {
          ObjectTranslator t = new ObjectTranslator();
  
          assertNull(t.translate(null, null, null));
      }
  
      public void testBadClass() throws Exception
      {
          ObjectTranslator t = new ObjectTranslator();
          ElementImpl e = new ElementImpl();
          Location l = new LocationImpl(getResource("TestObjectTranslator.class"), 50);
          e.setLocation(l);
  
          SchemaProcessor p = new MockSchemaProcessor();
  
          interceptLogging();
  
          Object r = t.translate(p, e, "bad.class.Name");
  
          assertNull(r);
  
          assertLoggedMessagePattern("'bad.class.Name' is not a valid class name \\(at .*\\): Could not load class bad.class.Name");
      }
  
      public void testLocatable() throws Exception
      {
          ObjectTranslator t = new ObjectTranslator();
          ElementImpl e = new ElementImpl();
          Location l = new LocationImpl(getResource("TestObjectTranslator.class"), 50);
          e.setLocation(l);
  
          SchemaProcessor p = new MockSchemaProcessor();
  
          BaseLocatable r = (BaseLocatable) t.translate(p, e, BaseLocatable.class.getName());
  
          assertNotNull(r);
  
          assertSame(l, r.getLocation());
  
      }
  
      public void testWrongType() throws Exception
      {
          Registry r = buildFrameworkRegistry("WrongType.xml");
  
          interceptLogging();
  
          List l = r.getConfiguration("hivemind.test.rules.WrongType");
  
          // Convert the proxy into a real list; this will trigger the
          // expected errors.
  
          l.size();
  
          assertLoggedMessagePattern("Unable to set property value of hivemind\\.test\\.config\\.impl\\.Datum@.* to {} \\(at datum/value\\): ");
      }
  }
  
  
  
  1.2       +2 -2      jakarta-commons-sandbox/hivemind/framework/src/test/hivemind/test/config/impl/FrobableHolder.java
  
  Index: FrobableHolder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/test/hivemind/test/config/impl/FrobableHolder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FrobableHolder.java	16 Sep 2003 18:51:23 -0000	1.1
  +++ FrobableHolder.java	10 Oct 2003 19:25:42 -0000	1.2
  @@ -60,7 +60,7 @@
   import hivemind.test.config.Frobable;
   
   /**
  - * Interface used for testing {@link org.apache.commons.hivemind.schema.rules.ClassTranslator}.
  + * Interface used for testing {@link org.apache.commons.hivemind.schema.rules.ObjectTranslator}.
    *
    * @author Howard Lewis Ship
    * @version $Id$
  
  
  
  1.2       +2 -2      jakarta-commons-sandbox/hivemind/framework/src/test/hivemind/test/config/impl/FrobImpl.java
  
  Index: FrobImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/test/hivemind/test/config/impl/FrobImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FrobImpl.java	16 Sep 2003 18:51:23 -0000	1.1
  +++ FrobImpl.java	10 Oct 2003 19:25:42 -0000	1.2
  @@ -60,7 +60,7 @@
   import hivemind.test.config.Frobable;
   
   /**
  - * Interface used for testing {@link org.apache.commons.hivemind.schema.rules.ClassTranslator}.
  + * Interface used for testing {@link org.apache.commons.hivemind.schema.rules.ObjectTranslator}.
    *
    * @author Howard Lewis Ship
    * @version $Id$
  
  
  
  1.5       +2 -2      jakarta-commons-sandbox/hivemind/framework/src/descriptor/META-INF/hivemodule.xml
  
  Index: hivemodule.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/descriptor/META-INF/hivemodule.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- hivemodule.xml	3 Oct 2003 20:00:16 -0000	1.4
  +++ hivemodule.xml	10 Oct 2003 19:25:42 -0000	1.5
  @@ -30,7 +30,7 @@
   				<rules>
   					<create-object class="org.apache.commons.hivemind.SymbolSourceContribution"/>
   					<read-attribute property="order" attribute="order" translator="int"/>
  -					<read-attribute property="source" attribute="class" translator="class"/>
  +					<read-attribute property="source" attribute="class" translator="object"/>
   					<read-attribute property="source" attribute="service-id" translator="service"/>
   					<invoke-parent method="addElement"/>
   				</rules>
  
  
  
  1.9       +3 -3      jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/parse/DescriptorParser.java
  
  Index: DescriptorParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/parse/DescriptorParser.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DescriptorParser.java	6 Oct 2003 18:22:31 -0000	1.8
  +++ DescriptorParser.java	10 Oct 2003 19:25:42 -0000	1.9
  @@ -89,7 +89,7 @@
   import org.apache.commons.hivemind.schema.impl.ElementModelImpl;
   import org.apache.commons.hivemind.schema.impl.SchemaImpl;
   import org.apache.commons.hivemind.schema.rules.BooleanTranslator;
  -import org.apache.commons.hivemind.schema.rules.ClassTranslator;
  +import org.apache.commons.hivemind.schema.rules.ObjectTranslator;
   import org.apache.commons.hivemind.schema.rules.ConfigurationTranslator;
   import org.apache.commons.hivemind.schema.rules.CreateObjectRule;
   import org.apache.commons.hivemind.schema.rules.EnumerationTranslator;
  @@ -351,7 +351,7 @@
   
       {
           _translatorClasses.put("boolean", BooleanTranslator.class);
  -        _translatorClasses.put("class", ClassTranslator.class);
  +        _translatorClasses.put("object", ObjectTranslator.class);
           _translatorClasses.put("int", IntTranslator.class);
           _translatorClasses.put("service", ServiceTranslator.class);
           _translatorClasses.put("enumeration", EnumerationTranslator.class);
  
  
  
  1.3       +1 -0      jakarta-commons-sandbox/hivemind/library/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/library/.cvsignore,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- .cvsignore	20 Sep 2003 12:48:19 -0000	1.2
  +++ .cvsignore	10 Oct 2003 19:25:43 -0000	1.3
  @@ -1,2 +1,3 @@
   target
   bin
  +*.log
  
  
  

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