openamf/src/java/org/openamf/config ServiceMethodConfig.java,NONE,1.1 ServiceMethodParameterConfig.java,NONE,1.1 ConfigDigester.java,1.5,1.6 ServiceConfig.java,1.5,1.6 ServiceOperationConfig.java,1.2,NONE ServiceOperationParameterConfig.java,1.1,NONE

[email protected]
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-serv4930/src/java/org/openamf/config

Modified Files:
	ConfigDigester.java ServiceConfig.java 
Added Files:
	ServiceMethodConfig.java ServiceMethodParameterConfig.java 
Removed Files:
	ServiceOperationConfig.java 
	ServiceOperationParameterConfig.java 
Log Message:
1) renamed ServiceOperationConfig to ServiceMethodConfig
2) renamed ServiceOperationParameterConfig to ServiceMethodParameterConfig
3) moved state-bean-ref from Service to Service Method
4) cached serviceConfig and serviceMethodConfig in request

--- NEW FILE: ServiceMethodConfig.java ---
package org.openamf.config;

import java.util.ArrayList;
import java.util.Iterator;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

public class ServiceMethodConfig {
	
	private String name;
	private ArrayList stateBeanRefs = new ArrayList();
	private ArrayList stateBeanConfigs = new ArrayList();
	private boolean stateBeanConfigsLoaded = false;
	private ArrayList parameterConfigs = new ArrayList();
	private TranslatorConfig resultTranslatorConfig;
	private ServiceConfig serviceConfig;
	
	private static Log log = LogFactory.getLog(ServiceMethodConfig.class);

	public String getName() {
		return name;
	}
	
	public void setName(String name) {
		this.name = name;
	}
	
	public void addStateBeanRef(String name) {
		log.debug("Adding stateBeanRef");
		stateBeanRefs.add(name);
	}
	
	public Iterator getStateBeanConfigs() {
		
		if (getConfig() == null) {
			return null;
		}
		
		if (!stateBeanConfigsLoaded) {
			for (Iterator iterator = stateBeanRefs.iterator(); iterator.hasNext();) {
				String name = (String) iterator.next();
				StateBeanConfig stateBeanConfig = getConfig().getStateBeanConfig(name);
				stateBeanConfigs.add(stateBeanConfig);
			}
			stateBeanConfigsLoaded = true;
		}
		return stateBeanConfigs.iterator();
	}
	
	public Iterator getParameterConfigs() {
		return parameterConfigs.iterator();
	}
	
	public void addParameterConfig(ServiceMethodParameterConfig parameterConfig) {
		parameterConfigs.add(parameterConfig);
	}

	public TranslatorConfig getResultTranslatorConfig() {
		return resultTranslatorConfig;
	}

	public void  setResultTranslatorConfig(TranslatorConfig resultTranslatorConfig) {
		this.resultTranslatorConfig = resultTranslatorConfig;
	}

	public Config getConfig() {
		if (getServiceConfig() == null) {
			return null;
		}
		return getServiceConfig().getConfig();
	}
	
	public ServiceConfig getServiceConfig() {
		return serviceConfig;
	}
	
	public void setServiceConfig(ServiceConfig serviceConfig) {
		this.serviceConfig = serviceConfig;
	}

	public String toString() {
		
		if (getServiceConfig() == null) {
			return super.toString();
		}
		
		StringBuffer sb = new StringBuffer();
		
		sb.append("\tName: ");
		sb.append(getName());
		sb.append('\n');

		sb.append("\t-----------------\n");
		sb.append("\tSTATE BEANS\n");
		sb.append("\t-----------------\n");
		for (Iterator i = getStateBeanConfigs(); i.hasNext();) {
			StateBeanConfig sbc = (StateBeanConfig)i.next();
			sb.append(sbc);
		}
		
		sb.append("\t-----------------\n");
		sb.append("\tPARAMETERS\n");
		sb.append("\t-----------------\n");
		for (Iterator i = getParameterConfigs(); i.hasNext();) {
			ServiceMethodParameterConfig smpc = (ServiceMethodParameterConfig)i.next();
			sb.append(smpc);
		}

		sb.append("\tResult Translator:\n");
		sb.append(getResultTranslatorConfig());
		sb.append('\n');


		return sb.toString();
	}

}

--- NEW FILE: ServiceMethodParameterConfig.java ---
package org.openamf.config;

public class ServiceMethodParameterConfig {
	
	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: ConfigDigester.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/config/ConfigDigester.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ConfigDigester.java	30 Apr 2003 19:40:27 -0000	1.5
--- ConfigDigester.java	1 May 2003 16:22:06 -0000	1.6
***************
*** 11,19 ****
  	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";
--- 11,19 ----
  	private static final String INVOKER_PATH = "config/invoker";
  	private static final String SERVICE_PATH = "config/service";
! 	private static final String METHOD_PATH = SERVICE_PATH + "/method";
! 	private static final String METHOD_PARAM_PATH =
! 		METHOD_PATH + "/parameter";
  	private static final String RESULT_TRANSLATOR_PATH =
! 		METHOD_PATH + "/result-translator";
  	private static final String RESULT_TRANSLATOR_PARAM_PATH =
  		RESULT_TRANSLATOR_PATH + "/parameter";
***************
*** 38,42 ****
  		addInvokerRules();
  		addServiceRules();
! 		addServiceOperationRules();
  		addResultTranslatorRules();
  		addStateBeanRules();
--- 38,42 ----
  		addInvokerRules();
  		addServiceRules();
! 		addServiceMethodRules();
  		addResultTranslatorRules();
  		addStateBeanRules();
***************
*** 69,93 ****
  			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);
  	}
  
--- 69,93 ----
  			0);
  		addCallMethod(SERVICE_PATH + "/invoker-ref", "setServiceInvokerRef", 0);
  	}
  
! 	private void addServiceMethodRules() {
! 		addObjectCreate(METHOD_PATH, ServiceMethodConfig.class);
  		addSetNext(
! 			METHOD_PATH,
! 			"addMethodConfig",
! 			"org.openamf.config.ServiceMethodConfig");
! 		addCallMethod(METHOD_PATH + "/name", "setName", 0);
! 		addCallMethod(
! 			METHOD_PATH + "/state-bean-ref/name",
! 			"addStateBeanRef",
! 			0);
  		addObjectCreate(
! 			METHOD_PARAM_PATH,
! 			ServiceMethodParameterConfig.class);
  		addSetNext(
! 			METHOD_PARAM_PATH,
  			"addParameterConfig",
! 			"org.openamf.config.ServiceMethodParameterConfig");
! 		addCallMethod(METHOD_PARAM_PATH + "/type", "setType", 0);
  	}
  

Index: ServiceConfig.java
===================================================================
RCS file: /cvsroot/openamf/openamf/src/java/org/openamf/config/ServiceConfig.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ServiceConfig.java	1 May 2003 00:58:46 -0000	1.5
--- ServiceConfig.java	1 May 2003 16:22:06 -0000	1.6
***************
*** 14,21 ****
  	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);
--- 14,18 ----
  	private ServiceInvokerConfig serviceInvokerConfig;
  	private Config config;
! 	private ArrayList methodConfigs = new ArrayList(); 
  	
  	private static Log log = LogFactory.getLog(ServiceConfig.class);
***************
*** 63,97 ****
  
  	public void setConfig(Config config) {
- 		log.debug("got config: " + config);
  		this.config = config;
  	}
  	
! 	public void addStateBeanRef(String name) {
! 		stateBeanRefs.add(name);
! 	}
! 	
! 	public Iterator getStateBeanConfigs() {
! 		
! 		if (config == null) {
! 			return null;
! 		}
! 		
! 		if (!stateBeanConfigsLoaded) {
! 			for (Iterator iterator = stateBeanRefs.iterator(); iterator.hasNext();) {
! 				String name = (String) iterator.next();
! 				StateBeanConfig stateBeanConfig = config.getStateBeanConfig(name);
! 				stateBeanConfigs.add(stateBeanConfig);
! 			}
! 			stateBeanConfigsLoaded = true;
! 		}
! 		return stateBeanConfigs.iterator();
! 	}
! 	
! 	public Iterator getOperationConfigs() {
! 		return operationConfigs.iterator();
  	}
  	
! 	public void addOperationConfig(ServiceOperationConfig operationConfig) {
! 		operationConfigs.add(operationConfig);
  	}
  	
--- 60,73 ----
  
  	public void setConfig(Config config) {
  		this.config = config;
  	}
  	
! 	public Iterator getMethodConfigs() {
! 		return methodConfigs.iterator();
  	}
  	
! 	public void addMethodConfig(ServiceMethodConfig methodConfig) {
! 		methodConfig.setServiceConfig(this);
! 		methodConfigs.add(methodConfig);
  	}
  	
***************
*** 123,138 ****
  
  		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);
  		}
--- 99,106 ----
  
  		sb.append("-----------------\n");
! 		sb.append("METHODS\n");
  		sb.append("-----------------\n");
! 		for (Iterator i = getMethodConfigs(); i.hasNext();) {
! 			ServiceMethodConfig soc = (ServiceMethodConfig)i.next();
  			sb.append(soc);
  		}

--- ServiceOperationConfig.java DELETED ---

--- ServiceOperationParameterConfig.java DELETED ---




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.