CVS update: JGroups/src/org/jgroups/conf ProtocolConfiguration.java XmlConfigurator.java ProtocolData.java ProtocolParameter.java
"Bela Ban" <[email protected]> Thu, 16 Sep 2010 07:42:12 +0000
| Newsgroups | gmane.comp.java.javagroups.cvs |
|---|---|
| Message-ID | <[email protected]> |
User: belaban
Date: 10/09/16 07:42:12
Modified: src/org/jgroups/conf ProtocolConfiguration.java
XmlConfigurator.java ProtocolData.java
Removed: src/org/jgroups/conf ProtocolParameter.java
Log:
ns
Revision Changes Path
1.3 +4 -4 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProtocolConfiguration.java 16 Sep 2010 07:30:08 -0000 1.2
+++ ProtocolConfiguration.java 16 Sep 2010 07:42:12 -0000 1.3
@@ -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.2 2010/09/16 07:30:08 belaban Exp $
+ * @version $Id: ProtocolConfiguration.java,v 1.3 2010/09/16 07:42:12 belaban Exp $
*/
public class ProtocolConfiguration {
private final String protocol_name;
@@ -46,7 +46,7 @@
protocol_name=config_str.substring(0, index);
}
}
- parsePropertiesString(properties_str, properties);
+ parsePropertiesString(properties);
}
public String getProtocolName() {
@@ -59,7 +59,7 @@
public Map<String, String> getOriginalProperties() throws Exception {
Map<String, String> props=new HashMap<String, String>();
- parsePropertiesString(properties_str, props);
+ parsePropertiesString(props);
return props;
}
@@ -159,7 +159,7 @@
- protected void parsePropertiesString(String properties_str, Map<String, String> properties) throws Exception {
+ protected void parsePropertiesString(Map<String, String> properties) throws Exception {
int index=0;
/* "in_port=5555;out_port=6666" */
1.31 +5 -10 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- XmlConfigurator.java 15 Sep 2010 15:51:19 -0000 1.30
+++ XmlConfigurator.java 16 Sep 2010 07:42:12 -0000 1.31
@@ -4,7 +4,7 @@
/**
* Uses XML to configure a protocol stack
* @author Vladimir Blagojevic
- * @version $Id: XmlConfigurator.java,v 1.30 2010/09/15 15:51:19 belaban Exp $
+ * @version $Id: XmlConfigurator.java,v 1.31 2010/09/16 07:42:12 belaban Exp $
*/
import org.jgroups.Global;
@@ -246,8 +246,7 @@
Element tag=(Element)node;
String protocol=tag.getTagName();
- // System.out.println("protocol: " + protocol);
- LinkedList<ProtocolParameter> tmp=new LinkedList<ProtocolParameter>();
+ Map<String,String> params=new HashMap<String,String>();
NamedNodeMap attrs=tag.getAttributes();
int attrLength=attrs.getLength();
@@ -255,12 +254,8 @@
Attr attr=(Attr)attrs.item(a);
String name=attr.getName();
String value=attr.getValue();
- // System.out.println(" name=" + name + ", value=" + value);
- tmp.add(new ProtocolParameter(name, value));
+ params.put(name, value);
}
- ProtocolParameter[] params=new ProtocolParameter[tmp.size()];
- for(int j=0;j < tmp.size();j++)
- params[j]=tmp.get(j);
ProtocolData data=new ProtocolData(protocol, protocol, params);
prot_data.add(data);
}
@@ -284,7 +279,7 @@
- protected static ProtocolParameter[] parseProtocolParameters(Element protparams) throws IOException {
+ /* protected static ProtocolParameter[] parseProtocolParameters(Element protparams) throws IOException {
try {
Vector<ProtocolParameter> v=new Vector<ProtocolParameter>();
protparams.normalize();
@@ -306,7 +301,7 @@
tmp.initCause(x);
throw tmp;
}
- }
+ }*/
public static void main(String[] args) throws Exception {
String input_file=null;
1.15 +4 -12 JGroups/src/org/jgroups/conf/ProtocolData.java
Index: ProtocolData.java
===================================================================
RCS file: /cvsroot/javagroups/JGroups/src/org/jgroups/conf/ProtocolData.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ProtocolData.java 16 Sep 2010 07:30:08 -0000 1.14
+++ ProtocolData.java 16 Sep 2010 07:42:12 -0000 1.15
@@ -5,7 +5,7 @@
* Data holder for protocol
* @author Filip Hanik (<a href="mailto:[email protected]">[email protected])
* @author Bela Ban
- * @version $Id: ProtocolData.java,v 1.14 2010/09/16 07:30:08 belaban Exp $
+ * @version $Id: ProtocolData.java,v 1.15 2010/09/16 07:42:12 belaban Exp $
*/
import java.util.HashMap;
@@ -20,20 +20,12 @@
private final String mProtocolName;
private final String mClassName;
- /**
- *
- * @param protocolName
- * @param className
- * @param params
- * @deprecated Use {@link #ProtocolData(String, String, ProtocolParameter[])} instead
- */
- public ProtocolData(String protocolName, String className, ProtocolParameter[] params) {
+
+ public ProtocolData(String protocolName, String className, Map<String,String> params) {
mProtocolName=protocolName;
mClassName=className;
if(params != null) {
- for(int i=0; i < params.length; i++) {
- mParameters.put(params[i].getName(), params[i].getValue());
- }
+ mParameters.putAll(params);
}
}
------------------------------------------------------------------------------
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