openamf/src/java/org/openamf/config TranslatorConfig.java,1.1,1.2 TranslatorParameterConfig.java,1.1,1.2 ServiceOperationConfig.java,1.1,1.2 ConfigDigester.java,1.3,1.4 ServiceConfig.java,1.3,1.4
[email protected] Wed, 30 Apr 2003 08:45:16 -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-serv14551/src/java/org/openamf/config
Modified Files:
TranslatorConfig.java TranslatorParameterConfig.java
ServiceOperationConfig.java ConfigDigester.java
ServiceConfig.java
Log Message:
1) moved ResultTranslator back to where is was and where it should be
2) cleaned up ConfigDigester
Index: TranslatorConfig.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/config/TranslatorConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TranslatorConfig.java 30 Apr 2003 01:02:04 -0000 1.1
--- TranslatorConfig.java 30 Apr 2003 15:45:08 -0000 1.2
***************
*** 29,39 ****
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();
--- 29,39 ----
StringBuffer sb = new StringBuffer();
! sb.append("\t\tClass Name: ");
sb.append(getClassName());
sb.append('\n');
! sb.append("\t\t-----------------\n");
! sb.append("\t\tPARAMETERS\n");
! sb.append("\t\t-----------------\n");
for (Iterator i = getParameterConfigs(); i.hasNext();) {
TranslatorParameterConfig tpc = (TranslatorParameterConfig)i.next();
Index: TranslatorParameterConfig.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/config/TranslatorParameterConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TranslatorParameterConfig.java 30 Apr 2003 01:02:04 -0000 1.1
--- TranslatorParameterConfig.java 30 Apr 2003 15:45:09 -0000 1.2
***************
*** 26,34 ****
StringBuffer sb = new StringBuffer();
! sb.append("\t\tName: ");
sb.append(getName());
sb.append('\n');
! sb.append("\t\tValue: ");
sb.append(getValue());
sb.append('\n');
--- 26,34 ----
StringBuffer sb = new StringBuffer();
! sb.append("\t\t\tName: ");
sb.append(getName());
sb.append('\n');
! sb.append("\t\t\tValue: ");
sb.append(getValue());
sb.append('\n');
Index: ServiceOperationConfig.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/config/ServiceOperationConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ServiceOperationConfig.java 30 Apr 2003 01:02:04 -0000 1.1
--- ServiceOperationConfig.java 30 Apr 2003 15:45:09 -0000 1.2
***************
*** 8,11 ****
--- 8,12 ----
private String name;
private ArrayList parameterConfigs = new ArrayList();
+ private TranslatorConfig resultTranslatorConfig;
public String getName() {
***************
*** 25,28 ****
--- 26,37 ----
}
+ public TranslatorConfig getResultTranslatorConfig() {
+ return resultTranslatorConfig;
+ }
+
+ public void setResultTranslatorConfig(TranslatorConfig resultTranslatorConfig) {
+ this.resultTranslatorConfig = resultTranslatorConfig;
+ }
+
public String toString() {
***************
*** 40,43 ****
--- 49,57 ----
sb.append(sopc);
}
+
+ sb.append("\tResult Translator:\n");
+ sb.append(getResultTranslatorConfig());
+ sb.append('\n');
+
return sb.toString();
Index: ConfigDigester.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/config/ConfigDigester.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ConfigDigester.java 30 Apr 2003 01:02:04 -0000 1.3
--- ConfigDigester.java 30 Apr 2003 15:45:09 -0000 1.4
***************
*** 9,12 ****
--- 9,23 ----
public class ConfigDigester extends Digester {
+ private static final String INVOKER_PATH = "config/invoker";
+ private static final String SERVICE_PATH = "config/service";
+ private static final String OPERATION_PATH = SERVICE_PATH + "/operation";
+ private static final String OPERATION_PARAM_PATH =
+ OPERATION_PATH + "/parameter";
+ private static final String RESULT_TRANSLATOR_PATH =
+ OPERATION_PATH + "/result-translator";
+ private static final String RESULT_TRANSLATOR_PARAM_PATH =
+ RESULT_TRANSLATOR_PATH + "/parameter";
+ private static final String STATE_BEAN_PATH = "config/state-bean";
+
protected boolean configured = false;
***************
*** 26,132 ****
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);
!
! // Mark this digester as having been configured
! configured = true;
!
}
--- 37,122 ----
addObjectCreate("config", Config.class);
! addInvokerRules();
! addServiceRules();
! addServiceOperationRules();
! addResultTranslatorRules();
! addStateBeanRules();
!
! // Mark this digester as having been configured
! configured = true;
!
! }
!
! private void addInvokerRules() {
! addObjectCreate(INVOKER_PATH, ServiceInvokerConfig.class);
addSetNext(
! INVOKER_PATH,
"addServiceInvokerConfig",
"org.openamf.config.ServiceInvokerConfig");
! addCallMethod(INVOKER_PATH + "/name", "setName", 0);
! addCallMethod(INVOKER_PATH + "/class", "setClassName", 0);
! }
! private void addServiceRules() {
! addObjectCreate(SERVICE_PATH, ServiceConfig.class);
addSetNext(
! SERVICE_PATH,
"addServiceConfig",
"org.openamf.config.ServiceConfig");
! addCallMethod(SERVICE_PATH + "/name", "setName", 0);
addCallMethod(
! SERVICE_PATH + "/service-location",
"setServiceLocation",
0);
+ addCallMethod(SERVICE_PATH + "/invoker-ref", "setServiceInvokerRef", 0);
addCallMethod(
! SERVICE_PATH + "/state-bean-ref/name",
"addStateBeanRef",
0);
+ }
! private void addServiceOperationRules() {
! addObjectCreate(OPERATION_PATH, ServiceOperationConfig.class);
addSetNext(
! OPERATION_PATH,
"addOperationConfig",
"org.openamf.config.ServiceOperationConfig");
! addCallMethod(OPERATION_PATH + "/name", "setName", 0);
addObjectCreate(
! OPERATION_PARAM_PATH,
ServiceOperationParameterConfig.class);
addSetNext(
! OPERATION_PARAM_PATH,
"addParameterConfig",
"org.openamf.config.ServiceOperationParameterConfig");
! addCallMethod(OPERATION_PARAM_PATH + "/type", "setType", 0);
! }
! private void addResultTranslatorRules() {
! addObjectCreate(RESULT_TRANSLATOR_PATH, TranslatorConfig.class);
addSetNext(
! RESULT_TRANSLATOR_PATH,
"setResultTranslatorConfig",
"org.openamf.config.TranslatorConfig");
! addCallMethod(RESULT_TRANSLATOR_PATH + "/class", "setClassName", 0);
addObjectCreate(
! RESULT_TRANSLATOR_PARAM_PATH,
TranslatorParameterConfig.class);
addSetNext(
! RESULT_TRANSLATOR_PARAM_PATH,
"addParameterConfig",
"org.openamf.config.TranslatorParameterConfig");
! addCallMethod(RESULT_TRANSLATOR_PARAM_PATH + "/name", "setName", 0);
! addCallMethod(RESULT_TRANSLATOR_PARAM_PATH + "/value", "setValue", 0);
! }
! private void addStateBeanRules() {
! addObjectCreate(STATE_BEAN_PATH, StateBeanConfig.class);
addSetNext(
! STATE_BEAN_PATH,
"addStateBeanConfig",
"org.openamf.config.StateBeanConfig");
! addCallMethod(STATE_BEAN_PATH + "/name", "setName", 0);
! addCallMethod(STATE_BEAN_PATH + "/class", "setClassName", 0);
}
Index: ServiceConfig.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/config/ServiceConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ServiceConfig.java 30 Apr 2003 05:18:01 -0000 1.3
--- ServiceConfig.java 30 Apr 2003 15:45:10 -0000 1.4
***************
*** 18,22 ****
private boolean stateBeanConfigsLoaded = false;
private ArrayList operationConfigs = new ArrayList();
- private TranslatorConfig resultTranslatorConfig;
private static Log log = LogFactory.getLog(ServiceConfig.class);
--- 18,21 ----
***************
*** 88,99 ****
}
- public TranslatorConfig getResultTranslatorConfig() {
- return resultTranslatorConfig;
- }
-
- public void setResultTranslatorConfig(TranslatorConfig resultTranslatorConfig) {
- this.resultTranslatorConfig = resultTranslatorConfig;
- }
-
public String toString() {
--- 87,90 ----
***************
*** 116,123 ****
sb.append("Service Invoker:\n");
sb.append(getServiceInvokerConfig());
- sb.append('\n');
-
- sb.append("Result Translator:\n");
- sb.append(getResultTranslatorConfig());
sb.append('\n');
--- 107,110 ----
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf