[wsas-java-dev] svn commit r2547 - in trunk/wsas/java/modules:
admin/src/org/wso2/wsas/admin/service
admin/src/org/wso2/wsas/admin/service/META-INF
core/src/org/wso2/wsas core/src/org/wso2/wsas/util
samples/NodeManagement
svn at wso2.org
svn at wso2.org
Sun May 13 22:30:42 PDT 2007
Author: azeez
Date: Sun May 13 22:30:06 2007
New Revision: 2547
Added:
trunk/wsas/java/modules/samples/NodeManagement/loadservicegroups
Modified:
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/META-INF/services.xml
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceAdmin.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/util/PasswordUpdater.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/util/Utils.java
Log:
1. Fix for WSAS-218
2. Fix for WSAS-217
3. Added loadservicegroups script for clustering
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/META-INF/services.xml
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/META-INF/services.xml (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/META-INF/services.xml Sun May 13 22:30:06 2007
@@ -1,7 +1,6 @@
<serviceGroup>
<!--
Engage Admin module to all Admin Services
- //TODO Chaning the scope to "transportsession"
-->
<module ref="wso2wsas-admin"/>
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/OperationAdmin.java Sun May 13 22:30:06 2007
@@ -260,35 +260,38 @@
// Persist the parameter
PersistenceManager pm = new PersistenceManager();
Parameter p = axisOp.getParameter(parameter.getName());
-
- if (p != null) {
+ OperationParameterDO paramDO =
+ pm.getOperationParameter(serviceId,
+ ServiceIdentifierDO.EMPTY_SERVICE_VERSION,
+ operationId,
+ parameter.getName());
+ if (p != null && paramDO != null) {
+ // Setting a new value for a parameter declared in AxisOperation
if (!p.isLocked()) {
axisOp.addParameter(parameter);
-
- OperationParameterDO paramDO =
- pm.getOperationParameter(serviceId,
- ServiceIdentifierDO.EMPTY_SERVICE_VERSION,
- operationId,
- parameter.getName());
paramDO.setValue(parameterElement.toString());
pm.updateEntity(paramDO);
}
} else {
- axisOp.addParameter(parameter);
+ // If we are adding a new AxisOperation param or overriding a param in the Configuration hierarchy
+
+ if (p == null || !p.isLocked()) {
+ axisOp.addParameter(parameter);
- OperationParameterDO paramDO = new OperationParameterDO();
- paramDO.setName(parameter.getName());
- paramDO.setValue(parameterElement.toString());
-
- OperationDO opDO = pm.getOperation(serviceId,
- ServiceIdentifierDO.EMPTY_SERVICE_VERSION,
- operationId);
- paramDO.setOperation(opDO);
-
- try {
- pm.addEntity(paramDO);
- } catch (DuplicateEntityException e) {
- log.error("Operation Parameter already exists", e);
+ paramDO = new OperationParameterDO();
+ paramDO.setName(parameter.getName());
+ paramDO.setValue(parameterElement.toString());
+
+ OperationDO opDO = pm.getOperation(serviceId,
+ ServiceIdentifierDO.EMPTY_SERVICE_VERSION,
+ operationId);
+ paramDO.setOperation(opDO);
+
+ try {
+ pm.addEntity(paramDO);
+ } catch (DuplicateEntityException e) {
+ log.error("Operation Parameter already exists", e);
+ }
}
}
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/SecurityScenarioConfigAdmin.java Sun May 13 22:30:06 2007
@@ -162,7 +162,7 @@
List httpsTransports = new ArrayList();
for (Iterator iter = axisConfig.getTransportsIn().keySet().iterator();
iter.hasNext();) {
- String transport = ((QName) iter.next()).getLocalPart();
+ String transport = (String) iter.next();
if (transport.toLowerCase().indexOf(ServerConstants.HTTPS_TRANSPORT) != -1) {
httpsTransports.add(transport);
}
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 Sun May 13 22:30:06 2007
@@ -470,28 +470,32 @@
ServiceIdentifierDO.EMPTY_SERVICE_VERSION);
Parameter parameter = ParameterUtil.createParameter(paramterElement);
Parameter p = axisService.getParameter(parameter.getName());
+ ServiceParameterDO paramDO = pm.getServiceParameter(serviceDO,
+ parameter.getName());
+ if (p != null && paramDO != null) {
- if (p != null) {
+ // Setting a new value for a parameter declared in AxisService
if (!p.isLocked()) {
axisService.addParameter(parameter);
-
- ServiceParameterDO paramDO = pm.getServiceParameter(serviceDO,
- parameter.getName());
paramDO.setValue(paramterElement.toString());
pm.updateEntity(paramDO);
}
} else {
- axisService.addParameter(parameter);
- ServiceParameterDO param = new ServiceParameterDO();
- param.setName(parameter.getName());
- param.setValue(paramterElement.toString());
- param.setService(serviceDO);
+ // If we are adding a new AxisService param or overriding a param in the Configuration hierarchy
+ if (p == null || !p.isLocked()) {
+ axisService.addParameter(parameter);
- try {
- pm.addEntity(param);
- } catch (DuplicateEntityException e) {
- log.error("Service Parameter already exists", e);
+ ServiceParameterDO param = new ServiceParameterDO();
+ param.setName(parameter.getName());
+ param.setValue(paramterElement.toString());
+ param.setService(serviceDO);
+
+ try {
+ pm.addEntity(param);
+ } catch (DuplicateEntityException e) {
+ log.error("Service Parameter already exists", e);
+ }
}
}
}
Modified: trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java
==============================================================================
--- trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java (original)
+++ trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServiceGroupAdmin.java Sun May 13 22:30:06 2007
@@ -22,8 +22,10 @@
import org.apache.axis2.description.Parameter;
import org.apache.axis2.description.PolicyInclude;
import org.apache.neethi.Policy;
-import org.wso2.wsas.admin.service.util.ServiceGroupMetaData;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.wso2.wsas.admin.service.util.ServiceArchiveCreator;
+import org.wso2.wsas.admin.service.util.ServiceGroupMetaData;
import org.wso2.wsas.persistence.PersistenceManager;
import org.wso2.wsas.persistence.dataobject.ServiceGroupDO;
import org.wso2.wsas.persistence.dataobject.ServiceGroupParameterDO;
@@ -40,6 +42,7 @@
* Admin service to manage service groups
*/
public class ServiceGroupAdmin extends AbstractAdmin {
+ private static Log log = LogFactory.getLog(ServiceGroupAdmin.class);
private PersistenceManager pm = new PersistenceManager();
@@ -161,30 +164,32 @@
AxisServiceGroup axisServiceGroup = getAxisConfig().getServiceGroup(serviceGroupId);
Parameter parameter = ParameterUtil.createParameter(parameterElement);
- axisServiceGroup.addParameter(parameter);
-
+ Parameter p = axisServiceGroup.getParameter(parameter.getName());
ServiceGroupDO serviceGroupDO = pm.getServiceGroup(serviceGroupId);
- if (serviceGroupDO != null) {
- if (parameter.getName() != null && parameter.getName().trim().length() != 0) {
- String paramName = parameter.getName().trim();
- ServiceGroupParameterDO sgParamDO = serviceGroupDO.getParameter(paramName);
-
- if (parameter.getParameterElement() != null) {
- if (sgParamDO != null) { // Updating an existing param
- sgParamDO.setValue(parameter.getParameterElement().toString());
- serviceGroupDO.addParameter(sgParamDO);
- } else { // Adding a new param
- sgParamDO = new ServiceGroupParameterDO();
- sgParamDO.setName(paramName);
- sgParamDO.setValue(parameter.getParameterElement().toString());
- serviceGroupDO.addParameter(sgParamDO);
- try {
- pm.addEntity(sgParamDO);
- } catch (DuplicateEntityException e) {
- // Will never occur since we've checked it above
- }
- }
- pm.updateEntity(serviceGroupDO);
+ ServiceGroupParameterDO sgParamDO = serviceGroupDO.getParameter(parameter.getName());
+ if (p != null && sgParamDO != null) {
+
+ // Setting a new value for a parameter declared in AxisServiceGroup
+ if (!p.isLocked()) {
+ axisServiceGroup.addParameter(parameter);
+ sgParamDO.setValue(parameterElement.toString());
+ pm.updateEntity(sgParamDO);
+ }
+ } else {
+
+ // If we are adding a new AxisServiceGroup param or overriding a param in the Configuration hierarchy
+ if (p == null || !p.isLocked()) {
+ axisServiceGroup.addParameter(parameter);
+
+ sgParamDO = new ServiceGroupParameterDO();
+ sgParamDO.setName(parameter.getName());
+ sgParamDO.setValue(parameterElement.toString());
+ sgParamDO.setServiceGroup(serviceGroupDO);
+
+ try {
+ pm.addEntity(sgParamDO);
+ } catch (DuplicateEntityException e) {
+ log.error("Service Parameter already exists", e);
}
}
}
@@ -237,8 +242,7 @@
* @throws AxisFault
*/
public String dumpAAR(String serviceGroupName) throws AxisFault {
- return ServiceArchiveCreator.createArchive(configCtx,
- serviceGroupName);
+ return ServiceArchiveCreator.createArchive(configCtx, serviceGroupName);
}
}
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManager.java Sun May 13 22:30:06 2007
@@ -122,10 +122,7 @@
.createConfigurationContext(serverConfigurator);
// Disable admin services, if needed
- String enableAdminConsole =
- serverConfig.getFirstProperty("Management.EnableConsole");
- if (enableAdminConsole != null &&
- !Boolean.valueOf(enableAdminConsole).booleanValue()) {
+ if (!Utils.isAdminConsoleEnabled()) {
configContext.getAxisConfiguration().
removeServiceGroup(ServerConstants.ADMIN_SERVICE_GROUP);
}
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/util/PasswordUpdater.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/util/PasswordUpdater.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/util/PasswordUpdater.java Sun May 13 22:30:06 2007
@@ -142,7 +142,7 @@
statement = conn.createStatement();
int updatedRows = statement.executeUpdate(sql);
if (updatedRows == 0) {
- System.err.println(" User with name '" + username + "' does not exist!");
+ System.err.println(" User with name '" + username + "' does not exist. Creating new user.");
} else {
System.out.println("Password of user " + username + " updated successfully");
}
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/util/Utils.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/util/Utils.java (original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/util/Utils.java Sun May 13 22:30:06 2007
@@ -27,7 +27,7 @@
public class Utils {
public static boolean isAdminConsoleEnabled() {
- boolean enableAdminConsole = true;
+ boolean enableAdminConsole = false;
String enableAdminConsoleProp =
ServerConfiguration.getInstance().getFirstProperty("Management.EnableConsole");
if (enableAdminConsoleProp != null) {
Added: trunk/wsas/java/modules/samples/NodeManagement/loadservicegroups
==============================================================================
--- (empty file)
+++ trunk/wsas/java/modules/samples/NodeManagement/loadservicegroups Sun May 13 22:30:06 2007
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+ADMIN='./admin.sh --username admin --password admin --epr https://10.100.1.118:9443/services/WSO2WSASNodeManager'
+
+$ADMIN --operation loadsgs --service-groups echo,version
+if [ "$?" = "0" ]; then
+ $ADMIN --operation commit
+ if [ "$?" = "0" ]; then
+ echo Successfully committed.
+ else
+ echo Commit failed
+ fi
+else
+ echo Loading service groups failed
+fi
\ No newline at end of file
More information about the Wsas-java-dev
mailing list