CVS update: JGroups/src/org/jgroups/conf ProtocolConfiguration.java PlainConfigurator.java XmlConfigurator.java

  User: belaban 
  Date: 10/09/16 14:21:42

  Modified:    src/org/jgroups/conf ProtocolConfiguration.java
                        PlainConfigurator.java XmlConfigurator.java
  Log:
  ns
  
  Revision  Changes    Path
  1.5       +5 -1      JGroups/src/org/jgroups/conf/ProtocolConfiguration.java
  
  Index: ProtocolConfiguration.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/conf/ProtocolConfiguration.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ProtocolConfiguration.java	16 Sep 2010 11:55:31 -0000	1.4
  +++ ProtocolConfiguration.java	16 Sep 2010 14:21:42 -0000	1.5
  @@ -13,7 +13,7 @@
    * Parses and encapsulates the specification for 1 protocol of the protocol stack, e.g.
    * <code>UNICAST(timeout=5000)</code>
    * @author Bela Ban
  - * @version $Id: ProtocolConfiguration.java,v 1.4 2010/09/16 11:55:31 belaban Exp $
  + * @version $Id: ProtocolConfiguration.java,v 1.5 2010/09/16 14:21:42 belaban Exp $
    */
   public class ProtocolConfiguration {
       private final String protocol_name;
  @@ -63,6 +63,10 @@
           return properties;
       }
   
  +    public String getPropertiesString() {
  +        return properties_str;
  +    }
  +
       public Map<String, String> getOriginalProperties() throws Exception {
           Map<String, String> props=new HashMap<String, String>();
           parsePropertiesString(props);
  
  
  
  1.4       +10 -6     JGroups/src/org/jgroups/conf/PlainConfigurator.java
  
  Index: PlainConfigurator.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/conf/PlainConfigurator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PlainConfigurator.java	16 Sep 2010 11:55:32 -0000	1.3
  +++ PlainConfigurator.java	16 Sep 2010 14:21:42 -0000	1.4
  @@ -1,7 +1,9 @@
  -// $Id: PlainConfigurator.java,v 1.3 2010/09/16 11:55:32 belaban Exp $
  +// $Id: PlainConfigurator.java,v 1.4 2010/09/16 14:21:42 belaban Exp $
   
   package org.jgroups.conf;
   
  +import org.jgroups.stack.Configurator;
  +
   import java.util.List;
   
   /**
  @@ -32,11 +34,13 @@
           return mProperties;
       }
   
  -    /**
  -     * Throws a UnsupportedOperationException all the time. No parsing implemented.
  -     */
  +    
       public List<ProtocolConfiguration> getProtocolStack() {
  -        /**todo: Implement this org.jgroups.conf.ProtocolStackConfigurator method*/
  -        throw new java.lang.UnsupportedOperationException("Method getProtocolStack() not yet implemented.");
  +        try {
  +            return Configurator.parseConfigurations(mProperties);
  +        }
  +        catch(Exception e) {
  +            throw new RuntimeException(e);
  +        }
       }
   }
  
  
  
  1.33      +4 -16     JGroups/src/org/jgroups/conf/XmlConfigurator.java
  
  Index: XmlConfigurator.java
  ===================================================================
  RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/conf/XmlConfigurator.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- XmlConfigurator.java	16 Sep 2010 11:55:32 -0000	1.32
  +++ XmlConfigurator.java	16 Sep 2010 14:21:42 -0000	1.33
  @@ -4,7 +4,7 @@
   /**
    * Uses XML to configure a protocol stack
    * @author Vladimir Blagojevic
  - * @version $Id: XmlConfigurator.java,v 1.32 2010/09/16 11:55:32 belaban Exp $
  + * @version $Id: XmlConfigurator.java,v 1.33 2010/09/16 14:21:42 belaban Exp $
    */
   
   import org.jgroups.Global;
  @@ -71,9 +71,7 @@
   
       /**
        * 
  -     * @param convert
  -     *                If false: print old plain output, else print new XML
  -     *                format
  +     * @param convert If false: print old plain output, else print new XML format
        * @return String with protocol stack in specified format
        */
       public String getProtocolStackString(boolean convert) {
  @@ -292,14 +290,8 @@
   
               if(old_format) {
                   String cfg=inputAsString(input);
  -                Vector<ProtocolConfiguration> tmp=Configurator.parseConfigurations(cfg);
  +                List<ProtocolConfiguration> tmp=Configurator.parseConfigurations(cfg);
                   System.out.println(dump(tmp));
  -
  -                //                conf=XmlConfigurator.getInstanceOldFormat(input);
  -                //                output=conf.getProtocolStackString(true);
  -                //                output=replace(output, "org.jgroups.protocols.", "");
  -                //                System.out.println(getTitle(input_file));
  -                //                System.out.println('\n' + output);
               }
               else {
                   conf=XmlConfigurator.getInstance(input);
  @@ -312,11 +304,7 @@
           }
       }
   
  -    /**
  -     * @param tmp
  -     *                Vector of Configurator.ProtocolConfiguration
  -     * @return String (XML format)
  -     */
  +    
       private static String dump(Collection<ProtocolConfiguration> configs) {
           StringBuilder sb=new StringBuilder();
           String indent="  ";
  
  
  

------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev