Author: azeez
Date: Tue Jan 8 22:52:05 2008
New Revision: 11999
Log:
Support parameters which are of type java.lang.String
Modified:
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
Modified:
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
==============================================================================
---
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
(original)
+++
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
Tue Jan 8 22:52:05 2008
@@ -26,7 +26,6 @@
import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.description.AxisEndpoint;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.AxisServiceGroup;
@@ -310,12 +309,12 @@
}
}
- /* public String[] getActiveEndPoints() {
- List endpoints = new ArrayList();
- for (Iterator iter =
getAxisConfig().getServices().values().iterator(); iter.hasNext();) {
- AxisService service = (AxisService) iter.next();
- if (service.isActive()) {
- *//* String[] eprs;
+ /* public String[] getActiveEndPoints() {
+List endpoints = new ArrayList();
+for (Iterator iter = getAxisConfig().getServices().values().iterator();
iter.hasNext();) {
+AxisService service = (AxisService) iter.next();
+if (service.isActive()) {
+ *//* String[] eprs;
try {
eprs = service.getEPRs();
} catch (AxisFault e) {
@@ -342,6 +341,7 @@
return (String[]) endpoints.toArray(new String[endpoints.size()]);
}
*/
+
public int getNumberOfActiveServices() throws Exception {
int activeServices = 0;
HashMap services = getAxisConfig().getServices();
@@ -623,12 +623,12 @@
// element
public OMElement[] getServiceParameters(String serviceId,
String serviceVersion) throws
AxisFault {
- ArrayList allParameter = new ArrayList();
+ ArrayList allParameters = new ArrayList();
ArrayList globalParameters = getAxisConfig().getParameters();
for (int i = 0; i < globalParameters.size(); i++) {
Parameter parameter = (Parameter) globalParameters.get(i);
- allParameter.add(parameter.getParameterElement());
+ allParameters.add(parameter.getParameterElement());
}
AxisService service = getAxisConfig().getService(serviceId);
@@ -642,13 +642,18 @@
for (int i = 0; i < serviceParams.size(); i++) {
Parameter parameter = (Parameter) serviceParams.get(i);
- if ((parameter.getName() != null) &&
- (parameter.getName().trim().length() != 0) &&
- (parameter.getParameterElement() != null)) {
- allParameter.add(parameter.getParameterElement());
+ String paramName = parameter.getName();
+ if (paramName != null && paramName.trim().length() != 0) {
+ if (parameter.getParameterElement() != null) {
+ allParameters.add(parameter.getParameterElement());
+ } else if (parameter.getValue() != null &&
parameter.getValue() instanceof String) {
+ parameter = ParameterUtil.createParameter(paramName.trim(),
+ (String)
parameter.getValue());
+ allParameters.add(parameter.getParameterElement());
+ }
}
}
- return (OMElement[]) allParameter.toArray(new
OMElement[allParameter.size()]);
+ return (OMElement[]) allParameters.toArray(new
OMElement[allParameters.size()]);
}
// return only the parameters for explicitly set for this service (not
@@ -657,7 +662,7 @@
// element
public OMElement[] getDeclaredServiceParameters(String serviceId,
String serviceVersion)
throws AxisFault {
- ArrayList allParameter = new ArrayList();
+ ArrayList allParameters = new ArrayList();
AxisService axisService = getAxisConfig().getService(serviceId);
if (axisService == null) {
@@ -668,13 +673,19 @@
for (int i = 0; i < params.size(); i++) {
Parameter parameter = (Parameter) params.get(i);
- OMElement element = parameter.getParameterElement();
- if (element != null) {
- allParameter.add(element);
+ String paramName = parameter.getName();
+ if (paramName != null && paramName.trim().length() != 0) {
+ if (parameter.getParameterElement() != null) {
+ allParameters.add(parameter.getParameterElement());
+ } else if (parameter.getValue() != null &&
parameter.getValue() instanceof String) {
+ parameter = ParameterUtil.createParameter(paramName.trim(),
+ (String)
parameter.getValue());
+ allParameters.add(parameter.getParameterElement());
+ }
}
}
- return (OMElement[]) allParameter.toArray(new
OMElement[allParameter.size()]);
+ return (OMElement[]) allParameters.toArray(new
OMElement[allParameters.size()]);
}
public void setServiceParameters(String serviceId,
Modified:
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
==============================================================================
---
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
(original)
+++
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
Tue Jan 8 22:52:05 2008
@@ -737,13 +737,19 @@
// add the service parameters
for (Iterator iter = axisService.getParameters().iterator();
iter.hasNext();) {
Parameter parameter = (Parameter) iter.next();
- if (parameter.getName() != null &&
parameter.getName().trim().length() != 0) {
- ServiceParameterDO param = new ServiceParameterDO();
- param.setName(parameter.getName());
+ String paramName = parameter.getName();
+ if (paramName != null && paramName.trim().length() != 0) {
+ ServiceParameterDO parameterDO = new ServiceParameterDO();
+ parameterDO.setName(paramName);
if (parameter.getParameterElement() != null) {
-
param.setValue(parameter.getParameterElement().toString());
- param.setService(serviceDO);
-// session.persist(param);
+
parameterDO.setValue(parameter.getParameterElement().toString());
+ parameterDO.setService(serviceDO);
+ } else if (parameter.getValue() != null &&
+ parameter.getValue() instanceof String) {
+ parameter =
ParameterUtil.createParameter(paramName.trim(),
+ (String)
parameter.getValue());
+
parameterDO.setValue(parameter.getParameterElement().toString());
+ parameterDO.setService(serviceDO);
}
}
}
_______________________________________________
Wsas-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
