[wsas-java-dev] svn commit r4636 - in trunk/wsas/java/modules:
admin/src/org/wso2/wsas/admin/service
admin/src/org/wso2/wsas/admin/service/util
core/src/org/wso2/wsas/persistence www/extensions/core/js
svn at wso2.org
svn at wso2.org
Mon Jul 2 04:19:08 PDT 2007
Author: azeez
Date: Mon Jul 2 04:14:10 2007
New Revision: 4636
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/util/ServiceMetaData.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/persistence/PersistenceManager.java
trunk/wsas/java/modules/www/extensions/core/js/msgflows.js
trunk/wsas/java/modules/www/extensions/core/js/services.js
Log:
Fix for WSAS-195
Fxing a few convention violations
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 Mon Jul 2 04:14:10 2007
@@ -347,8 +347,8 @@
smd.setOperations((String[]) ops.toArray(new String[ops.size()]));
smd.setName(serviceName);
- smd.setService_id(serviceName);
- smd.setService_version("");
+ smd.setServiceId(serviceName);
+ smd.setServiceVersion("");
smd.setActive(service.isActive());
smd.setEprs(getServiceEPRs(service));
smd.setServiceType(serviceType);
@@ -408,9 +408,9 @@
}
smd.setOperations((String[]) ops.toArray(new String[ops.size()]));
smd.setName(serviceName);
- smd.setService_id(serviceName);
+ smd.setServiceId(serviceName);
smd.setEprs(getServiceEPRs(axisService));
- smd.setService_version("");
+ smd.setServiceVersion("");
smd.setActive(axisService.isActive());
smd.setServiceType(serviceType);
smd.setDescription(axisService.getDocumentation());
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceMetaData.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceMetaData.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/util/ServiceMetaData.java Mon Jul 2 04:14:10 2007
@@ -16,8 +16,8 @@
package org.wso2.wsas.admin.service.util;
public class ServiceMetaData {
- private String service_id;
- private String service_version;
+ private String serviceId;
+ private String serviceVersion;
private String name;
private boolean active;
private String description;
@@ -40,20 +40,20 @@
this.eprs = eprs;
}
- public String getService_id() {
- return service_id;
+ public String getServiceId() {
+ return serviceId;
}
- public void setService_id(String service_id) {
- this.service_id = service_id;
+ public void setServiceId(String serviceId) {
+ this.serviceId = serviceId;
}
- public String getService_version() {
- return service_version;
+ public String getServiceVersion() {
+ return serviceVersion;
}
- public void setService_version(String service_version) {
- this.service_version = service_version;
+ public void setServiceVersion(String serviceVersion) {
+ this.serviceVersion = serviceVersion;
}
public String getName() {
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 Mon Jul 2 04:14:10 2007
@@ -1096,7 +1096,7 @@
session.flush();
tx.commit();
- log.info("Added new module - " + ModuleIdUtil.getModuleId(axisModule));
+ log.debug("Added new module - " + ModuleIdUtil.getModuleId(axisModule));
} catch (Exception e) {
log.error("Unable to handle new module addition", e);
session.flush();
@@ -1151,7 +1151,7 @@
}
tx.commit();
- log.info("Initialized module - " + ModuleIdUtil.getModuleId(axisModule));
+ log.debug("Initialized module - " + ModuleIdUtil.getModuleId(axisModule));
} catch (Exception e) {
e.printStackTrace();
log.error("Unable to handle module init", e);
Modified: trunk/wsas/java/modules/www/extensions/core/js/msgflows.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/msgflows.js (original)
+++ trunk/wsas/java/modules/www/extensions/core/js/msgflows.js Mon Jul 2 04:14:10 2007
@@ -26,8 +26,8 @@
operationName = operationNameForEngagedOperationHandlers;
}
var body_xml = '<req:getOperationAxisConfigData xmlns:req="http://org.apache.axis2/xsd">\n' +
- ' <req:service_id>' + getServiceSpecificName() + '</req:service_id>\n' +
- ' <req:operation_id>' + operationName + '</req:operation_id>\n' +
+ ' <req:serviceId>' + getServiceSpecificName() + '</req:serviceId>\n' +
+ ' <req:operationId>' + operationName + '</req:operationId>\n' +
' </req:getOperationAxisConfigData>\n';
var callURL = serverURL + "/" + "AxisConfigAdmin" ;
@@ -59,8 +59,8 @@
function axisConfigTextPerSerivce() {
var body_xml = '<req:getOperationAxisConfigData xmlns:req="http://org.apache.axis2/xsd">\n' +
- ' <req:service_id>' + getServiceSpecificName() + '</req:service_id>\n' +
- ' <req:operation_id>' + operationNameForEngagedOperationHandlers + '</req:operation_id>\n' +
+ ' <req:serviceId>' + getServiceSpecificName() + '</req:serviceId>\n' +
+ ' <req:operationId>' + operationNameForEngagedOperationHandlers + '</req:operationId>\n' +
' </req:getOperationAxisConfigData>\n';
var callURL = serverURL + "/" + "AxisConfigAdmin" ;
Modified: trunk/wsas/java/modules/www/extensions/core/js/services.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/services.js (original)
+++ trunk/wsas/java/modules/www/extensions/core/js/services.js Mon Jul 2 04:14:10 2007
@@ -406,8 +406,8 @@
var body_xml = '<req:engageModuleForServiceRequest xmlns:req="http://org.apache.axis2/xsd">\n' +
' <req:moduleid>' + moduleName + '</req:moduleid>\n' +
' <req:moduleversion>' + moduleVersion + '</req:moduleversion>\n' +
- ' <req:service_id>' + serviceName + '</req:service_id>\n' +
- ' <req:service_version></req:service_version>\n' +
+ ' <req:serviceId>' + serviceName + '</req:serviceId>\n' +
+ ' <req:serviceVersion></req:serviceVersion>\n' +
' </req:engageModuleForServiceRequest>\n';
var callURL = serverURL + "/" + "ModuleAdmin" + "/" ;
@@ -815,8 +815,8 @@
serviceOperationParameters = operation;
}
var body_xml = '<req:getDeclaredOperationParametersRequest xmlns:req="http://org.apache.axis2/xsd">\n' +
- ' <req:service_id>' + getServiceSpecificName() + '</req:service_id>\n' +
- ' <req:operation_id>' + operation + '</req:operation_id>\n' +
+ ' <req:serviceId>' + getServiceSpecificName() + '</req:serviceId>\n' +
+ ' <req:operationId>' + operation + '</req:operationId>\n' +
' </req:getDeclaredOperationParametersRequest>\n';
var callURL = serverURL + "/" + OPERATION_ADMIN_SERVER_URL ;
@@ -876,8 +876,8 @@
}
var body_xml = '<ns1:removeOperationParameterRequest xmlns:ns1="http://org.apache.axis2/xsd">' +
- '<ns1:service_id>' + serviceId + '</ns1:service_id>' +
- '<ns1:operation_id>' + operationId + '</ns1:operation_id>' +
+ '<ns1:serviceId>' + serviceId + '</ns1:serviceId>' +
+ '<ns1:operationId>' + operationId + '</ns1:operationId>' +
'<ns1:group_version></ns1:group_version>' +
'<parameter locked="false" name="' + parameterName + '"></parameter>' +
'</ns1:removeOperationParameterRequest>';
@@ -929,8 +929,8 @@
}
var body_xml = '<ns1:setOperationParameterRequest xmlns:ns1="http://org.apache.axis2/xsd">' +
- '<ns1:service_id>' + serviceId + '</ns1:service_id>' +
- '<ns1:operation_id>' + operationId + '</ns1:operation_id>' +
+ '<ns1:serviceId>' + serviceId + '</ns1:serviceId>' +
+ '<ns1:operationId>' + operationId + '</ns1:operationId>' +
'<ns1:group_version></ns1:group_version>' +
'<parameter locked="false" name="' + parameterName + '"><![CDATA[' +
parameterValue + ']]></parameter>' +
@@ -968,8 +968,8 @@
"</div></fieldset>";
var body_xml = '<req:listOperationModulesRequest xmlns:req="http://org.apache.axis2/xsd">\n' +
- ' <req:service_id>' + getServiceSpecificName() + '</req:service_id>\n' +
- ' <req:operation_id>' + operationName + '</req:operation_id>\n' +
+ ' <req:serviceId>' + getServiceSpecificName() + '</req:serviceId>\n' +
+ ' <req:operationId>' + operationName + '</req:operationId>\n' +
' </req:listOperationModulesRequest>\n';
objDiv.innerHTML = strHTML;
@@ -1093,9 +1093,9 @@
var body_xml = '<req:engageModuleForOperationRequest xmlns:req="http://org.apache.axis2/xsd">\n' +
' <req:moduleid>' + moduleName + '</req:moduleid>\n' +
' <req:moduleversion>' + moduleVersion + '</req:moduleversion>\n' +
- ' <req:service_id>' + getServiceSpecificName() + '</req:service_id>\n' +
- ' <req:service_version></req:service_version>\n' +
- ' <req:operation_id>' + operationName + '</req:operation_id>\n' +
+ ' <req:serviceId>' + getServiceSpecificName() + '</req:serviceId>\n' +
+ ' <req:serviceVersion></req:serviceVersion>\n' +
+ ' <req:operationId>' + operationName + '</req:operationId>\n' +
' </req:engageModuleForOperationRequest>\n';
var callURL = serverURL + "/" + "ModuleAdmin" + "/" ;
@@ -1129,9 +1129,9 @@
var body_xml = '<req:disengageModuleFromOperationRequest xmlns:req="http://org.apache.axis2/xsd">\n' +
' <req:moduleid>' + moduleNameid + '</req:moduleid>\n' +
' <req:moduleversion>' + moduleVersion + '</req:moduleversion>\n' +
- ' <req:service_id>' + getServiceSpecificName() + '</req:service_id>\n' +
- ' <req:service_version></req:service_version>\n' +
- ' <req:operation_id>' + lastOperationUsed + '</req:operation_id>\n' +
+ ' <req:serviceId>' + getServiceSpecificName() + '</req:serviceId>\n' +
+ ' <req:serviceVersion></req:serviceVersion>\n' +
+ ' <req:operationId>' + lastOperationUsed + '</req:operationId>\n' +
' </req:disengageModuleFromOperationRequest>\n';
var callURL = serverURL + "/" + "ModuleAdmin" + "/" ;
@@ -1160,8 +1160,8 @@
var body_xml = '<req:disengageModuleFromService xmlns:req="http://org.apache.axis2/xsd">\n' +
' <req:moduleid>' + moduleNameid + '</req:moduleid>\n' +
' <req:moduleversion>' + moduleVersion + '</req:moduleversion>\n' +
- ' <req:service_id>' + getServiceSpecificName() + '</req:service_id>\n' +
- ' <req:service_version></req:service_version>\n' +
+ ' <req:serviceId>' + getServiceSpecificName() + '</req:serviceId>\n' +
+ ' <req:serviceVersion></req:serviceVersion>\n' +
' </req:disengageModuleFromService>\n';
var callURL = serverURL + "/" + "ModuleAdmin" + "/" ;
@@ -1208,8 +1208,8 @@
var body_xml = '<ns1:removeServiceSpecificParameterRequest xmlns:ns1="http://org.apache.axis2/xsd">' +
- '<ns1:service_id>' + serviceId + '</ns1:service_id>' +
- '<ns1:service_version>' + serviceId + '</ns1:service_version>' +
+ '<ns1:serviceId>' + serviceId + '</ns1:serviceId>' +
+ '<ns1:serviceVersion>' + serviceId + '</ns1:serviceVersion>' +
'<parameter locked="false" name="' + parameterName + '"></parameter>' +
'</ns1:removeServiceSpecificParameterRequest>';
@@ -1261,8 +1261,8 @@
var body_xml = '<ns1:setServiceParameterRequest xmlns:ns1="http://org.apache.axis2/xsd">' +
- '<ns1:service_id>' + serviceId + '</ns1:service_id>' +
- '<ns1:service_version>' + serviceId + '</ns1:service_version>' +
+ '<ns1:serviceId>' + serviceId + '</ns1:serviceId>' +
+ '<ns1:serviceVersion>' + serviceId + '</ns1:serviceVersion>' +
'<parameter locked="false" name="' + parameterName + '"><![CDATA[' +
parameterValue + ']]></parameter>' +
'</ns1:setServiceParameterRequest>';
@@ -1298,8 +1298,8 @@
lastUsedServiceVersion = serviceVersion;
var body_xml = '<req:getServiceParametersRequest xmlns:req="http://org.apache.axis2/xsd">\n' +
- ' <req:service_id>' + serviceId + '</req:service_id>\n' +
- ' <req:service_version>' + serviceVersion + '</req:service_version>\n' +
+ ' <req:serviceId>' + serviceId + '</req:serviceId>\n' +
+ ' <req:serviceVersion>' + serviceVersion + '</req:serviceVersion>\n' +
' </req:getServiceParametersRequest>\n';
More information about the Wsas-java-dev
mailing list