Author: azeez
Date: Thu Jan 3 01:33:42 2008
New Revision: 11808
Log:
1. Enable JMX only for JDK 1.5 and higher versions
2. Handle service START & STOP events
Modified:
trunk/commons/statistics/modules/core/src/main/java/org/wso2/statistics/service/StatisticsService.java
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.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/UserAdmin.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/DefaultServerInitializer.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManagement.java
trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java
trunk/wsas/java/modules/www/extensions/core/js/users.js
trunk/wsas/java/pom.xml
Modified:
trunk/commons/statistics/modules/core/src/main/java/org/wso2/statistics/service/StatisticsService.java
==============================================================================
---
trunk/commons/statistics/modules/core/src/main/java/org/wso2/statistics/service/StatisticsService.java
(original)
+++
trunk/commons/statistics/modules/core/src/main/java/org/wso2/statistics/service/StatisticsService.java
Thu Jan 3 01:33:42 2008
@@ -40,7 +40,8 @@
static {
String jmxPort =
ServerConfiguration.getInstance().getFirstProperty("Ports.JMX");
- if (jmxPort != null) {
+ String javaVersion = System.getProperty("java.version");
+ if (jmxPort != null && javaVersion.indexOf("1.4") == -1) { // In WSAS,
JMX is not supported on JDK 1.4
try {
MBeanRegistrar.
registerMBean(new StatisticsService(),
Modified:
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java
==============================================================================
---
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java
(original)
+++
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/ServerAdmin.java
Thu Jan 3 01:33:42 2008
@@ -41,7 +41,8 @@
static {
String jmxPort =
ServerConfiguration.getInstance().getFirstProperty("Ports.JMX");
- if (jmxPort != null) {
+ String javaVersion = System.getProperty("java.version");
+ if (jmxPort != null && javaVersion.indexOf("1.4") == -1) { // In WSAS,
JMX is not supported on JDK 1.4
try {
MBeanRegistrar.
registerMBean(new ServerAdmin(),
"WSO2:type=ServerAdmin");
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
Thu Jan 3 01:33:42 2008
@@ -118,7 +118,8 @@
static {
String jmxPort =
ServerConfiguration.getInstance().getFirstProperty("Ports.JMX");
- if (jmxPort != null) {
+ String javaVersion = System.getProperty("java.version");
+ if (jmxPort != null && javaVersion.indexOf("1.4") == -1) { // In WSAS,
JMX is not supported on JDK 1.4
try {
MBeanRegistrar.
registerMBean(new ServiceAdmin(),
"WSO2:type=ServiceAdmin");
@@ -318,10 +319,6 @@
try {
getAxisConfig().stopService(serviceName);
- ServiceDO service = pm.getService(serviceName,
-
ServiceIdentifierDO.EMPTY_SERVICE_VERSION);
- service.setIsActive(false);
- pm.updateEntity(service);
} catch (AxisFault e) {
String msg = "Cannot stop service " + serviceName;
log.error(msg, e);
@@ -337,10 +334,6 @@
}
try {
getAxisConfig().startService(serviceName);
- ServiceDO service = pm.getService(serviceName,
-
ServiceIdentifierDO.EMPTY_SERVICE_VERSION);
- service.setIsActive(true);
- pm.updateEntity(service);
} catch (AxisFault e) {
String msg = "Cannot start service " + serviceName;
log.error(msg, e);
Modified:
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java
==============================================================================
---
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java
(original)
+++
trunk/wsas/java/modules/admin/src/org/wso2/wsas/admin/service/UserAdmin.java
Thu Jan 3 01:33:42 2008
@@ -153,6 +153,38 @@
return true;
}
+ public boolean changeUserPassword(String username, String password) throws
Exception {
+ if ((username == null) || (username.trim().length() == 0)) {
+ return false;
+ }
+
+ if ((password == null) || (password.trim().length() == 0)) {
+ return false;
+ }
+
+ if (username.equals("admin") && password.equals("admin")) {
+ throw new Exception("This password is not allowed for
Administrator 'admin'");
+ }
+
+ ServiceUserDO serviceUserDO = pm.getUser(username);
+
+ if (serviceUserDO == null) {
+ return false;
+ }
+
+ ServerConfiguration config = ServerConfiguration.getInstance();
+ CryptoUtil cryptoUtil =
+ new CryptoUtil(new
File(config.getFirstProperty("Security.KeyStore.Location")).getAbsolutePath(),
+
config.getFirstProperty("Security.KeyStore.Password"),
+
config.getFirstProperty("Security.KeyStore.KeyAlias"),
+
config.getFirstProperty("Security.KeyStore.KeyPassword"),
+
config.getFirstProperty("Security.KeyStore.Type"));
+
serviceUserDO.setPassword(cryptoUtil.encryptAndBase64Encode(password.getBytes()));
+ pm.updateUser(serviceUserDO);
+
+ return true;
+ }
+
public boolean editUserRole(String username, String role)
throws Exception {
if ((username == null) || (username.trim().length() == 0)) {
@@ -192,8 +224,8 @@
/**
* Assign a role to an existing user
*
- * @param username The username of the user to whom the role is to be
assigned
- * @param role The role to be assigned
+ * @param username The username of the user to whom the role is to be
assigned
+ * @param role The role to be assigned
* @throws AxisFault If role assignment fails
*/
public void assignRoleToUser(String username, String role) throws
AxisFault {
Modified:
trunk/wsas/java/modules/core/src/org/wso2/wsas/DefaultServerInitializer.java
==============================================================================
---
trunk/wsas/java/modules/core/src/org/wso2/wsas/DefaultServerInitializer.java
(original)
+++
trunk/wsas/java/modules/core/src/org/wso2/wsas/DefaultServerInitializer.java
Thu Jan 3 01:33:42 2008
@@ -136,9 +136,14 @@
}
private void startJMXService() throws ServerException {
-
String jmxPort =
ServerConfiguration.getInstance().getFirstProperty("Ports.JMX");
if (jmxPort != null) {
+ String javaVersion = System.getProperty("java.version");
+ if (javaVersion.indexOf("1.4") != -1) { // In WSAS, JMX is not
supported on JDK 1.4
+ log.warn("JMX is not supported on JDK 1.4. " +
+ "Please use JDK 1.5 or newer version if you requre
JMX functionality.");
+ return;
+ }
if (isJMXServiceStarted) {
return;
}
Modified: trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManagement.java
==============================================================================
--- trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManagement.java
(original)
+++ trunk/wsas/java/modules/core/src/org/wso2/wsas/ServerManagement.java
Thu Jan 3 01:33:42 2008
@@ -73,11 +73,15 @@
/**
* Wait till all service requests have been serviced. This method will
only wait for a maximum
- * of [EMAIL PROTECTED] ServerManagement.TIMEOUT}
+ * of [EMAIL PROTECTED] ServerManagement#TIMEOUT}
*
* @throws Exception If an error occurs while trying to connect to the
Tomcat MBean
*/
public void waitForRequestCompletion() throws Exception {
+ String javaVersion = System.getProperty("java.version");
+ if (javaVersion.indexOf("1.4") != -1) {
+ return;
+ }
/**
* Get all MBeans with names such as
Catalina:type=RequestProcessor,worker=http-9762,name=HttpRequest<n>
* &
Catalina:type=RequestProcessor,worker=http-9762,name=HttpsRequest<n>
Modified:
trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java
==============================================================================
---
trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java
(original)
+++
trunk/wsas/java/modules/core/src/org/wso2/wsas/deployment/DeploymentInterceptor.java
Thu Jan 3 01:33:42 2008
@@ -150,7 +150,17 @@
// if (eventType == AxisEvent.SERVICE_STOP) do nothing
- if (eventType == AxisEvent.SERVICE_REMOVE) {
+ if (eventType == AxisEvent.SERVICE_START) {
+ ServiceDO service = persistenceMgr.getService(serviceName,
+
ServiceIdentifierDO.EMPTY_SERVICE_VERSION);
+ service.setIsActive(true);
+ persistenceMgr.updateEntity(service);
+ } else if (eventType == AxisEvent.SERVICE_STOP) {
+ ServiceDO service = persistenceMgr.getService(serviceName,
+
ServiceIdentifierDO.EMPTY_SERVICE_VERSION);
+ service.setIsActive(false);
+ persistenceMgr.updateEntity(service);
+ } else if (eventType == AxisEvent.SERVICE_REMOVE) {
if (serviceDO != null) {
try {
persistenceMgr.deleteService(serviceName, serviceVersion);
Modified: trunk/wsas/java/modules/www/extensions/core/js/users.js
==============================================================================
--- trunk/wsas/java/modules/www/extensions/core/js/users.js (original)
+++ trunk/wsas/java/modules/www/extensions/core/js/users.js Thu Jan 3
01:33:42 2008
@@ -73,10 +73,9 @@
// change password
var strHTML3 = "<fieldset>" +
"<legend>Change password of user '" + userName +
"'</legend>" +
- "<div><label>Old Password<font color='red'>*</font></label>"
+ "<input type='password' id='editUser_old_password'/></div>" +
"<div><label>New Password<font color='red'>*</font></label>"
+ "<input type='password' id='editUser_password'/></div>" +
"<div><label>Re-enter New Password<font
color='red'>*</font></label>" + "<input type='password'
id='editUser_password_re'/></div>" +
- "<div class='buttonrow'><input type='button'
onclick='saveEditUserPw(document.getElementById(\"editUser_password\"),
document.getElementById(\"editUser_password_re\"),document.getElementById(\"editUser_old_password\"));'
value='Change Password'/></div>" +
+ "<div class='buttonrow'><input type='button'
onclick='saveEditUserPw(document.getElementById(\"editUser_password\"),
document.getElementById(\"editUser_password_re\")' value='Change
Password'/></div>" +
"</fieldset>" +
"</form></div>";
@@ -125,14 +124,10 @@
}
-function saveEditUserPw(pw, pw_re, old_pw) {
+function saveEditUserPw(pw, pw_re) {
var un = currentUserName;
var pwv = pw.value;
- if(old_pw.value == null || wso2.wsf.Util.trim(old_pw.value) == ""){
- wso2.wsf.Util.alertWarning("Old password cannot be empty");
- return false;
- }
if (pwv == null || wso2.wsf.Util.trim(pwv) == "") {
wso2.wsf.Util.alertWarning('New Password cannot be Empty');
return false;
@@ -142,14 +137,13 @@
wso2.wsf.Util.alertWarning(retyped_pw_error);
return false;
}
- var body_xml = '<req:editUserPasswordRequest
xmlns:req="http://org.apache.axis2/xsd";>\n' +
- ' <req:oldPassword><![CDATA[' + (old_pw.value) +
']]></req:oldPassword>\n' +
+ var body_xml = '<req:changeUserPasswordRequest
xmlns:req="http://org.apache.axis2/xsd";>\n' +
' <req:username><![CDATA[' + un + ']]></req:username>\n' +
' <req:password><![CDATA[' + pwv + ']]></req:password>\n' +
- ' </req:editUserPasswordRequest>\n';
+ ' </req:changeUserPasswordRequest>\n';
var callURL = serverURL + "/" + "UserAdmin" + "/" ;
- new
wso2.wsf.WSRequest(callURL,"editUserPassword",body_xml,saveEditUserPwCallback);
+ new
wso2.wsf.WSRequest(callURL,"changeUserPasswordRequest",body_xml,saveEditUserPwCallback);
}
function saveEditUserCallback() {
@@ -167,10 +161,10 @@
var data = this.req.responseXML;
if (data.getElementsByTagName("return")[0].firstChild.nodeValue == "true")
{
- wso2.wsf.Util.alertMessage("Update password was successful.");
+ wso2.wsf.Util.alertMessage("Password was successfully updated.");
manageUser();
} else {
- wso2.wsf.Util.alertWarning("Password update failed. Please recheck
your old password.");
+ wso2.wsf.Util.alertWarning("Password update failed.");
}
}
Modified: trunk/wsas/java/pom.xml
==============================================================================
--- trunk/wsas/java/pom.xml (original)
+++ trunk/wsas/java/pom.xml Thu Jan 3 01:33:42 2008
@@ -780,17 +780,6 @@
<artifactId>wso2data-service</artifactId>
<version>${wso2dataservice.version}</version>
</dependency>
-
- <!--<dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- <version>${mx4j.version}</version>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- <version>${mx4j.version}</version>
- </dependency>-->
</dependencies>
</dependencyManagement>
_______________________________________________
Wsas-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
