openamf/src/java/org/openamf/config ServiceInvokerConfig.java,NONE,1.1 TranslatorParameterConfig.java,NONE,1.1 TranslatorConfig.java,NONE,1.1 ServiceOperationConfig.java,NONE,1.1 ServiceOperationParameterConfig.java,NONE,1.1 Config.java,1.2,1.3 ConfigDigester.java,1.2,1.3 ServiceConfig.java,1.1,1.2 StateBeanConfig.java,1.1,1.2
[email protected] Tue, 29 Apr 2003 18:02:37 -0700
Newsgroups
gmane.comp.java.openamf.cvs
Message-ID
<[email protected] >
Update of /cvsroot/openamf/openamf/src/java/org/openamf/config
In directory sc8-pr-cvs1:/tmp/cvs-serv11161/src/java/org/openamf/config
Modified Files:
Config.java ConfigDigester.java ServiceConfig.java
StateBeanConfig.java
Added Files:
ServiceInvokerConfig.java TranslatorParameterConfig.java
TranslatorConfig.java ServiceOperationConfig.java
ServiceOperationParameterConfig.java
Log Message:
1) updated the DefaultGateway so that Invokers are completly pluggable
2) this will also enable lots of new features for the AdvancedGateway
--- NEW FILE: ServiceInvokerConfig.java ---
package org.openamf.config;
public class ServiceInvokerConfig {
private String name;
private String className;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getClassName() {
return className;
}
public void setClassName(String className) {
this.className = className;
}
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append("Name: ");
sb.append(getName());
sb.append('\n');
sb.append("Class Name: ");
sb.append(getClassName());
sb.append('\n');
return sb.toString();
}
}
--- NEW FILE: TranslatorParameterConfig.java ---
package org.openamf.config;
public class TranslatorParameterConfig {
private String name;
private String value;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append("\t\tName: ");
sb.append(getName());
sb.append('\n');
sb.append("\t\tValue: ");
sb.append(getValue());
sb.append('\n');
return sb.toString();
}
}
--- NEW FILE: TranslatorConfig.java ---
package org.openamf.config;
import java.util.ArrayList;
import java.util.Iterator;
public class TranslatorConfig {
private String className;
private ArrayList parameterConfigs = new ArrayList();
public String getClassName() {
return className;
}
public void setClassName(String className) {
this.className = className;
}
public Iterator getParameterConfigs() {
return parameterConfigs.iterator();
}
public void addParameterConfig(TranslatorParameterConfig parameterConfig) {
parameterConfigs.add(parameterConfig);
}
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append("\tClass Name: ");
sb.append(getClassName());
sb.append('\n');
sb.append("\t-----------------\n");
sb.append("\tPARAMETERS\n");
sb.append("\t-----------------\n");
for (Iterator i = getParameterConfigs(); i.hasNext();) {
TranslatorParameterConfig tpc = (TranslatorParameterConfig)i.next();
sb.append(tpc);
}
return sb.toString();
}
}
--- NEW FILE: ServiceOperationConfig.java ---
package org.openamf.config;
import java.util.ArrayList;
import java.util.Iterator;
public class ServiceOperationConfig {
private String name;
private ArrayList parameterConfigs = new ArrayList();
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public Iterator getParameterConfigs() {
return parameterConfigs.iterator();
}
public void addParameterConfig(ServiceOperationParameterConfig parameterConfig) {
parameterConfigs.add(parameterConfig);
}
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append("\tName: ");
sb.append(getName());
sb.append('\n');
sb.append("\t-----------------\n");
sb.append("\tPARAMETERS\n");
sb.append("\t-----------------\n");
for (Iterator i = getParameterConfigs(); i.hasNext();) {
ServiceOperationParameterConfig sopc = (ServiceOperationParameterConfig)i.next();
sb.append(sopc);
}
return sb.toString();
}
}
--- NEW FILE: ServiceOperationParameterConfig.java ---
package org.openamf.config;
public class ServiceOperationParameterConfig {
private String type;
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String toString() {
StringBuffer sb = new StringBuffer();
sb.append("\t\t\tType: ");
sb.append(getType());
sb.append('\n');
return sb.toString();
}
}
Index: Config.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/config/Config.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Config.java 18 Apr 2003 23:53:13 -0000 1.2
--- Config.java 30 Apr 2003 01:02:04 -0000 1.3
***************
*** 1,11 ****
--- 1,36 ----
package org.openamf.config;
+ import java.util.ArrayList;
import java.util.HashMap;
+ import java.util.Iterator;
public class Config {
private HashMap serviceConfigs = new HashMap();
+ private ArrayList serviceInvokerConfigs = new ArrayList();
private HashMap stateBeanConfigs = new HashMap();
+ public void addServiceInvokerConfig(ServiceInvokerConfig serviceInvokerConfig) {
+ serviceInvokerConfigs.add(serviceInvokerConfig);
+ }
+
+ public ServiceInvokerConfig getServiceInvokerConfig(String name) {
+
+ ServiceInvokerConfig serviceInvokerConfig = null;
+
+ for (Iterator i = getServiceInvokerConfigs(); i.hasNext();) {
+ ServiceInvokerConfig sic = (ServiceInvokerConfig)i.next();
+ if (sic.getName().equals(name)) {
+ serviceInvokerConfig = sic;
+ break;
+ }
+ }
+ return serviceInvokerConfig;
+ }
+
+ public Iterator getServiceInvokerConfigs() {
+ return serviceInvokerConfigs.iterator();
+ }
+
public void addServiceConfig(ServiceConfig serviceConfig) {
serviceConfig.setConfig(this);
***************
*** 14,22 ****
public ServiceConfig getServiceConfig(String name) {
! ServiceConfig service = (ServiceConfig) serviceConfigs.get(name);
!
! return service;
}
public void addStateBeanConfig(StateBeanConfig stateBeanConfig) {
stateBeanConfigs.put(stateBeanConfig.getName(), stateBeanConfig);
--- 39,49 ----
public ServiceConfig getServiceConfig(String name) {
! return (ServiceConfig) serviceConfigs.get(name);
}
+ public Iterator getServiceConfigs() {
+ return serviceConfigs.values().iterator();
+ }
+
public void addStateBeanConfig(StateBeanConfig stateBeanConfig) {
stateBeanConfigs.put(stateBeanConfig.getName(), stateBeanConfig);
***************
*** 26,29 ****
--- 53,91 ----
return (StateBeanConfig) stateBeanConfigs.get(name);
}
+
+ public Iterator getStateBeanConfigs() {
+ return stateBeanConfigs.values().iterator();
+ }
+
+ public String toString() {
+
+ StringBuffer sb = new StringBuffer();
+
+ sb.append("\n=================\n");
+ sb.append("SERVICE INVOKERS\n");
+ sb.append("=================\n");
+ for (Iterator i = getServiceInvokerConfigs(); i.hasNext();) {
+ ServiceInvokerConfig sic = (ServiceInvokerConfig)i.next();
+ sb.append(sic);
+ }
+
+ sb.append("\n=========\n");
+ sb.append("SERVICES\n");
+ sb.append("=========\n");
+ for (Iterator i = getServiceConfigs(); i.hasNext();) {
+ ServiceConfig sc = (ServiceConfig)i.next();
+ sb.append(sc);
+ }
+
+ sb.append("\n=========\n");
+ sb.append("STATE BEANS\n");
+ sb.append("=========\n");
+ for (Iterator i = getStateBeanConfigs(); i.hasNext();) {
+ StateBeanConfig sbc = (StateBeanConfig)i.next();
+ sb.append(sbc);
+ }
+
+ return sb.toString();
+ }
}
Index: ConfigDigester.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/config/ConfigDigester.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConfigDigester.java 18 Apr 2003 23:53:13 -0000 1.2
--- ConfigDigester.java 30 Apr 2003 01:02:04 -0000 1.3
***************
*** 26,40 ****
addObjectCreate("config", Config.class);
addObjectCreate("config/services/service", ServiceConfig.class);
! addSetNext("config/services/service", "addServiceConfig",
! "org.openamf.config.ServiceConfig");
addCallMethod("config/services/service/name", "setName", 0);
! addCallMethod("config/services/service/service-location", "setServiceLocation", 0);
! addCallMethod("config/services/service/service-invoker-class", "setServiceInvokerClassName", 0);
! addCallMethod("config/services/service/state-bean-ref/name", "addStateBeanRef", 0);
addObjectCreate("config/state-beans/state-bean", StateBeanConfig.class);
! addSetNext("config/state-beans/state-bean", "addStateBeanConfig",
! "org.openamf.config.StateBeanConfig");
addCallMethod("config/state-beans/state-bean/name", "setName", 0);
addCallMethod("config/state-beans/state-bean/class", "setClassName", 0);
--- 26,126 ----
addObjectCreate("config", Config.class);
+ ////////////////////////////////////////////////////////////////
+ // INVOKERS
+ ////////////////////////////////////////////////////////////////
+ addObjectCreate("config/invokers/invoker", ServiceInvokerConfig.class);
+ addSetNext(
+ "config/invokers/invoker",
+ "addServiceInvokerConfig",
+ "org.openamf.config.ServiceInvokerConfig");
+ addCallMethod("config/invokers/invoker/name", "setName", 0);
+ addCallMethod("config/invokers/invoker/class", "setClassName", 0);
+
+ ////////////////////////////////////////////////////////////////
+ // SERVICES
+ ////////////////////////////////////////////////////////////////
addObjectCreate("config/services/service", ServiceConfig.class);
! addSetNext(
! "config/services/service",
! "addServiceConfig",
! "org.openamf.config.ServiceConfig");
addCallMethod("config/services/service/name", "setName", 0);
! addCallMethod(
! "config/services/service/service-location",
! "setServiceLocation",
! 0);
! addCallMethod(
! "config/services/service/invoker-ref",
! "setServiceInvokerRef",
! 0);
! addCallMethod(
! "config/services/service/state-bean-ref/name",
! "addStateBeanRef",
! 0);
+ ////////////////////////////////////////////////////////////////
+ // SERVICES OPERATIONS
+ ////////////////////////////////////////////////////////////////
+ addObjectCreate(
+ "config/services/service/operations/operation",
+ ServiceOperationConfig.class);
+ addSetNext(
+ "config/services/service/operations/operation",
+ "addOperationConfig",
+ "org.openamf.config.ServiceOperationConfig");
+ addCallMethod(
+ "config/services/service/operations/operation/name",
+ "setName",
+ 0);
+ addObjectCreate(
+ "config/services/service/operations/operation/parameters/parameter",
+ ServiceOperationParameterConfig.class);
+ addSetNext(
+ "config/services/service/operations/operation/parameters/parameter",
+ "addParameterConfig",
+ "org.openamf.config.ServiceOperationParameterConfig");
+ addCallMethod(
+ "config/services/service/operations/operation/parameters/parameter/type",
+ "setType",
+ 0);
+
+ ////////////////////////////////////////////////////////////////
+ // SERVICES RESULT TRANSLATOR
+ ////////////////////////////////////////////////////////////////
+ addObjectCreate(
+ "config/services/service/result-translator",
+ TranslatorConfig.class);
+ addSetNext(
+ "config/services/service/result-translator",
+ "setResultTranslatorConfig",
+ "org.openamf.config.TranslatorConfig");
+ addCallMethod(
+ "config/services/service/result-translator/class",
+ "setClassName",
+ 0);
+ addObjectCreate(
+ "config/services/service/result-translator/parameters/parameter",
+ TranslatorParameterConfig.class);
+ addSetNext(
+ "config/services/service/result-translator/parameters/parameter",
+ "addParameterConfig",
+ "org.openamf.config.TranslatorParameterConfig");
+ addCallMethod(
+ "config/services/service/result-translator/parameters/parameter/name",
+ "setName",
+ 0);
+ addCallMethod(
+ "config/services/service/result-translator/parameters/parameter/value",
+ "setValue",
+ 0);
+
+ ////////////////////////////////////////////////////////////////
+ // STATE BEANS
+ ////////////////////////////////////////////////////////////////
addObjectCreate("config/state-beans/state-bean", StateBeanConfig.class);
! addSetNext(
! "config/state-beans/state-bean",
! "addStateBeanConfig",
! "org.openamf.config.StateBeanConfig");
addCallMethod("config/state-beans/state-bean/name", "setName", 0);
addCallMethod("config/state-beans/state-bean/class", "setClassName", 0);
***************
*** 44,48 ****
}
-
}
--- 130,133 ----
Index: ServiceConfig.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/config/ServiceConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ServiceConfig.java 18 Apr 2003 23:53:13 -0000 1.1
--- ServiceConfig.java 30 Apr 2003 01:02:04 -0000 1.2
***************
*** 11,20 ****
private String name;
private String serviceLocation;
! private String serviceInvokerClassName;
private Config config;
private ArrayList stateBeanRefs = new ArrayList();
private ArrayList stateBeanConfigs = new ArrayList();
private boolean stateBeanConfigsLoaded = false;
!
private static Log log = LogFactory.getLog(ServiceConfig.class);
--- 11,22 ----
private String name;
private String serviceLocation;
! private String serviceInvokerRef;
! private ServiceInvokerConfig serviceInvokerConfig;
private Config config;
private ArrayList stateBeanRefs = new ArrayList();
private ArrayList stateBeanConfigs = new ArrayList();
private boolean stateBeanConfigsLoaded = false;
! private ArrayList operationConfigs = new ArrayList();
!
private static Log log = LogFactory.getLog(ServiceConfig.class);
***************
*** 35,44 ****
}
! public String getServiceInvokerClassName() {
! return serviceInvokerClassName;
}
! public void setServiceInvokerClassName(String serviceInvokerClassName) {
! this.serviceInvokerClassName = serviceInvokerClassName;
}
--- 37,55 ----
}
! public String getServiceInvokerRef() {
! return serviceInvokerRef;
}
! public void setServiceInvokerRef(String serviceInvokerRef) {
! this.serviceInvokerRef = serviceInvokerRef;
! }
!
! public ServiceInvokerConfig getServiceInvokerConfig() {
!
! if (serviceInvokerConfig == null) {
! serviceInvokerConfig = config.getServiceInvokerConfig(serviceInvokerRef);
! }
!
! return serviceInvokerConfig;
}
***************
*** 67,70 ****
--- 78,89 ----
return stateBeanConfigs.iterator();
}
+
+ public Iterator getOperationConfigs() {
+ return operationConfigs.iterator();
+ }
+
+ public void addOperationConfig(ServiceOperationConfig operationConfig) {
+ operationConfigs.add(operationConfig);
+ }
public String toString() {
***************
*** 72,75 ****
--- 91,96 ----
StringBuffer sb = new StringBuffer();
+ sb.append("\n**************************\n");
+
sb.append("Name: ");
sb.append(getName());
***************
*** 80,86 ****
sb.append('\n');
! sb.append("Service Invoker Class Name: ");
! sb.append(getServiceInvokerClassName());
sb.append('\n');
return sb.toString();
--- 101,127 ----
sb.append('\n');
! sb.append("Service Invoker Ref: ");
! sb.append(getServiceInvokerRef());
sb.append('\n');
+
+ sb.append("Service Invoker: ");
+ sb.append(getServiceInvokerConfig());
+ sb.append('\n');
+
+ sb.append("-----------------\n");
+ sb.append("STATE BEANS\n");
+ sb.append("-----------------\n");
+ for (Iterator i = getStateBeanConfigs(); i.hasNext();) {
+ StateBeanConfig sbc = (StateBeanConfig)i.next();
+ sb.append(sbc);
+ }
+
+ sb.append("-----------------\n");
+ sb.append("OPERATIONS\n");
+ sb.append("-----------------\n");
+ for (Iterator i = getOperationConfigs(); i.hasNext();) {
+ ServiceOperationConfig soc = (ServiceOperationConfig)i.next();
+ sb.append(soc);
+ }
return sb.toString();
Index: StateBeanConfig.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/config/StateBeanConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StateBeanConfig.java 18 Apr 2003 23:53:13 -0000 1.1
--- StateBeanConfig.java 30 Apr 2003 01:02:04 -0000 1.2
***************
*** 22,24 ****
--- 22,40 ----
}
+ public String toString() {
+
+ StringBuffer sb = new StringBuffer();
+
+ sb.append("Name: ");
+ sb.append(getName());
+ sb.append('\n');
+
+ sb.append("Class Name: ");
+ sb.append(getClassName());
+ sb.append('\n');
+
+ return sb.toString();
+ }
+
+
}
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf