Topic Text   Topic Comments (0)   Topic Properties   Topic Information test@tes...
Topic title: test - aml Monday February 22, 2010 14:44:09

Download topic text | View in monospace font | Tab width set to 8 (change to 4)

Files in topic:  
[Jump to] Core.SecurityManager/build.xml  5640   {+3,-10}
[Jump to] Core.SecurityManager/src/com/dhyan/component/security/useradmin/ExpiryDetailsSingleton.java  5640   {+0,-57}
[Jump to] Core.SecurityManager/src/com/dhyan/component/security/useradmin/datamodel/Userdetails.java  5640   {+36,-0}
[Jump to] Core.SecurityManager/src/com/dhyan/component/security/useradmin/ejb/SecurityFacadeBean.java  5640   {+45,-64}
[Jump to] Core.SecurityManager/xsd_build.xml  5640   {+0,-34}
[Jump to] Fault.AlarmManager/src/com/dhyan/nms/server/fault/alarmmanager/datamodel/Alarm.java  5640   {+21,-0}
[Jump to] Fault.AlarmManager/src/com/dhyan/nms/server/fault/alarmmanager/ejb/AlarmStoreSessionBean.java  5640   {+1,-1}
[Jump to] Lib.SmartGrid/WebContent/webresource/webcomponents/smartgrid/scripts/DNMSSmartGrid.js  5640   {+55,-1}
[Jump to] Lib.SmartGrid/WebContent/webresource/webcomponents/smartgrid/scripts/DNMSSmartGridBuffer.js  5640   {+7,-1}
[Jump to] Lib.SmartGrid/WebContent/webresource/webcomponents/smartgrid/scripts/DNMSSmartGridHelper.js  5640   {+66,-4}
[Jump to] Perf.DataCollection/src/com/dhyan/nms/server/performance/datacollection/HistoricalDataProcessor.java  5640   {+2,-2}
[Jump to] Web.BaseModule/WebContent/WEB-INF/properties/loginManager.properties  5640   {+1,-0}
[Jump to] Web.BaseModule/WebContent/jsp/DNMSIndex.jsp  5640   {+18,-1}
[Jump to] Web.BaseModule/WebContent/webresource/webbase/scripts/LoginManager.js  5640   {+15,-20}
[Jump to] Web.BaseModule/WebContent/webresource/webcomponents/divider/scripts/Divider.js  5640   {+70,-39}
[Jump to] Web.BaseModule/WebContent/webresource/webcomponents/table/scripts/HorizontalTable.js  5640   {+3,-0}
[Jump to] Web.BaseModule/WebContent/webresource/webcomponents/table/scripts/Table.js  5640   {+1,-0}
[Jump to] Web.BaseModule/WebContent/webresource/webcomponents/table/scripts/VerticalTable.js  5640   {+24,-5}
[Jump to] Web.BaseModule/WebContent/webresource/webcomponents/table/theme/blue/css/table.css  5640   {+8,-0}
[Jump to] Web.BaseModule/WebContent/webresource/webcomponents/table/theme/green/css/table.css  5640   {+8,-0}
[Jump to] Web.BaseModule/WebContent/webresource/webcomponents/table/theme/grey/css/table.css  5640   {+8,-0}
[Jump to] Web.BaseModule/WebContent/webresource/webcomponents/treegrid/scripts/TreeGrid.js  5640   {+46,-5}
[Jump to] Web.BaseModule/src/com/dhyan/nms/client/webclient/webbase/struts/PostLoginSecurityChecker.java  5640   {+6,-3}
[Jump to] Web.Fault/WebContent/WEB-INF/properties/alarmdetails.properties  5640   {+1,-1}
[Jump to] Web.Fault/WebContent/WEB-INF/properties/alarms.properties  5640   {+1,-0}
[Jump to] Web.Fault/WebContent/jsp/fault/AssignAlarm.jsp  5640   {+1,-1}
[Jump to] Web.Fault/WebContent/resourcebundle/com/dhyan/nms/client/webclient/fault/struts/AlarmDetailsAction.properties  5640   {+1,-1}
[Jump to] Web.Fault/WebContent/resources/conf/menuitem.xml.part  5640   {+4,-4}
[Jump to] Web.Fault/WebContent/webresource/fault/scripts/FaultTabUtility.js  5640   {+8,-1}
[Jump to] Web.Fault/WebContent/webresource/fault/styles/css/images/alarm_assign.gif  
[Jump to] Web.Fault/src/com/dhyan/nms/client/webclient/fault/struts/AlarmDetailsAction.java  5640   {+4,-0}
[Jump to] Web.General/WebContent/webresource/general/scripts/DNMSPrint.js  5640   {+3,-2}
[Jump to] Web.Performance/WebContent/webresource/dashboard/scripts/DashboardConfigurator.js  5640   {+3,-2}
[Jump to] Web.Performance/src/com/dhyan/nms/client/webclient/performance/struts/PerformanceStatisticsAction.java  5640   {+4,-4}
[Jump to] Web.Security/WebContent/jsp/security/NewUserDetails.jsp  5640   {+1,-1}
[Jump to] Web.Security/WebContent/webresource/security/scripts/SecurityScriptController.js  5640   {+3,-0}
[Jump to] Web.Security/WebContent/webresource/security/scripts/SecurityUserManager.js  5640   {+6,-0}
[Jump to] Web.Security/src/com/dhyan/nms/client/webclient/security/struts/SecurityManagerAction.java  5640   {+29,-45}
[Jump to] Web.Topology/WebContent/webresource/topology/scripts/DNMSDiscovery.js  5640   {+0,-1}
[Jump to] Web.Topology/WebContent/webresource/topology/scripts/ResourceTreeManager.js  5640   {+13,-10}
[Jump to] Web.Topology/WebContent/webresource/topology/scripts/TopologyController.js  5640   {+13,-11}
[Jump to] dnms/resources/dbspecific/derby/schema/dnms_default_records.sql  5640   {+35,-35}
[Jump to] dnms/resources/dbspecific/derby/schema/dnms_security.sql  5640   {+5,-3}
[Jump to] dnms/resources/dbspecific/mssql/schema/dnms_default_records.sql  5640   {+22,-22}
[Jump to] dnms/resources/dbspecific/mysql/schema/dnms_default_records.sql  5640   {+35,-35}
[Jump to] dnms/resources/dbspecific/mysql/schema/dnms_security.sql  5640   {+2,-0}
[Jump to] dnms/resources/dbspecific/oracle/schema/dnms_default_records.sql  5640   {+36,-36}
[Jump to] dnms/resources/dbspecific/oracle/schema/dnms_security.sql  5640   {+3,-1}

[Add General Comment] to topic.

File Core.SecurityManager/build.xml (Revision 5640) [Add File Comment] [Top] [>>]
 
Line 12 | Parallel Line 12 | Parallel
12 <include name="commons-codec-1.1.jar"/> 12 <include name="commons-codec-1.1.jar"/>
13 <include name="hibernate-annotations-3.3.0.ga.jar" /> 13 <include name="hibernate-annotations-3.3.0.ga.jar" />
14 <include name="hibernate-entitymanager-3.3.1.ga.jar" /> 14 <include name="hibernate-entitymanager-3.3.1.ga.jar" />
15 <include name="xbean.jar"/>
16 </fileset> 15 </fileset>
17 </path> 16 </path>
18 <path id="jboss.lib"> 17 <path id="jboss.lib">
 
 
Line 51 | Parallel Line 50 | Parallel
51 <path refid="jms.project.path"/> 50 <path refid="jms.project.path"/>
52 <path refid="purging.project.path"/> 51 <path refid="purging.project.path"/>
53 <path refid="server.details.project.path"/> 52 <path refid="server.details.project.path"/>
54 <fileset dir="jars/">
55 <include name="SecurityManagerXSD.jar"/>
56 </fileset>
57 </path> 53 </path>
58 </target> 54 </target>
59 55
 
 
Line 65 | Parallel Line 61 | Parallel
65 </condition> 61 </condition>
66 62
67 <target name="create.output"> 63 <target name="create.output">
68 <ant dir="." antfile="xsd_build.xml" target="create.output"/> 64 <mkdir dir="jars"/>
65 <mkdir dir="build/classes"/>
69 </target> 66 </target>
70 67
71 <target name="copy_jar"> 68 <target name="copy_jar">
72 <copy todir="lib" file="jars/SecurityManager.jar"/> 69 <copy todir="lib" file="jars/SecurityManager.jar"/>
73 </target> 70 </target>
74 71
75 <target name="build.xsd"> 72 <target name="compile" depends ="set_path, dependency" description="compiles the SecurityManager Code">
76 <ant dir="." antfile="xsd_build.xml" target="build.xsd"/>
77 </target>
78
79 <target name="compile" depends ="set_path, build.xsd, dependency" description="compiles the SecurityManager Code">
80 <javac 73 <javac
81 srcdir="${basedir}/src" 74 srcdir="${basedir}/src"
82 destdir="${basedir}/build/classes/" 75 destdir="${basedir}/build/classes/"
 
File Core.SecurityManager/src/com/dhyan/component/security/useradmin/ExpiryDetailsSingleton.java (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 1 | Parallel Line 0 | Parallel
1 package com.dhyan.component.security.useradmin;
2
3 import org.apache.commons.logging.Log;
4 import org.apache.commons.logging.LogFactory;
5
6 import com.dnms.com.dhyan.component.security.useradmin.resources.expiryValidator.ExpiryValidatorDocument;
7 import com.dnms.com.dhyan.component.security.useradmin.resources.expiryValidator.Validation;
8
9 public final class ExpiryDetailsSingleton
10 {
11 private static ExpiryDetailsSingleton instance = null;
12 private static final Log LOG = LogFactory.getLog(ExpiryDetailsSingleton.class);
13 private Validation validtn = null;
14
15 private ExpiryDetailsSingleton()
16 {
17 readValidatorXml();
18 }
19
20 /**
21 * Returns the singleton instance of the class
22 * @return ExpiryDetailsSingleton instance
23 */
24 public static ExpiryDetailsSingleton getInstance()
25 {
26 if (instance == null)
27 {
28 instance = new ExpiryDetailsSingleton();
29 }
30 return instance;
31 }
32
33 private void readValidatorXml()
34 {
35 LOG.debug("Reading xml to get password, account age default");
36 String file_name = "resources/ExpiryValidator.xml";
37 ExpiryValidatorDocument validatorDocument = null;
38 try
39 {
40 validatorDocument = ExpiryValidatorDocument.Factory.parse(ExpiryDetailsSingleton.class.getResourceAsStream(file_name));
41 }
42 catch (Exception e)
43 {
44 LOG.error("Could not read password, account age defaults from xml. Reason : " + e.getMessage());
45 }
46 validtn = validatorDocument.getExpiryValidator().getValidation();
47 }
48
49 /**
50 * Returns the validation object
51 * @return validation object
52 */
53 public Validation getValidatorDetails()
54 {
55 return validtn;
56 }
57 }
 
File Core.SecurityManager/src/com/dhyan/component/security/useradmin/datamodel/Userdetails.java (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 54 | Parallel Line 54 | Parallel
54 private long passwordExpDate; 54 private long passwordExpDate;
55 @Column(name = "account_exp_date") 55 @Column(name = "account_exp_date")
56 private long accountExpDate; 56 private long accountExpDate;
57 @Column(name="account_age")
58 private long accountage;
59 @Column(name="password_age")
60 private long passwordage;
57 @Column(name = "idle_time_out") 61 @Column(name = "idle_time_out")
58 private long idleTimeOut; 62 private long idleTimeOut;
59 @Column(name = "email") 63 @Column(name = "email")
 
 
Line 478 | Parallel Line 482 | Parallel
478 { 482 {
479 this.userhierarchyVo = userhierarchyVoA; 483 this.userhierarchyVo = userhierarchyVoA;
480 } 484 }
485
486 /**
487 * @return the accountage
488 */
489 public long getAccountage()
490 {
491 return accountage;
492 }
493
494 /**
495 * @param age the accountage to set
496 */
497 public void setAccountage(final long age)
498 {
499 this.accountage = age;
500 }
501
502 /**
503 * @return the passwordage
504 */
505 public long getPasswordage()
506 {
507 return passwordage;
508 }
509
510 /**
511 * @param age the passwordage to set
512 */
513 public void setPasswordage(final long age)
514 {
515 this.passwordage = age;
516 }
481 } 517 }
 
File Core.SecurityManager/src/com/dhyan/component/security/useradmin/ejb/SecurityFacadeBean.java (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 41 | Parallel Line 41 | Parallel
41 import com.dhyan.component.security.Node; 41 import com.dhyan.component.security.Node;
42 import com.dhyan.component.security.RoleConstants; 42 import com.dhyan.component.security.RoleConstants;
43 import com.dhyan.component.security.SecurityConstants; 43 import com.dhyan.component.security.SecurityConstants;
44 import com.dhyan.component.security.useradmin.ExpiryDetailsSingleton;
45 import com.dhyan.component.security.useradmin.UserNameDetailer; 44 import com.dhyan.component.security.useradmin.UserNameDetailer;
46 import com.dhyan.component.security.useradmin.datamodel.Auditstatus; 45 import com.dhyan.component.security.useradmin.datamodel.Auditstatus;
47 import com.dhyan.component.security.useradmin.datamodel.Audittrails; 46 import com.dhyan.component.security.useradmin.datamodel.Audittrails;
 
 
Line 64 | Parallel Line 63 | Parallel
64 import com.dhyan.nms.server.conf.DNMSServerDetailsUtility; 63 import com.dhyan.nms.server.conf.DNMSServerDetailsUtility;
65 import com.dhyan.nms.util.DBManager; 64 import com.dhyan.nms.util.DBManager;
66 import com.dhyan.nms.util.LocalLookupManager; 65 import com.dhyan.nms.util.LocalLookupManager;
67 import com.dnms.com.dhyan.component.security.useradmin.resources.expiryValidator.Validation;
68 66
69 @Stateless(name = "SecurityFacadeBean") 67 @Stateless(name = "SecurityFacadeBean")
70 public class SecurityFacadeBean implements SecurityFacade, SecurityFacadeLocal 68 public class SecurityFacadeBean implements SecurityFacade, SecurityFacadeLocal
 
 
Line 101 | Parallel Line 99 | Parallel
101 private static final String ADD_GROUP = "Add Group - "; 99 private static final String ADD_GROUP = "Add Group - ";
102 private static final String UPDATE_GROUP = "Update Group - "; 100 private static final String UPDATE_GROUP = "Update Group - ";
103 private static final String UPDATE = "UPDATE"; 101 private static final String UPDATE = "UPDATE";
102 private static Date currentDate = new Date();
104 103
105 @PersistenceContext(unitName = "SEC-MAN-EJB3-ejbPU") 104 @PersistenceContext(unitName = "SEC-MAN-EJB3-ejbPU")
106 private EntityManager em; 105 private EntityManager em;
 
 
Line 125 | Parallel Line 124 | Parallel
125 info.setUserstatusid(getUserstatusid(info.getStatus())); 124 info.setUserstatusid(getUserstatusid(info.getStatus()));
126 info.setUpdatedtime(cal.getTimeInMillis()); 125 info.setUpdatedtime(cal.getTimeInMillis());
127 info.setCreatedtime(cal.getTimeInMillis()); 126 info.setCreatedtime(cal.getTimeInMillis());
128 if (info.getAccountExpDate() > 0) 127 if (info.getAccountage() > 0)
129 { 128 {
130 info.setAccountExpDate(getmidnightTimeInLong(new Long(info.getAccountExpDate()).intValue())); 129 Long aexp = getmidnightTimeInLong(new Long(info.getAccountage()).intValue());
130 info.setAccountExpDate(aexp);
131 } 131 }
132 if (info.getPasswordExpDate() > 0) 132 if (info.getPasswordage() > 0)
133 { 133 {
134 info.setPasswordExpDate(getmidnightTimeInLong(new Long(info.getPasswordExpDate()).intValue())); 134
135 Long pexp = getmidnightTimeInLong(new Long(info.getPasswordage()).intValue());
136 info.setPasswordExpDate(pexp);
135 } 137 }
138 info.setUserstatusid(Integer.parseInt(info.getStatus()));
136 em.persist(info); 139 em.persist(info);
137 if (superiorid != -1) 140 if (superiorid != -1)
138 { 141 {
 
 
Line 273 | Parallel Line 276 | Parallel
273 Userdetails updateuserinfo = (Userdetails) uInfo; 276 Userdetails updateuserinfo = (Userdetails) uInfo;
274 Userhierarchy userhierarchy = null; 277 Userhierarchy userhierarchy = null;
275 Userhierarchy objUsrHierarchy = updateuserinfo.getUserhierarchyVo(); 278 Userhierarchy objUsrHierarchy = updateuserinfo.getUserhierarchyVo();
276 String supName = new String(); 279 int superiorid = -1;
277 if (objUsrHierarchy != null) 280 if (objUsrHierarchy != null)
278 { 281 {
279 supName = objUsrHierarchy.getSuperiorName(); 282 superiorid = getUserID(objUsrHierarchy.getSuperiorName());
280 } 283 }
281 int superiorid = getUserID(supName);
282 try 284 try
283 { 285 {
284 userhierarchy = em.find(Userhierarchy.class, updateuserinfo.getUserid()); 286 userhierarchy = em.find(Userhierarchy.class, updateuserinfo.getUserid());
 
 
Line 304 | Parallel Line 306 | Parallel
304 } 306 }
305 Calendar cal = Calendar.getInstance(TimeZone.getDefault()); 307 Calendar cal = Calendar.getInstance(TimeZone.getDefault());
306 updateuserinfo.setUpdatedtime(cal.getTimeInMillis()); 308 updateuserinfo.setUpdatedtime(cal.getTimeInMillis());
307 309 if(updateuserinfo.getStatus() != null)
308 if (updateuserinfo.getPasswordStatus() != null && updateuserinfo.getPasswordStatus().equalsIgnoreCase("Y"))
309 { 310 {
310 updateuserinfo.setUserstatusid(SecurityConstants.ACTIVE); 311 updateuserinfo.setUserstatusid(Integer.parseInt(updateuserinfo.getStatus()));
311 } 312 }
312 else 313 if (updateuserinfo.getAccountage() > 0 && updateuserinfo.getAccountExpDate() <= currentDate.getTime())
313 { 314 {
314 int tmp_user_status_id = getUserstatusid(updateuserinfo.getStatus()); 315 updateuserinfo.setAccountExpDate(getmidnightTimeInLong(new Long(updateuserinfo.getAccountage()).intValue()));
315 if (tmp_user_status_id > 0)
316 {
317 updateuserinfo.setUserstatusid(tmp_user_status_id);
318 }
319 } 316 }
320 if (updateuserinfo.getAccountExpDate() > 0) 317 if (updateuserinfo.getPasswordage() > 0)
321 { 318 {
322 updateuserinfo.setAccountExpDate(getmidnightTimeInLong(new Long(updateuserinfo.getAccountExpDate()).intValue())); 319 updateuserinfo.setPasswordExpDate(getmidnightTimeInLong(new Long(updateuserinfo.getPasswordage()).intValue()));
323 } 320 }
324 if (updateuserinfo.getPasswordExpDate() > 0)
325 {
326 updateuserinfo.setPasswordExpDate(getmidnightTimeInLong(new Long(updateuserinfo.getPasswordExpDate()).intValue()));
327 }
328 em.merge(updateuserinfo); 321 em.merge(updateuserinfo);
329 addSecurityAuditTrailInfo(RoleConstants.SEC_MOD_USER, UPDATE_USER + userName, RoleConstants.OPERATION_SUCCESS); 322 addSecurityAuditTrailInfo(RoleConstants.SEC_MOD_USER, UPDATE_USER + userName, RoleConstants.OPERATION_SUCCESS);
330 MessageObject securityMO = new MessageObject(NotificationConstants.NOTIFICATION_WEB_SECURITYUSER, userhierarchy); 323 MessageObject securityMO = new MessageObject(NotificationConstants.NOTIFICATION_WEB_SECURITYUSER, userhierarchy);
 
 
Line 386 | Parallel Line 379 | Parallel
386 { 379 {
387 Userdetails userdetails = fetchUserDetailValue(userName); 380 Userdetails userdetails = fetchUserDetailValue(userName);
388 userdetails.setPassword(newPassword); 381 userdetails.setPassword(newPassword);
382 userdetails.setPasswordExpDate(getmidnightTimeInLong(new Long(userdetails.getPasswordage()).intValue()));
389 em.merge(userdetails); 383 em.merge(userdetails);
390 String messagetonofity = "Your Password is changed by the Server"; 384 String messagetonofity = "Your Password is changed by the Server";
391 if (notificationMessage != null) 385 if (notificationMessage != null)
 
 
Line 450 | Parallel Line 444 | Parallel
450 uinfo.setPasswordStatus(receivedobj.getPasswordStatus()); 444 uinfo.setPasswordStatus(receivedobj.getPasswordStatus());
451 } 445 }
452 uinfo.setUserstatusid(userStatus); 446 uinfo.setUserstatusid(userStatus);
453 // uinfo.setPasswordExpDate(new Long(-1)); 447 if(uinfo.getPasswordage() > 0)
448 {
449 uinfo.setPasswordExpDate(getmidnightTimeInLong(new Long(uinfo.getPasswordage()).intValue()));
450 }
454 em.merge(uinfo); 451 em.merge(uinfo);
455 MessageObject securityMO = new MessageObject(NotificationConstants.NOTIFICATION_WEB_SECURITYUSER, uinfo); 452 MessageObject securityMO = new MessageObject(NotificationConstants.NOTIFICATION_WEB_SECURITYUSER, uinfo);
456 try 453 try
 
 
Line 1678 | Parallel Line 1675 | Parallel
1678 public void validateUsers() 1675 public void validateUsers()
1679 { 1676 {
1680 log.info("Validating user account(s) for expiry."); 1677 log.info("Validating user account(s) for expiry.");
1681 Validation validationDetails = null;
1682 try 1678 try
1683 { 1679 {
1684 validationDetails = ExpiryDetailsSingleton.getInstance().getValidatorDetails();
1685 }
1686 catch (Exception e)
1687 {
1688 log.error("Could not read default expiry details from xml. Reason : " + e.getMessage());
1689 }
1690 log.info("Validating account : " + validationDetails.getAccount());
1691 log.info("Validating idle : " + validationDetails.getIdletimeout());
1692 log.info("Validating Pass : " + validationDetails.getPassword());
1693 try
1694 {
1695 List<Userdetails> usercollection = em.createNamedQuery(USERDETAILS_FINDALL).getResultList(); 1680 List<Userdetails> usercollection = em.createNamedQuery(USERDETAILS_FINDALL).getResultList();
1696 for (Userdetails userdetails : usercollection) 1681 for (Userdetails userdetails : usercollection)
1697 { 1682 {
1698 if (userdetails.getPasswordExpDate() > 0 || userdetails.getAccountExpDate() > 0) 1683 // do not do any expiry validation if the account is already in
1684 // expired state
1685 if (userdetails.getUserstatusid() != SecurityConstants.ACCEXPIRY)
1699 { 1686 {
1687 log.info("Initializing expiry validation for user " + userdetails.getUsername());
1700 java.util.Date pexpdate = new java.util.Date(userdetails.getPasswordExpDate()); 1688 java.util.Date pexpdate = new java.util.Date(userdetails.getPasswordExpDate());
1701 java.util.Date aexpdate = new java.util.Date(userdetails.getAccountExpDate()); 1689 java.util.Date aexpdate = new java.util.Date(userdetails.getAccountExpDate());
1702 double diff = pexpdate.getTime() - new Date().getTime(); 1690 int accountExpired = -1;
1703 int pexpdays = (int) (diff / 86400000); 1691 int passwordExpired = -1;
1704 diff = aexpdate.getTime() - new Date().getTime(); 1692 passwordExpired = currentDate.compareTo(pexpdate);
1705 int aexpdays = (int) (diff / 86400000); 1693 accountExpired = currentDate.compareTo(aexpdate);
1706 // if the password or account expires, user status is 1694 // if the password or account expires, user status is
1707 // changed. 1695 // changed.
1708 log.info(userdetails.getUsername() + " password will expire in " + pexpdays + "days and account in +" + aexpdays); 1696 if (userdetails.getAccountage() > 0 && accountExpired >= 0)
1709 if (aexpdays <= 0)
1710 { 1697 {
1711 log.info("Account has expired for user : " + userdetails.getUsername()); 1698 log.info("Account has expired for user : " + userdetails.getUsername());
1712 if (userdetails.getUserstatusid() != SecurityConstants.ACCEXPIRY) 1699 userdetails.setUserstatusid(SecurityConstants.ACCEXPIRY);
1713 { 1700 userdetails.setUpdatedtime(new Long(System.currentTimeMillis()));
1714 userdetails.setUserstatusid(SecurityConstants.ACCEXPIRY); 1701 MessageObject securityGroupMO = new MessageObject(NotificationConstants.NOTIFICATION_SECURITY_KILLUSER, userdetails);
1715 userdetails.setUpdatedtime(new Long(System.currentTimeMillis())); 1702 PublisherManager.getInstance().sendMessage(NotificationConstants.NOTIFICATION_TOPIC_SECURITY_USER, securityGroupMO,
1716 // Setting the expiry date calculated based on the 1703 PublisherManager.NONDURABLETOPIC);
1717 // default password age as in xml 1704
1718 userdetails.setAccountExpDate(System.currentTimeMillis() + (86400000 * validationDetails.getPassword()));
1719 MessageObject securityGroupMO = new MessageObject(NotificationConstants.NOTIFICATION_SECURITY_KILLUSER, userdetails);
1720 PublisherManager.getInstance().sendMessage(NotificationConstants.NOTIFICATION_TOPIC_SECURITY_USER, securityGroupMO,
1721 PublisherManager.NONDURABLETOPIC);
1722 }
1723 } 1705 }
1724 if (pexpdays <= 0) 1706 else if (userdetails.getPasswordage() > 0 && passwordExpired >= 0)
1725 { 1707 {
1726 log.info("Password has expired for user : " + userdetails.getUsername()); 1708
1727 if (userdetails.getUserstatusid() != SecurityConstants.PWDEXPIRY) 1709 if (userdetails.getUserstatusid() != SecurityConstants.PWDEXPIRY)
1728 { 1710 {
1711 log.info("Password has expired for user : " + userdetails.getUsername());
1729 userdetails.setUserstatusid(SecurityConstants.PWDEXPIRY); 1712 userdetails.setUserstatusid(SecurityConstants.PWDEXPIRY);
1730 userdetails.setUpdatedtime(new Long(System.currentTimeMillis())); 1713 userdetails.setUpdatedtime(new Long(System.currentTimeMillis()));
1731 // Setting the expiry date calculated based on the
1732 // default account age as in xml
1733 userdetails.setPasswordExpDate(System.currentTimeMillis() + (86400000 * validationDetails.getAccount()));
1734 } 1714 }
1735 } 1715 }
1736 em.merge(userdetails); 1716 em.merge(userdetails);
 
 
Line 2483 | Parallel Line 2463 | Parallel
2483 */ 2463 */
2484 private long getmidnightTimeInLong(final int numberOfDaysFromPresent) 2464 private long getmidnightTimeInLong(final int numberOfDaysFromPresent)
2485 { 2465 {
2486 Long numberOfDays = new Long(numberOfDaysFromPresent); 2466 Long targetDateInLong = new Long(System.currentTimeMillis()+(numberOfDaysFromPresent*86400000));
2487 Calendar myCal = Calendar.getInstance(); 2467 Calendar myCal = Calendar.getInstance();
2468 myCal.setTimeInMillis(targetDateInLong - 1);
2488 Calendar temp = Calendar.getInstance(); 2469 Calendar temp = Calendar.getInstance();
2489 temp.setLenient(true); 2470 temp.setLenient(true);
2490 temp.set(myCal.get(Calendar.YEAR), myCal.get(Calendar.MONTH), myCal.get(Calendar.DATE) + numberOfDays.intValue() + 1, 0, 0, 0); 2471 temp.set(myCal.get(Calendar.YEAR), myCal.get(Calendar.MONTH), myCal.get(Calendar.DATE) + 0, 0, 0, 0);
2491 temp.set(Calendar.MILLISECOND, 0); 2472 temp.set(Calendar.MILLISECOND, 0);
2492 return temp.getTimeInMillis() - 1; 2473 return temp.getTimeInMillis();
2493 } 2474 }
2494 2475
2495 /* 2476 /*
 
 
Line 2499 | Parallel Line 2480 | Parallel
2499 private long getmidnightTimeInLong(final long timeInMillis) 2480 private long getmidnightTimeInLong(final long timeInMillis)
2500 { 2481 {
2501 Calendar myCal = Calendar.getInstance(); 2482 Calendar myCal = Calendar.getInstance();
2502 myCal.setTimeInMillis(timeInMillis); 2483 myCal.setTimeInMillis(timeInMillis-1);
2503 Calendar temp = Calendar.getInstance(); 2484 Calendar temp = Calendar.getInstance();
2504 temp.setLenient(true); 2485 temp.setLenient(true);
2505 temp.set(myCal.get(Calendar.YEAR), myCal.get(Calendar.MONTH), myCal.get(Calendar.DATE) + 0, 0, 0, 0); 2486 temp.set(myCal.get(Calendar.YEAR), myCal.get(Calendar.MONTH), myCal.get(Calendar.DATE) + 0, 0, 0, 0);
 
File Core.SecurityManager/xsd_build.xml (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 1 | Parallel Line 0 | Parallel
1 <?xml version="1.0"?>
2 <project name="Security Manager XSD Builder" default="all" basedir=".">
3
4 <property name="dnms.base" value="${basedir}/../dnms"/>
5 <import file="${dnms.base}/build_properties.xml"/>
6
7 <target name="set_path" depends="-Properties, set_paths">
8 <path id="apache.lib">
9 <fileset dir="${thirdparty.lib}/apache">
10 <include name="commons-logging-1.1.jar"/>
11 <include name="xbean.jar"/>
12 </fileset>
13 </path>
14 </target>
15
16 <target name="all" depends="create.output,build.xsd">
17 </target>
18
19 <target name="create.output">
20 <mkdir dir="jars"/>
21 <mkdir dir="build/classes"/>
22 </target>
23
24 <target name="build.xsd" depends="set_path">
25 <taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean"
26 classpathref="apache.lib" />
27 <xmlbean destfile="./jars/SecurityManagerXSD.jar" classpathref="apache.lib"
28 debug="on">
29 <fileset dir="./src/com/dhyan/component/security/useradmin/resources">
30 <include name="**/*.xsd" />
31 </fileset>
32 </xmlbean>
33 </target>
34 </project>
 
File Fault.AlarmManager/src/com/dhyan/nms/server/fault/alarmmanager/datamodel/Alarm.java (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 195 | Parallel Line 195 | Parallel
195 @Transient 195 @Transient
196 private String annotation = null; 196 private String annotation = null;
197 @Transient 197 @Transient
198 private int userid = 1;
199 @Transient
198 private String alarmRaisedBy = null; 200 private String alarmRaisedBy = null;
199 @Transient 201 @Transient
200 private String comment = "New Alarm"; 202 private String comment = "New Alarm";
 
 
Line 329 | Parallel Line 331 | Parallel
329 } 331 }
330 332
331 /** 333 /**
334 * Gets the user id
335 * @return user id
336 */
337 public int getUserid()
338 {
339 return userid;
340 }
341
342 /**
343 * Sets the user id
344 * @param useridParam user id
345 */
346 public void setUserid(final int useridParam)
347 {
348 this.userid = useridParam;
349 }
350
351
352 /**
332 * Gets the severity id 353 * Gets the severity id
333 * @return severity id 354 * @return severity id
334 */ 355 */
 
File Fault.AlarmManager/src/com/dhyan/nms/server/fault/alarmmanager/ejb/AlarmStoreSessionBean.java (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 275 | Parallel Line 275 | Parallel
275 String annotation = alarm.getAnnotation(); 275 String annotation = alarm.getAnnotation();
276 if (annotation != null && !annotation.trim().equals("")) 276 if (annotation != null && !annotation.trim().equals(""))
277 { 277 {
278 addAnnotateAlarm(alarm.getAlarmid(), annotation, 1); 278 addAnnotateAlarm(alarm.getAlarmid(), annotation, alarm.getUserid());
279 } 279 }
280 alarmObject.setUpdatedtime(new Date().getTime()); 280 alarmObject.setUpdatedtime(new Date().getTime());
281 updateAlarm(alarmObject); 281 updateAlarm(alarmObject);
 
File Lib.SmartGrid/WebContent/webresource/webcomponents/smartgrid/scripts/DNMSSmartGrid.js (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 178 | Parallel Line 178 | Parallel
178 { 178 {
179 DNMSLogger.ERROR(DNMSSmartGrid.LOG_PATH, "Error in initializing Base class of grid: initialize() " + e); 179 DNMSLogger.ERROR(DNMSSmartGrid.LOG_PATH, "Error in initializing Base class of grid: initialize() " + e);
180 } 180 }
181 } 181 },
182
183 clean:
184 function()
185 {
186 this.removeContextMenuListener();
187 this.buffer.destroy();
188 if(this.options.pageView)
189 {
190 Event.stopObserving(document.getElementById(this.options.divId),"dblclick", this.options.doubleClick, false);
191 }
192 this.removeAllRow();
193 for (var c = 0; c < this.columns.length; c++)
194 {
195 var columnObject = this.columns[c];
196 columnObject.destroy();
197 columnObject = null;
198 }
199 delete this.columns;
200 this.columns = null;
201 this.destroy();
202 this.scrollEventFunc = null;
203 this.wheelEventFunc = null;
204 var gridDivId = this.options.divId;
205 delete this.options;
206 this.options = null;
207
208 if(window.CollectGarbage)
209 window.CollectGarbage();
210 }
182 }; 211 };
183 212
184 DNMSSmartGrid.Methods = function() {}; 213 DNMSSmartGrid.Methods = function() {};
 
 
Line 836 | Parallel Line 865 | Parallel
836 } 865 }
837 }, 866 },
838 867
868 removeAllRow:
869 function()
870 {
871 var removeCnt = this.pageSize;
872 for (var i = 0; i < removeCnt; i++)
873 this.removeRow();
874 },
875
839 autoAppendRows: 876 autoAppendRows:
840 function(overage) 877 function(overage)
841 { 878 {
 
 
Line 1516 | Parallel Line 1553 | Parallel
1516 } 1553 }
1517 }, 1554 },
1518 1555
1556 removeContextMenuListener:
1557 function()
1558 {
1559 for (var r = 0; r < this.options.maxPageRows; r++)
1560 {
1561 for (var c = 0; c < this.columns.length; c++)
1562 {
1563 var cell = this.cell(r, c);
1564 if (cell && !this.isEmptyRow(r + 1))
1565 {
1566 Event.stopObserving(cell,"contextmenu", this.options.onContextMenu);
1567 }
1568 }
1569 }
1570 this.options.onContextMenu = null;
1571 },
1572
1519 attachContextMenuForCells: 1573 attachContextMenuForCells:
1520 function() 1574 function()
1521 { 1575 {
 
File Lib.SmartGrid/WebContent/webresource/webcomponents/smartgrid/scripts/DNMSSmartGridBuffer.js (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 239 | Parallel Line 239 | Parallel
239 results.push(this.rows[i]); 239 results.push(this.rows[i]);
240 } 240 }
241 return results; 241 return results;
242 } 242 },
243
244 destroy:
245 function()
246 {
247 delete this.options;
248 }
243 }; 249 };
244 250
245 251
 
File Lib.SmartGrid/WebContent/webresource/webcomponents/smartgrid/scripts/DNMSSmartGridHelper.js (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 248 | Parallel Line 248 | Parallel
248 { 248 {
249 Event.stopObserving(this.scrollDiv,"scroll", this.scrollEventFunc , false); 249 Event.stopObserving(this.scrollDiv,"scroll", this.scrollEventFunc , false);
250 this.scrollPluggedIn=false; 250 this.scrollPluggedIn=false;
251 } 251 },
252
253 destroy:
254 function()
255 {
256 this.unplugScroll();
257 delete this.colWidths;
258 delete this.hdrCells;
259 delete this.tabs;
260 delete this.thead;
261 delete this.tbody;
262 delete this.resizeDiv ;
263 delete this.innerDiv ;
264 delete this.frozenTabs ;
265 delete this.scrollDiv ;
266 delete this.outerDiv ;
267 this.colWidths = null;
268 this.hdrCells = null;
269 this.tabs = null;
270 this.thead = null;
271 this.tbody = null;
272 this.resizeDiv = null ;
273 this.innerDiv = null;
274 this.frozenTabs = null;
275 this.scrollDiv = null;
276 this.outerDiv = null;
277 }
252 }; 278 };
253 279
254 DNMSSmartGrid.TableColumn = Class.create(); 280 DNMSSmartGrid.TableColumn = Class.create();
 
 
Line 622 | Parallel Line 648 | Parallel
622 function() 648 function()
623 { 649 {
624 return this.hideable; 650 return this.hideable;
625 } 651 },
652
653 destroy:
654 function()
655 {
656 this.unplugMouseEvents();
657 try
658 {
659 Event.stopObserving(document.getElementById(this.options.divId),"click", this.singleClickHandler);
660 }
661 catch (e)
662 {
663 //alert(e);
664 }
665 if(this.resizer != null)
666 {
667 if(!this.format.noResize)
668 {
669 Event.stopObserving(this.resizer,"dblclick", this.dblClickHandler);
670 Event.stopObserving(this.resizer,"mousedown", this.mouseDownHandler, false);
671 }
672 delete this.resizer;
673 }
674 delete this.mouseDownHandler;
675 delete this.mouseMoveHandler;
676 delete this.mouseUpHandler;
677 delete this.mouseOutHandler;
678 delete this.dblClickHandler;
679 this.resizer = null;
680 this.mouseDownHandler = null;
681 this.mouseMoveHandler = null;
682 this.mouseUpHandler = null;
683 this.mouseOutHandler = null;
684 this.dblClickHandler = null;
685 delete this.dataColDiv;
686 this.dataColDiv = null;
687 }
626 }; 688 };
627 689
628 var RowSelectManager = function() {}; 690 var RowSelectManager = function() {};
 
 
Line 634 | Parallel Line 696 | Parallel
634 { 696 {
635 this.ROW_NUM = {}; 697 this.ROW_NUM = {};
636 this.cache_rows = {}; 698 this.cache_rows = {};
637 var singleClickHandler = this.handleGridSelect.bindAsEventListener(this); 699 this.singleClickHandler = this.handleGridSelect.bindAsEventListener(this);
638 Event.observe(document.getElementById(this.options.divId),"click", singleClickHandler, false); 700 Event.observe(document.getElementById(this.options.divId),"click", this.singleClickHandler, false);
639 }, 701 },
640 702
641 handleGridSelect: 703 handleGridSelect:
 
File Perf.DataCollection/src/com/dhyan/nms/server/performance/datacollection/HistoricalDataProcessor.java (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 93 | Parallel Line 93 | Parallel
93 * @param columnNames dynamic table column names 93 * @param columnNames dynamic table column names
94 * @throws SQLException throws an exception if the table creation failed 94 * @throws SQLException throws an exception if the table creation failed
95 */ 95 */
96 private synchronized void createTable(final String tableName, final ArrayList<DBField> columnNames, final boolean isDeltaEnable) throws SQLException 96 protected synchronized void createTable(final String tableName, final ArrayList<DBField> columnNames, final boolean isDeltaEnable) throws SQLException
97 { 97 {
98 int databaseUsed = ServerSettings.getDatabase(); 98 int databaseUsed = ServerSettings.getDatabase();
99 boolean isTableExist = true; 99 boolean isTableExist = true;
 
 
Line 277 | Parallel Line 277 | Parallel
277 * @param time time of collection 277 * @param time time of collection
278 * @param columnDetails dynamic table column details 278 * @param columnDetails dynamic table column details
279 */ 279 */
280 private void insertData(final Object[][] collectedData, final String tableName, final long resourceId, final long time, 280 protected void insertData(final Object[][] collectedData, final String tableName, final long resourceId, final long time,
281 final Collection<DBField> columnDetails, final boolean isDeltaEnable) 281 final Collection<DBField> columnDetails, final boolean isDeltaEnable)
282 { 282 {
283 Connection connection = null; 283 Connection connection = null;
 
File Web.BaseModule/WebContent/WEB-INF/properties/loginManager.properties (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 20 | Parallel Line 20 | Parallel
20 loginMgr.invalidResp=Invalid Response Received. 20 loginMgr.invalidResp=Invalid Response Received.
21 loginMgr.invalidUser=No/Invalid User Name provided. 21 loginMgr.invalidUser=No/Invalid User Name provided.
22 loginMgr.chPass=Change User Password 22 loginMgr.chPass=Change User Password
23 loginMgr.passExpired=Password Expired.
23 24
24 loginMgr.userName=User Name 25 loginMgr.userName=User Name
25 loginMgr.oldPass=Old Password 26 loginMgr.oldPass=Old Password
 
File Web.BaseModule/WebContent/jsp/DNMSIndex.jsp (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 76 | Parallel Line 76 | Parallel
76 <script type="text/javascript" src="/webresource/webcomponents/table/scripts/HorizontalTable.js"></script> 76 <script type="text/javascript" src="/webresource/webcomponents/table/scripts/HorizontalTable.js"></script>
77 <script type="text/javascript" src="/webresource/webcomponents/table/scripts/VerticalTable.js"></script> 77 <script type="text/javascript" src="/webresource/webcomponents/table/scripts/VerticalTable.js"></script>
78 78
79 <script type="text/javascript">
80 var cleanupBrowserLeaks = function()
81 {
82 try
83 {
84 if (AlarmBrowserUtil != null && AlarmBrowserUtil.alarm_grid != null
85 && AlarmBrowserUtil.alarm_grid['grid'] != null)
86 {
87 AlarmBrowserUtil.alarm_grid['grid'].clean();
88 }
89 }
90 catch(e)
91 {
92 }
93 };
94 </script>
95
79 <i18n:loadProperties resourceBundle="index" jsVarName="indexLocale"/> 96 <i18n:loadProperties resourceBundle="index" jsVarName="indexLocale"/>
80 <i18n:loadProperties resourceBundle="discovery" jsVarName="discoveryLocale"/> 97 <i18n:loadProperties resourceBundle="discovery" jsVarName="discoveryLocale"/>
81 98
 
 
Line 84 | Parallel Line 101 | Parallel
84 <link rel="stylesheet" type="text/css" media="screen" href="/webresource/webbase/styles/css/DNMSTheme.css"/> 101 <link rel="stylesheet" type="text/css" media="screen" href="/webresource/webbase/styles/css/DNMSTheme.css"/>
85 <link rel="stylesheet" type="text/css" media="screen" href="/webresource/webcomponents/window/styles/css/JSDialog.css"/> 102 <link rel="stylesheet" type="text/css" media="screen" href="/webresource/webcomponents/window/styles/css/JSDialog.css"/>
86 </head> 103 </head>
87 <body> 104 <body onunload="cleanupBrowserLeaks();">
88 <%@ include file="LoadResourceBundle.jsp" %> 105 <%@ include file="LoadResourceBundle.jsp" %>
89 <%try 106 <%try
90 { 107 {
 
File Web.BaseModule/WebContent/webresource/webbase/scripts/LoginManager.js (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 200 | Parallel Line 200 | Parallel
200 }); 200 });
201 }, 201 },
202 202
203
204
205 lookUpPassword_CallBack: 203 lookUpPassword_CallBack:
206 function(userName, transport) 204 function(userName, transport)
207 { 205 {
208 var options = {}; 206 var options = {};
209 options.title = loginManagerLocale.getText("loginMgr.lookup"); 207 options.title = loginManagerLocale.getText("loginMgr.lookup");
210 options.height = 120; 208 options.width = 350;
209 options.height = 120;
211 if (transport.responseText.indexOf('ERROR:') == -1) 210 if (transport.responseText.indexOf('ERROR:') == -1)
212 { 211 {
213 options.okLabel = 'Login'; 212 options.okLabel = 'Login';
 
 
Line 224 | Parallel Line 223 | Parallel
224 var lookUpResult = transport.responseText.split(':')[1]; 223 var lookUpResult = transport.responseText.split(':')[1];
225 options.okLabel = 'Go'; 224 options.okLabel = 'Go';
226 options.cancelLabel = 'Cancel'; 225 options.cancelLabel = 'Cancel';
227 options.width=400; 226 options.width = 350;
228 options.height = 120; 227 options.height = 120;
229 options.onOk = this.lookUpPassword.bind(this); 228 options.onOk = this.lookUpPassword.bind(this);
230 options.onCancel = this.onLookUpPwdCancelButtonClick.bind(this); 229 options.onCancel = this.onLookUpPwdCancelButtonClick.bind(this);
231 options.onload = function(){try{$('lookUpUserName').focus();}catch(e){}}.bind(this); 230 options.onload = function(){try{$('lookUpUserName').focus();}catch(e){}}.bind(this);
232 var content = "<br><br>" 231 var content = "<br><br>"
 
 
Line 405 | Parallel Line 404 | Parallel
405 JSDialog.close(); 404 JSDialog.close();
406 if (jsonData.showChangePassword != null) 405 if (jsonData.showChangePassword != null)
407 { 406 {
408 if (jsonData.showChangePassword == 'PasswordExpired') 407 if(jsonData.showChangePassword == 'PasswordExpired')
409 { 408 {
410 var options = {}; 409 this.openChangePasswordWindow(loginManagerLocale.getText("loginMgr.passExpired"));
411 options.buttonType = JSDialog.YES_NO;
412 options.title = 'User Login';
413 options.width = 250;
414 options.onOk = this.openChangePasswordWindow.bind(this);
415 options.onCancel = this.onChangePasswordNoButtonClick.bind(this);
416 var content = "<br><br><label class='warningText'>"+loginManagerLocale.getText("loginMgr.passExp")+"</label>"
417 + "<br><br>"
418 + "<label class='labelTextSmallBold'>"+loginManagerLocale.getText("loginMgr.changePass")+"</label>"
419 + "<br><br><br>";
420 JSDialog.showConfirmDialog(content, options);
421 } 410 }
422 else 411 else
423 { 412 {
 
 
Line 455 | Parallel Line 444 | Parallel
455 invalidateSession: 444 invalidateSession:
456 function () 445 function ()
457 { 446 {
447 this.progressWindow.close();
458 this.userPasswordWindow.close(); 448 this.userPasswordWindow.close();
459 var invalidateSessionURL = '/security/invalidateSession.action'; 449 var invalidateSessionURL = '/security/invalidateSession.action';
460 new Ajax.Request(invalidateSessionURL, 450 new Ajax.Request(invalidateSessionURL,
 
 
Line 563 | Parallel Line 553 | Parallel
563 }, 553 },
564 554
565 openChangePasswordWindow: 555 openChangePasswordWindow:
566 function () 556 function (cause)
567 { 557 {
558 var resetCause = '';
559 if(cause != null)
560 {
561 resetCause = cause+" ";
562 }
568 var paramUserName = this.form.userName.value; 563 var paramUserName = this.form.userName.value;
569 this.userPasswordWindow = new Window( 564 this.userPasswordWindow = new Window(
570 {id:'DNMS_User_Password_Change_Window', 565 {id:'DNMS_User_Password_Change_Window',
571 minimizable:false, 566 minimizable:false,
572 closable:false, 567 closable:false,
573 maximizable:false, 568 maximizable:false,
574 title:loginManagerLocale.getText("loginMgr.chPass"), 569 title:resetCause+loginManagerLocale.getText("loginMgr.chPass"),
575 width:320, 570 width:320,
576 height:155, 571 height:155,
577 destroyOnClose:true, 572 destroyOnClose:true,
 
File Web.BaseModule/WebContent/webresource/webcomponents/divider/scripts/Divider.js (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 3 | Parallel Line 3 | Parallel
3 id - the id of this element 3 id - the id of this element
4 type - The orientation type of the separator ( horizontal / vertical ) 4 type - The orientation type of the separator ( horizontal / vertical )
5 parentDiv - the parent component in which the divider component should be added 5 parentDiv - the parent component in which the divider component should be added
6 6
7 leftChild - the element to be placed in left ( top in case of vertical type ) side of the divider 7 leftChild - the element to be placed in left ( top in case of vertical type ) side of the divider
8 rightChild - the element to be placed in right ( bottom in case of vertical type ) side of the divider 8 rightChild - the element to be placed in right ( bottom in case of vertical type ) side of the divider
9 ratio - the initial split up of layouts Left:Right 9 ratio - the initial split up of layouts Left:Right
10 10
11 **/ 11 **/
12 12
13 var Divider = Class.create(); 13 var Divider = Class.create();
 
 
Line 17 | Parallel Line 17 | Parallel
17 17
18 Divider.prototype = { 18 Divider.prototype = {
19 initialize: function(params) { 19 initialize: function(params) {
20 20
21 // To initialize 21 // To initialize
22 this.isMouseDown = false; 22 this.isMouseDown = false;
23 this.seperator_position = 0; 23 this.seperator_position = 0;
24 this.leftchild_size = 0; 24 this.leftchild_size = 0;
25 this.layoutIntialised = false; 25 this.layoutIntialised = false;
26 this.browserAdjustableWidth = 0; 26 this.browserAdjustableWidth = 0;
27 27 this.left_min_size = 0;
28 this.right_min_size = 0;
28 this.id = params.id; 29 this.id = params.id;
29 this.type = params.type; 30 this.type = params.type;
30 this.parent = $(params.parent); 31 this.parent = $(params.parent);
 
 
Line 34 | Parallel Line 35 | Parallel
34 this.canDrag = true; 35 this.canDrag = true;
35 if( params.ratio != null ){ 36 if( params.ratio != null ){
36 this.ratio = params.ratio; 37 this.ratio = params.ratio;
37 } 38 }
38 39
39 this.resizer = document.createElement('div'); 40 this.resizer = document.createElement('div');
40 // alert( " Creating resizer div for type "+this.type ); 41 // alert( " Creating resizer div for type "+this.type );
41 Element.extend ( this.parent ); 42 Element.extend ( this.parent );
42 Element.extend ( this.leftChild ); 43 Element.extend ( this.leftChild );
43 Element.extend ( this.rightChild ); 44 Element.extend ( this.rightChild );
44 Element.extend ( this.resizer ); 45 Element.extend ( this.resizer );
45 46
46 if ( navigator.appName != null && navigator.appName.indexOf("Microsoft") != -1 );{ 47 if ( navigator.appName != null && navigator.appName.indexOf("Microsoft") != -1 );{
47 this.browserAdjustableWidth = 5; 48 this.browserAdjustableWidth = 5;
48 } 49 }
49 this.createLayout(); 50 this.createLayout();
50 this.setLayoutStyles(); 51 this.setLayoutStyles();
51 }, 52 },
52 toString : function() { 53 toString : function() {
53 return " Divider Object { id:"+this.id+", type :" + this.type + ", parent: " +this.parent+ ", leftChild : " 54 return " Divider Object { id:"+this.id+", type :" + this.type + ", parent: " +this.parent+ ", leftChild : "
54 + this.leftChild+ ", rightChild: "+this.rightChild +" } "; 55 + this.leftChild+ ", rightChild: "+this.rightChild +" } ";
55 }, 56 },
56 57
58 setOnResizeHandler:
59 function(paramHandler)
60 {
61 this.onResizeHandler = paramHandler;
62 },
63
64 setLeftMinSize:
65 function(paramValue)
66 {
67 this.left_min_size = paramValue;
68 },
69
70 setRightMinSize:
71 function(paramValue)
72 {
73 this.right_min_size = paramValue;
74 },
75
57 draggable: function(canDrag) 76 draggable: function(canDrag)
58 { 77 {
59 this.canDrag = canDrag; 78 this.canDrag = canDrag;
 
 
Line 66 | Parallel Line 85 | Parallel
66 this.resizer.style.cursor = "col-resize"; 85 this.resizer.style.cursor = "col-resize";
67 } 86 }
68 }, 87 },
69 88
70 createLayout: function(){ 89 createLayout: function(){
71 this.setLayoutStyles(); 90 this.setLayoutStyles();
72 this.parent.appendChild(this.leftChild); 91 this.parent.appendChild(this.leftChild);
73 this.parent.appendChild(this.resizer); 92 this.parent.appendChild(this.resizer);
74 this.parent.appendChild(this.rightChild); 93 this.parent.appendChild(this.rightChild);
75 94
76 this.seperatorMouseDownEvent = this.seperatorMouseDown.bindAsEventListener(this); 95 this.seperatorMouseDownEvent = this.seperatorMouseDown.bindAsEventListener(this);
77 this.seperatorMouseUpEvent = this.seperatorMouseUp.bindAsEventListener(this); 96 this.seperatorMouseUpEvent = this.seperatorMouseUp.bindAsEventListener(this);
78 this.dividerMouseMoveEvent = this.dividerMouseMove.bindAsEventListener(this); 97 this.dividerMouseMoveEvent = this.dividerMouseMove.bindAsEventListener(this);
79 this.dividerMouseUpEvent = this.dividerMouseUp.bindAsEventListener(this); 98 this.dividerMouseUpEvent = this.dividerMouseUp.bindAsEventListener(this);
80 99
81 Event.observe(this.resizer, "mousedown", this.seperatorMouseDownEvent); 100 Event.observe(this.resizer, "mousedown", this.seperatorMouseDownEvent);
82 Event.observe(this.resizer, "mouseup", this.seperatorMouseUpEvent); 101 Event.observe(this.resizer, "mouseup", this.seperatorMouseUpEvent);
83 Event.observe(this.parent, "mousemove", this.dividerMouseMoveEvent); 102 Event.observe(this.parent, "mousemove", this.dividerMouseMoveEvent);
84 Event.observe(this.parent, "mouseup", this.dividerMouseUpEvent); 103 Event.observe(this.parent, "mouseup", this.dividerMouseUpEvent);
85 }, 104 },
86 105
87 setLayoutStyles : function () { 106 setLayoutStyles : function () {
88 107
89 this.parent.addClassName("DNMSDivider_parent").show(); 108 this.parent.addClassName("DNMSDivider_parent").show();
90 var leftRatio = parseInt( this.ratio.split(":")[0] ); 109 var leftRatio = parseInt( this.ratio.split(":")[0] );
91 var rightRatio = parseInt( this.ratio.split(":")[1] ); 110 var rightRatio = parseInt( this.ratio.split(":")[1] );
92 111
93 if ( this.type == Divider.TYPE_HORIZONTAL ) { 112 if ( this.type == Divider.TYPE_HORIZONTAL ) {
94 113
95 this.leftChild.addClassName("DNMSDivider_topchild").show(); 114 this.leftChild.addClassName("DNMSDivider_topchild").show();
96 if (Prototype.Browser.IE) { 115 if (Prototype.Browser.IE) {
97 this.resizer.addClassName('DNMSDivider_horizantal_resizer').show(); 116 this.resizer.addClassName('DNMSDivider_horizantal_resizer').show();
98 } 117 }
 
 
Line 103 | Parallel Line 122 | Parallel
103 this.rightChild.addClassName("DNMSDivider_bottomchild").show(); 122 this.rightChild.addClassName("DNMSDivider_bottomchild").show();
104 this.rightChild.style.height = (( this.parent.getHeight() * ( rightRatio / ( leftRatio + rightRatio ))) - this.resizer.getHeight()- 20 ) + 'px'; 123 this.rightChild.style.height = (( this.parent.getHeight() * ( rightRatio / ( leftRatio + rightRatio ))) - this.resizer.getHeight()- 20 ) + 'px';
105 this.leftChild.style.height = ( this.parent.getHeight() * ( leftRatio / ( leftRatio + rightRatio ) )) + 'px'; 124 this.leftChild.style.height = ( this.parent.getHeight() * ( leftRatio / ( leftRatio + rightRatio ) )) + 'px';
106 125
107 }else { 126 }else {
108 127
109 this.leftChild.addClassName("DNMSDivider_leftchild").show(); 128 this.leftChild.addClassName("DNMSDivider_leftchild").show();
110 this.resizer.addClassName('DNMSDivider_vertical_resizer').show(); 129 this.resizer.addClassName('DNMSDivider_vertical_resizer').show();
111 this.rightChild.addClassName("DNMSDivider_rightchild").show(); 130 this.rightChild.addClassName("DNMSDivider_rightchild").show();
112 this.rightChild.style.width = (( this.parent.getWidth() * ( rightRatio /( leftRatio + rightRatio ) )) - this.resizer.getWidth() - this.browserAdjustableWidth )+'px'; 131 this.rightChild.style.width = (( this.parent.getWidth() * ( rightRatio /( leftRatio + rightRatio ) )) - this.resizer.getWidth() - this.browserAdjustableWidth )+'px';
113 this.leftChild.style.width = ( this.parent.getWidth() * ( leftRatio / ( leftRatio + rightRatio ) ))+'px'; 132 this.leftChild.style.width = ( this.parent.getWidth() * ( leftRatio / ( leftRatio + rightRatio ) ))+'px';
114 } 133 }
115 }, 134 },
116 135
117 seperatorMouseDown : function ( mouse ){ 136 seperatorMouseDown : function ( mouse ){
118 this.isMouseDown = true; 137 this.isMouseDown = true;
119 this.seperator_position = ( this.type == Divider.TYPE_HORIZONTAL ) ? mouse.clientY : mouse.clientX; 138 this.seperator_position = ( this.type == Divider.TYPE_HORIZONTAL ) ? mouse.clientY : mouse.clientX;
120 this.leftchild_size = ( this.type == Divider.TYPE_HORIZONTAL ) ? this.leftChild.getHeight() : this.leftChild.getWidth(); 139 this.leftchild_size = ( this.type == Divider.TYPE_HORIZONTAL ) ? this.leftChild.getHeight() : this.leftChild.getWidth();
121 if ( mouse.preventDefault != null ){ 140 if ( mouse.preventDefault != null ){
122 mouse.preventDefault(); 141 mouse.preventDefault();
123 } 142 }
124 return false; 143 return false;
125 }, 144 },
126 145
127 seperatorMouseUp : function ( mouse ){ 146 seperatorMouseUp : function ( mouse ){
128 this.isMouseDown= false; 147 this.isMouseDown= false;
129 this.seperator_position = ( this.type == Divider.TYPE_HORIZONTAL ) ? mouse.clientY : mouse.clientX; 148 this.seperator_position = ( this.type == Divider.TYPE_HORIZONTAL ) ? mouse.clientY : mouse.clientX;
130 }, 149 },
131 dividerMouseUp : function ( mouse ){ 150 dividerMouseUp : function ( mouse ){
132 this.isMouseDown= false; 151 this.isMouseDown= false;
152 if (this.onResizeHandler != null) this.onResizeHandler();
133 }, 153 },
134 dividerMouseMove : function ( mouse ){ 154 dividerMouseMove : function ( mouse ){
135 // this is to initialize the layout.. 155 // this is to initialize the layout..
 
 
Line 137 | Parallel Line 157 | Parallel
137 this.layoutIntialised = true; 157 this.layoutIntialised = true;
138 this.setLayoutStyles(); 158 this.setLayoutStyles();
139 return; 159 return;
140 } 160 }
141 if ( this.isMouseDown == true && this.canDrag) { 161 if ( this.isMouseDown == true && this.canDrag) {
142 var current_mouse_pos = ( this.type == Divider.TYPE_HORIZONTAL ) ? mouse.clientY : mouse.clientX; 162 var current_mouse_pos = ( this.type == Divider.TYPE_HORIZONTAL ) ? mouse.clientY : mouse.clientX;
143 var newSize = parseInt( this.leftchild_size + ( current_mouse_pos - this.seperator_position ) ); 163 var newSize = parseInt( this.leftchild_size + ( current_mouse_pos - this.seperator_position ) );
144 var parentSize = parseInt( ( this.type == Divider.TYPE_HORIZONTAL ) ? this.parent.getHeight() : this.parent.getWidth() ); 164 var parentSize = parseInt( ( this.type == Divider.TYPE_HORIZONTAL ) ? this.parent.getHeight() : this.parent.getWidth() );
145 if ( newSize < 15 ){ 165 if ( newSize < 15 ){
146 newSize = 15; 166 newSize = 15;
 
 
Line 150 | Parallel Line 170 | Parallel
150 this.isMouseDown = false; 170 this.isMouseDown = false;
151 } 171 }
152 if ( this.type == Divider.TYPE_HORIZONTAL ) { 172 if ( this.type == Divider.TYPE_HORIZONTAL ) {
153 this.rightChild.style.height = parseInt( this.parent.getHeight() - newSize - this.resizer.getHeight() - this.browserAdjustableWidth ) +'px'; 173 var rightSize = parseInt( this.parent.getHeight() - newSize - this.resizer.getHeight() - this.browserAdjustableWidth );
154 this.leftChild.style.height = newSize +'px'; 174 if (rightSize < this.right_min_size)
175 {
176 Event.stop(mouse);
177 return;
178 }
179 this.rightChild.style.height = rightSize +'px';
180 if (newSize < this.left_min_size)
181 {
182 Event.stop(mouse);
183 return;
184 }
185 this.leftChild.style.height = newSize +'px';
155 } else { 186 } else {
156 this.rightChild.style.width = parseInt( this.parent.getWidth() - newSize - this.resizer.getWidth() - this.browserAdjustableWidth ) +'px'; 187 this.rightChild.style.width = parseInt( this.parent.getWidth() - newSize - this.resizer.getWidth() - this.browserAdjustableWidth ) +'px';
157 this.leftChild.style.width = newSize +'px'; 188 this.leftChild.style.width = newSize +'px';
158 } 189 }
159 } 190 }
160 } 191 }
161 192
162 193
163 194
164 195
165 }; 196 };
 
File Web.BaseModule/WebContent/webresource/webcomponents/table/scripts/HorizontalTable.js (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 13 | Parallel Line 13 | Parallel
13 { 13 {
14 var tr = this.table.insertRow(-1); 14 var tr = this.table.insertRow(-1);
15 var th = document.createElement('th'); 15 var th = document.createElement('th');
16 th.noWrap = this.noWrap;
16 th.innerHTML = this.columns[j].title; 17 th.innerHTML = this.columns[j].title;
17 if (j == 0) 18 if (j == 0)
18 { 19 {
 
 
Line 28 | Parallel Line 29 | Parallel
28 for (var j=0; j < this.columns.length; j++) 29 for (var j=0; j < this.columns.length; j++)
29 { 30 {
30 var td = this.table.rows[j].insertCell(-1); 31 var td = this.table.rows[j].insertCell(-1);
32 td.noWrap = this.noWrap;
31 td.innerHTML = rowData[this.columns[j].id]; 33 td.innerHTML = rowData[this.columns[j].id];
32 } 34 }
33 }, 35 },
 
 
Line 39 | Parallel Line 41 | Parallel
39 for (var j=0; j < this.columns.length; j++) 41 for (var j=0; j < this.columns.length; j++)
40 { 42 {
41 var td = this.table.rows[j].insertCell(-1); 43 var td = this.table.rows[j].insertCell(-1);
44 td.noWrap = this.noWrap;
42 td.innerHTML = rowData[i][this.columns[j].id]; 45 td.innerHTML = rowData[i][this.columns[j].id];
43 } 46 }
44 } 47 }
 
File Web.BaseModule/WebContent/webresource/webcomponents/table/scripts/Table.js (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 7 | Parallel Line 7 | Parallel
7 this.columns = options.columns; 7 this.columns = options.columns;
8 this.height = options.height; 8 this.height = options.height;
9 this.width = options.width; 9 this.width = options.width;
10 this.noWrap = options.noWrap != undefined ? options.noWrap : true;
10 this.parentId = $(options.parentId); 11 this.parentId = $(options.parentId);
11 this.onClickHandler = options.onClickHandler; 12 this.onClickHandler = options.onClickHandler;
12 this.previousSelectedRow = null; 13 this.previousSelectedRow = null;
 
File Web.BaseModule/WebContent/webresource/webcomponents/table/scripts/VerticalTable.js (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 4 | Parallel Line 4 | Parallel
4 { 4 {
5 $super(options); 5 $super(options);
6 }, 6 },
7 7
8 createTable: function ($super) 8 createTable: function ($super)
9 { 9 {
10 $super(); 10 $super();
 
 
Line 13 | Parallel Line 13 | Parallel
13 for (var j=0; j < this.columns.length; j++) 13 for (var j=0; j < this.columns.length; j++)
14 { 14 {
15 var th = document.createElement('th'); 15 var th = document.createElement('th');
16 th.noWrap = this.noWrap;
16 th.innerHTML = this.columns[j].title; 17 th.innerHTML = this.columns[j].title;
17 th.style.width = this.columns[j].width; 18 th.style.width = this.columns[j].width;
18 tr.appendChild(th); 19 tr.appendChild(th);
19 } 20 }
20 }, 21 },
21 22
22 addRow: function (rowData) 23 addRow: function (rowData)
23 { 24 {
24 var tr = this.table.insertRow(-1); 25 var tr = this.table.insertRow(-1);
25 for (var j=0; j < this.columns.length; j++) 26 for (var j=0; j < this.columns.length; j++)
26 { 27 {
27 var td = tr.insertCell(-1); 28 var td = tr.insertCell(-1);
29 td.noWrap = this.noWrap;
28 td.innerHTML = rowData[this.columns[j].id]; 30 td.innerHTML = rowData[this.columns[j].id];
29 if (this.colorfulColumns && this.colorColumnId) 31 if (this.colorfulColumns && this.colorColumnId)
30 { 32 {
 
 
Line 41 | Parallel Line 43 | Parallel
41 this.records[tr.rowIndex]=rowData; 43 this.records[tr.rowIndex]=rowData;
42 Event.observe(tr, 'click', this.onClickRow.bindAsEventListener(this, tr)); 44 Event.observe(tr, 'click', this.onClickRow.bindAsEventListener(this, tr));
43 }, 45 },
44 46
45 addRows: function (rowData) 47 addRows: function (rowData)
46 { 48 {
47 for (var i=0; i < rowData.length; i++) 49 for (var i=0; i < rowData.length; i++)
 
 
Line 50 | Parallel Line 52 | Parallel
50 for (var j=0; j < this.columns.length; j++) 52 for (var j=0; j < this.columns.length; j++)
51 { 53 {
52 var td = tr.insertCell(-1); 54 var td = tr.insertCell(-1);
55 td.noWrap = this.noWrap;
53 td.innerHTML = rowData[i][this.columns[j].id]; 56 td.innerHTML = rowData[i][this.columns[j].id];
54 if (this.colorfulColumns && this.colorColumnId) 57 if (this.colorfulColumns && this.colorColumnId)
55 { 58 {
 
 
Line 67 | Parallel Line 70 | Parallel
67 Event.observe(tr, 'click', this.onClickRow.bindAsEventListener(this, tr)); 70 Event.observe(tr, 'click', this.onClickRow.bindAsEventListener(this, tr));
68 } 71 }
69 }, 72 },
70 73
71 onClickRow: function(paramEvent, tr) 74 onClickRow: function(paramEvent, tr)
72 { 75 {
73 Event.stop(paramEvent); 76 Event.stop(paramEvent);
 
 
Line 83 | Parallel Line 86 | Parallel
83 this.onClickHandler(paramEvent, tr); 86 this.onClickHandler(paramEvent, tr);
84 } 87 }
85 }, 88 },
86 89
90 showNoData: function(data)
91 {
92 if (!data)
93 {
94 data ="Data";
95 }
96 var tr = this.table.insertRow(-1);
97 var td = tr.insertCell(-1);
98 td.className = 'table_nodata';
99 td.colSpan = this.columns.length;
100 td.noWrap = this.noWrap;
101 td.innerHTML = "No " + data + " Available...";
102 td.style.fontSize = "20px";
103 td.style.height = this.height - 26; //26 - size of header
104 },
105
87 clear: function() 106 clear: function()
88 { 107 {
89 for(var i = this.table.rows.length - 1; i > 0; i--) 108 for(var i = this.table.rows.length - 1; i > 0; i--)
 
File Web.BaseModule/WebContent/webresource/webcomponents/table/theme/blue/css/table.css (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 71 | Parallel Line 71 | Parallel
71 { 71 {
72 background-color: #FFF8CA; 72 background-color: #FFF8CA;
73 } 73 }
74
75 .table_nodata
76 {
77 font-weight: bold;
78 color:#11114E;
79 text-align:center;
80 }
 
File Web.BaseModule/WebContent/webresource/webcomponents/table/theme/green/css/table.css (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 71 | Parallel Line 71 | Parallel
71 { 71 {
72 background-color: #FFF8CA; 72 background-color: #FFF8CA;
73 } 73 }
74
75 .table_nodata
76 {
77 font-weight: bold;
78 color:#11114E;
79 text-align:center;
80 }
 
File Web.BaseModule/WebContent/webresource/webcomponents/table/theme/grey/css/table.css (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 71 | Parallel Line 71 | Parallel
71 { 71 {
72 background-color: #FFF8CA; 72 background-color: #FFF8CA;
73 } 73 }
74
75 .table_nodata
76 {
77 font-weight: bold;
78 color:#11114E;
79 text-align:center;
80 }
 
File Web.BaseModule/WebContent/webresource/webcomponents/treegrid/scripts/TreeGrid.js (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 171 | Parallel Line 171 | Parallel
171 */ 171 */
172 _setUpParentLinks : function (records, parentId) 172 _setUpParentLinks : function (records, parentId)
173 { 173 {
174 if (records)
174 for (var i = 0; i < records.length ; i++) 175 for (var i = 0; i < records.length ; i++)
175 { 176 {
176 var record = records[i]; 177 var record = records[i];
 
 
Line 188 | Parallel Line 189 | Parallel
188 } 189 }
189 }, 190 },
190 191
191 _createLayout : function () 192 _createLayout_old : function ()
192 { 193 {
193 194
194 this.baseContainer = document.createElement('div'); 195 this.baseContainer = document.createElement('div');
 
 
Line 214 | Parallel Line 215 | Parallel
214 215
215 }, 216 },
216 217
218 _createLayout : function ()
219 {
220
221 this.baseContainer = document.createElement('div');
222 this.baseContainer.className = 'treegrid_basecontainer';
223 this.treeBody = document.createElement('div');
224 this.treeBody.className = "tree_grid_scroller";
225 if(this.renderTo) this.renderTo.appendChild(this.baseContainer);
226 /* Creates the header bar renderTo. Used for both title bar and header bar */
227 this.headerContainer = document.createElement('div');
228 this.baseContainer.appendChild(this.headerContainer);
229 this.resizeDiv = this.baseContainer.appendChild(document.createElement('div'));
230 this.resizeDiv.className = 'treegrid_resize_proxy';
231 Event.observe(this.treeBody, "scroll", this._onScroll.bindAsEventListener(this, this.treeBody), false);
232 this.baseContainer.appendChild(this.treeBody);
233 this.sizeDivs();
234 this._initHeaderLayout();
235 },
236
237
238 sizeDivs : function()
239 {
240 this.baseContainer.style.width = this._getWidth() + TreeGrid._$pixelSuffix;
241 this.baseContainer.style.height = this._getHeight() + TreeGrid._$pixelSuffix;
242 var proxyDivHeight = this.title ? Element.getDimensions(this.baseContainer).height - 20 : Element.getDimensions(this.baseContainer).height;
243 proxyDivHeight -= Prototype.Browser.IE ? 0 : 2;
244 this.resizeDiv.style.height = proxyDivHeight + TreeGrid._$pixelSuffix;
245 this.treeBody.style.width = this._getWidth() - 2 + TreeGrid._$pixelSuffix;
246 this.treeBody.style.height = (this._getHeight() - Element.getDimensions(this.headerContainer).height - 2) + TreeGrid._$pixelSuffix;
247 },
248
249 resizeGrid: function()
250 {
251 this.containerHeight = null;
252 this.containerWidth = null;
253 this.sizeDivs();
254 },
255
217 _initHeaderLayout : function () 256 _initHeaderLayout : function ()
218 { 257 {
219 if(this.title){ 258 if(this.title){
 
 
Line 229 | Parallel Line 268 | Parallel
229 headerBar.className = 'treegrid_header_bg'; 268 headerBar.className = 'treegrid_header_bg';
230 this.headerOffsetDiv.className = 'treegrid_header_offset treegrid_header_bg'; 269 this.headerOffsetDiv.className = 'treegrid_header_offset treegrid_header_bg';
231 headerBar.appendChild(this.headerOffsetDiv); 270 headerBar.appendChild(this.headerOffsetDiv);
232 var dirtyBlock = headerBar.appendChild(document.createElement('div')); 271 /*var dirtyBlock = headerBar.appendChild(document.createElement('div'));
272 dirtyBlock.style.border = "1px solid red";
233 dirtyBlock.className = 'treegrid_header_bg'; 273 dirtyBlock.className = 'treegrid_header_bg';
234 dirtyBlock.style.width = this.scrollBarWidth + TreeGrid._$pixelSuffix; 274 dirtyBlock.style.width = this.scrollBarWidth + TreeGrid._$pixelSuffix;
235 dirtyBlock.style.height = this.headerBarHeight+ TreeGrid._$pixelSuffix; 275 dirtyBlock.style.height = this.headerBarHeight+ TreeGrid._$pixelSuffix;
236 dirtyBlock.style.left = this._getWidth() - this.scrollBarWidth + 1 + TreeGrid._$pixelSuffix; 276 dirtyBlock.style.left = this._getWidth() - this.scrollBarWidth + 1 + TreeGrid._$pixelSuffix;
237 dirtyBlock.style.top = this.title ? Prototype.Browser.IE ? 24 : 25 : 1; 277 dirtyBlock.style.top = this.title ? Prototype.Browser.IE ? 24 : 25 : 1;
238 dirtyBlock.style.position = 'absolute'; 278 dirtyBlock.style.position = 'absolute';*/
239 279
240 var headerTable = document.createElement('table'); 280 var headerTable = document.createElement('table');
241 headerTable.setAttribute("cellPadding", 0); 281 headerTable.setAttribute("cellPadding", 0);
 
 
Line 319 | Parallel Line 359 | Parallel
319 }, 359 },
320 _getHeight : function () 360 _getHeight : function ()
321 { 361 {
322 362 var _temp_moz_height_fix = 0;
363 if(!Prototype.Browser.IE) _temp_moz_height_fix = 25;
323 var height_adjust_diff = this.title ? this.titleBarHeight : this.titleBarHeight + this.headerBarHeight; 364 var height_adjust_diff = this.title ? this.titleBarHeight : this.titleBarHeight + this.headerBarHeight;
324 if(Prototype.Browser.IE)height_adjust_diff -=2; 365 if(Prototype.Browser.IE)height_adjust_diff -=2;
325 if (this.height) 366 if (this.height)
 
 
Line 353 | Parallel Line 394 | Parallel
353 this.containerHeight = Math.max(20, this.renderTo.offsetHeight - height_adjust_diff); 394 this.containerHeight = Math.max(20, this.renderTo.offsetHeight - height_adjust_diff);
354 } 395 }
355 } 396 }
356 else this.containerHeight = Math.max(20, calcHeight - height_adjust_diff); 397 else this.containerHeight = Math.max(20, calcHeight - height_adjust_diff + _temp_moz_height_fix);
357 } 398 }
358 return this.containerHeight; 399 return this.containerHeight;
359 }, 400 },
 
File Web.BaseModule/src/com/dhyan/nms/client/webclient/webbase/struts/PostLoginSecurityChecker.java (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 10 | Parallel Line 10 | Parallel
10 import org.apache.commons.logging.LogFactory; 10 import org.apache.commons.logging.LogFactory;
11 import org.apache.struts2.interceptor.ServletRequestAware; 11 import org.apache.struts2.interceptor.ServletRequestAware;
12 import org.apache.struts2.interceptor.ServletResponseAware; 12 import org.apache.struts2.interceptor.ServletResponseAware;
13 import org.json.JSONObject;
13 14
14 import com.dhyan.component.notification.NotificationConstants; 15 import com.dhyan.component.notification.NotificationConstants;
15 import com.dhyan.component.notification.subscriber.SubscriberDetails; 16 import com.dhyan.component.notification.subscriber.SubscriberDetails;
 
 
Line 108 | Parallel Line 109 | Parallel
108 { 109 {
109 try 110 try
110 { 111 {
111 LOGGER.info("Inside subscribeUserForNotification<<<<<<<<<<<<<<<<<<<<<<<<<" + NotificationConstants.NOTIFICATION_TOPIC_SECURITY_GROUP); 112 LOGGER.info("Inside subscribeUserForNotification .................... " + NotificationConstants.NOTIFICATION_TOPIC_SECURITY_GROUP);
112 SubscriberDetails subDetails = new SubscriberDetails(); 113 SubscriberDetails subDetails = new SubscriberDetails();
113 subDetails.setDataProcessorClass(new SecurityUserNotificationProcessor()); 114 subDetails.setDataProcessorClass(new SecurityUserNotificationProcessor());
114 subDetails.setTopicName(NotificationConstants.NOTIFICATION_TOPIC_SECURITY_USER); 115 subDetails.setTopicName(NotificationConstants.NOTIFICATION_TOPIC_SECURITY_USER);
 
 
Line 116 | Parallel Line 117 | Parallel
116 subDetails.setSessionId(request.getSession().getId()); 117 subDetails.setSessionId(request.getSession().getId());
117 subDetails.setSubscriberKey(NotificationConstants.NOTIFICATION_TOPIC_SECURITY_USER + "_Subscriber"); 118 subDetails.setSubscriberKey(NotificationConstants.NOTIFICATION_TOPIC_SECURITY_USER + "_Subscriber");
118 SubscriberManager.getInstance().subscribe(subDetails); 119 SubscriberManager.getInstance().subscribe(subDetails);
119 LOGGER.info("subscribed succesfully subscribeUserForNotification<<<<<<<<<<<<<<<<<<<<<<<<<"); 120 LOGGER.info("subscribed succesfully subscribeUserForNotification.....................");
120 return true; 121 return true;
121 } 122 }
122 catch(Exception e) 123 catch(Exception e)
 
 
Line 256 | Parallel Line 257 | Parallel
256 { 257 {
257 this.invalidateSessionObject(); 258 this.invalidateSessionObject();
258 } 259 }
259 this.writeToResponse(JSONBuilder.OPEN_CURLY_BRACE + JSONBuilder.prepareKeyValuePair(resultType, resultMessage) + JSONBuilder.CLOSED_CURLY_BRACE); 260 JSONObject responseJSON = new JSONObject();
261 responseJSON.put(resultType, resultMessage);
262 this.writeToResponse(responseJSON.toString());
260 return null; 263 return null;
261 } 264 }
262 265
 
File Web.Fault/WebContent/WEB-INF/properties/alarmdetails.properties (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 1 | Parallel Line 1 | Parallel
1 alarmDetails.tab.name.alarmDetails=Alarm Details 1 alarmDetails.tab.name.alarmDetails=Alarm Details
2 2
3 alarmDetails.window.name.assignAlarm=Assign Alarm 3 alarmDetails.window.name.assignAlarm=Assign Owner
4 4
5 alarmDetails.dialog.message.remedyLengthCannotBeGreater255chars=Remedy length cannot be greater than 255 characters 5 alarmDetails.dialog.message.remedyLengthCannotBeGreater255chars=Remedy length cannot be greater than 255 characters
6 alarmDetails.dialog.message.messageLengthCannotBeGreater255chars=Message length cannot be greater than 255 characters 6 alarmDetails.dialog.message.messageLengthCannotBeGreater255chars=Message length cannot be greater than 255 characters
 
File Web.Fault/WebContent/WEB-INF/properties/alarms.properties (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 14 | Parallel Line 14 | Parallel
14 alarms.gridColumn.name.clearedTime=Cleared Time 14 alarms.gridColumn.name.clearedTime=Cleared Time
15 15
16 alarms.tooltip.name.alarmDetails=Alarm Details 16 alarms.tooltip.name.alarmDetails=Alarm Details
17 alarms.tooltip.name.assignOwner=Assign Owner
17 alarms.tooltip.name.acknowledge=Acknowledge 18 alarms.tooltip.name.acknowledge=Acknowledge
18 alarms.tooltip.name.clear=Clear 19 alarms.tooltip.name.clear=Clear
19 alarms.tooltip.name.delete=Delete 20 alarms.tooltip.name.delete=Delete
 
File Web.Fault/WebContent/jsp/fault/AssignAlarm.jsp (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 4 | Parallel Line 4 | Parallel
4 <tr><td colspan="4" width="100%">&nbsp;</td></tr> 4 <tr><td colspan="4" width="100%">&nbsp;</td></tr>
5 <tr> 5 <tr>
6 <td width="5%" align="left">&nbsp;</td> 6 <td width="5%" align="left">&nbsp;</td>
7 <td width="40%" align="left"><font class="labelTextSmallBold"><s:text name="alarmDetails.label.name.owner"/></font></td> 7 <td width="40%" align="left"><font class="labelTextSmallBold"><s:text name="alarmDetails.label.name.assignTo"/></font></td>
8 <td width="55%" align="left"> 8 <td width="55%" align="left">
9 <s:select id="ownerListId" name="assignAlarmId" list="ownerList" listKey="username" listValue="username" cssClass="selectBox" cssStyle="width:85%;height:20px;"/> 9 <s:select id="ownerListId" name="assignAlarmId" list="ownerList" listKey="username" listValue="username" cssClass="selectBox" cssStyle="width:85%;height:20px;"/>
10 <s:hidden id="alarmId" name="alarmId"/> 10 <s:hidden id="alarmId" name="alarmId"/>
 
File Web.Fault/WebContent/resourcebundle/com/dhyan/nms/client/webclient/fault/struts/AlarmDetailsAction.properties (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 12 | Parallel Line 12 | Parallel
12 12
13 13
14 14
15 alarmDetails.label.name.owner=Owner 15 alarmDetails.label.name.assignTo=Assign To
16 alarmDetails.label.name.alarmID=Alarm ID 16 alarmDetails.label.name.alarmID=Alarm ID
17 alarmDetails.label.name.severity=Severity 17 alarmDetails.label.name.severity=Severity
18 alarmDetails.label.name.hostName=Host Name 18 alarmDetails.label.name.hostName=Host Name
 
File Web.Fault/WebContent/resources/conf/menuitem.xml.part (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 282 | Parallel Line 282 | Parallel
282 handlertodisable="AlarmBrowserUtil.disableOnAck"/> 282 handlertodisable="AlarmBrowserUtil.disableOnAck"/>
283 <menuitem 283 <menuitem
284 id="assignalarmowner" 284 id="assignalarmowner"
285 name="Alarm Assign" 285 name="Assign Owner"
286 display-name="Assign Alarm" 286 display-name="Assign Owner"
287 webicon="/webresource/webbase/styles/css/images/acknowledge.gif" 287 webicon="/webresource/fault/styles/css/images/alarm_assign.gif"
288 role="DEFAULT_ROLE_FOR_SERVER" 288 role="FAU_ALM_VIEW_OWNER"
289 webhandler = "AlarmBrowserUtil.assignAlarmOwner" 289 webhandler = "AlarmBrowserUtil.assignAlarmOwner"
290 disabledOnMultiSelect="true"/> 290 disabledOnMultiSelect="true"/>
291 291
 
File Web.Fault/WebContent/webresource/fault/scripts/FaultTabUtility.js (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 263 | Parallel Line 263 | Parallel
263 AlarmBrowserUtil.alarmBrowserToolBar = new DNMSToolBar('AlarmBrowser', paramToolBarContainer, false); 263 AlarmBrowserUtil.alarmBrowserToolBar = new DNMSToolBar('AlarmBrowser', paramToolBarContainer, false);
264 264
265 AlarmBrowserUtil.editButton = new DNMSToolBarButton('Edit', '/webresource/webbase/styles/css/images/edit.gif', AlarmBrowserUtil.alarmWindow, alarmsLocale.getText("alarms.tooltip.name.alarmDetails")); 265 AlarmBrowserUtil.editButton = new DNMSToolBarButton('Edit', '/webresource/webbase/styles/css/images/edit.gif', AlarmBrowserUtil.alarmWindow, alarmsLocale.getText("alarms.tooltip.name.alarmDetails"));
266 AlarmBrowserUtil.assignOwnerButton = new DNMSToolBarButton('Assign_Owner', '/webresource/fault/styles/css/images/alarm_assign.gif', AlarmBrowserUtil.assignAlarmOwner, alarmsLocale.getText("alarms.tooltip.name.assignOwner"));
266 AlarmBrowserUtil.ackButton = new DNMSToolBarButton('Ack', '/webresource/webbase/styles/css/images/acknowledge.gif', AlarmBrowserUtil.ack, alarmsLocale.getText("alarms.tooltip.name.acknowledge")); 267 AlarmBrowserUtil.ackButton = new DNMSToolBarButton('Ack', '/webresource/webbase/styles/css/images/acknowledge.gif', AlarmBrowserUtil.ack, alarmsLocale.getText("alarms.tooltip.name.acknowledge"));
267 AlarmBrowserUtil.clearButton = new DNMSToolBarButton('clear', '/webresource/webbase/styles/css/images/clear.gif', AlarmBrowserUtil.clear, alarmsLocale.getText("alarms.tooltip.name.clear")); 268 AlarmBrowserUtil.clearButton = new DNMSToolBarButton('clear', '/webresource/webbase/styles/css/images/clear.gif', AlarmBrowserUtil.clear, alarmsLocale.getText("alarms.tooltip.name.clear"));
268 AlarmBrowserUtil.deleteButton = new DNMSToolBarButton('del', '/webresource/webbase/styles/css/images/delete.gif', AlarmBrowserUtil.del, alarmsLocale.getText("alarms.tooltip.name.delete")); 269 AlarmBrowserUtil.deleteButton = new DNMSToolBarButton('del', '/webresource/webbase/styles/css/images/delete.gif', AlarmBrowserUtil.del, alarmsLocale.getText("alarms.tooltip.name.delete"));
 
 
Line 276 | Parallel Line 277 | Parallel
276 FaultBrowserUtil.showClearedAlarm = "true"; 277 FaultBrowserUtil.showClearedAlarm = "true";
277 278
278 AlarmBrowserUtil.alarmBrowserToolBar.insertToolBarItem(AlarmBrowserUtil.editButton, null, true); 279 AlarmBrowserUtil.alarmBrowserToolBar.insertToolBarItem(AlarmBrowserUtil.editButton, null, true);
280 AlarmBrowserUtil.alarmBrowserToolBar.insertToolBarItem(AlarmBrowserUtil.assignOwnerButton, null, true);
279 AlarmBrowserUtil.alarmBrowserToolBar.insertToolBarItem(AlarmBrowserUtil.ackButton, null, true); 281 AlarmBrowserUtil.alarmBrowserToolBar.insertToolBarItem(AlarmBrowserUtil.ackButton, null, true);
280 AlarmBrowserUtil.alarmBrowserToolBar.insertToolBarItem(AlarmBrowserUtil.clearButton, null, true); 282 AlarmBrowserUtil.alarmBrowserToolBar.insertToolBarItem(AlarmBrowserUtil.clearButton, null, true);
281 AlarmBrowserUtil.alarmBrowserToolBar.insertToolBarItem(AlarmBrowserUtil.deleteButton, null, true); 283 AlarmBrowserUtil.alarmBrowserToolBar.insertToolBarItem(AlarmBrowserUtil.deleteButton, null, true);
 
 
Line 291 | Parallel Line 293 | Parallel
291 AlarmBrowserUtil.alarmBrowserToolBar.insertToolBarItem(AlarmBrowserUtil.alarmBrowserColumnPropertyButton, null, true); 293 AlarmBrowserUtil.alarmBrowserToolBar.insertToolBarItem(AlarmBrowserUtil.alarmBrowserColumnPropertyButton, null, true);
292 294
293 AlarmBrowserUtil.editButton.disable(); 295 AlarmBrowserUtil.editButton.disable();
296 AlarmBrowserUtil.assignOwnerButton.disable();
294 AlarmBrowserUtil.ackButton.disable(); 297 AlarmBrowserUtil.ackButton.disable();
295 AlarmBrowserUtil.clearButton.disable(); 298 AlarmBrowserUtil.clearButton.disable();
296 AlarmBrowserUtil.deleteButton.disable(); 299 AlarmBrowserUtil.deleteButton.disable();
 
 
Line 356 | Parallel Line 359 | Parallel
356 maximizable: false, 359 maximizable: false,
357 minimizable: false, 360 minimizable: false,
358 resizable: false, 361 resizable: false,
359 iconURL:"/webresource/webbase/styles/css/images/hide_cleared_alarms.gif", 362 iconURL:"/webresource/fault/styles/css/images/alarm_assign.gif",
360 hasButton:true, 363 hasButton:true,
361 onContentLoad:AlarmBrowserUtil.loadAssignAlarmWindowButton 364 onContentLoad:AlarmBrowserUtil.loadAssignAlarmWindowButton
362 }) 365 })
 
 
Line 454 | Parallel Line 457 | Parallel
454 && AlarmBrowserUtil.alarm_grid.grid.buffer != null) 457 && AlarmBrowserUtil.alarm_grid.grid.buffer != null)
455 AlarmBrowserUtil.alarm_grid.grid.buffer.refresh(); 458 AlarmBrowserUtil.alarm_grid.grid.buffer.refresh();
456 AlarmBrowserUtil.editButton.disable(); 459 AlarmBrowserUtil.editButton.disable();
460 AlarmBrowserUtil.assignOwnerButton.disable();
457 AlarmBrowserUtil.ackButton.disable(); 461 AlarmBrowserUtil.ackButton.disable();
458 AlarmBrowserUtil.clearButton.disable(); 462 AlarmBrowserUtil.clearButton.disable();
459 AlarmBrowserUtil.deleteButton.disable(); 463 AlarmBrowserUtil.deleteButton.disable();
 
 
Line 729 | Parallel Line 733 | Parallel
729 AlarmBrowserUtil.deleteButton.disable(); 733 AlarmBrowserUtil.deleteButton.disable();
730 } 734 }
731 AlarmBrowserUtil.editButton.enable(); 735 AlarmBrowserUtil.editButton.enable();
736 AlarmBrowserUtil.assignOwnerButton.enable();
732 if (AlarmBrowserUtil.alarm_grid['grid'].getSelectedRowsJSON().rows.length > 1) 737 if (AlarmBrowserUtil.alarm_grid['grid'].getSelectedRowsJSON().rows.length > 1)
733 { 738 {
734 AlarmBrowserUtil.editButton.disable(); 739 AlarmBrowserUtil.editButton.disable();
740 AlarmBrowserUtil.assignOwnerButton.disable();
735 } 741 }
736 }, 742 },
737 743
 
 
Line 746 | Parallel Line 752 | Parallel
746 else 752 else
747 { 753 {
748 AlarmBrowserUtil.editButton.disable(); 754 AlarmBrowserUtil.editButton.disable();
755 AlarmBrowserUtil.assignOwnerButton.disable();
749 AlarmBrowserUtil.ackButton.disable(); 756 AlarmBrowserUtil.ackButton.disable();
750 AlarmBrowserUtil.clearButton.disable(); 757 AlarmBrowserUtil.clearButton.disable();
751 AlarmBrowserUtil.deleteButton.disable(); 758 AlarmBrowserUtil.deleteButton.disable();
 
File Web.Fault/WebContent/webresource/fault/styles/css/images/alarm_assign.gif (Revision 1.0) [Add File Comment] [<<] [Top] [>>]
 
Line -1 Line -1
 
File Web.Fault/src/com/dhyan/nms/client/webclient/fault/struts/AlarmDetailsAction.java (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 762 | Parallel Line 762 | Parallel
762 } 762 }
763 } 763 }
764 AlarmStoreSessionLocal alarm_store_local = (AlarmStoreSessionLocal) LocalLookupManager.getLocalObject(AlarmStoreSessionLocal.class); 764 AlarmStoreSessionLocal alarm_store_local = (AlarmStoreSessionLocal) LocalLookupManager.getLocalObject(AlarmStoreSessionLocal.class);
765 if (request.getSession().getAttribute("LoggedInUserId") != null)
766 {
767 ems_alarm_obj.setUserid(Integer.valueOf(String.valueOf(request.getSession().getAttribute("LoggedInUserId"))).intValue());
768 }
765 alarm_store_local.updateAlarmDetails(ems_alarm_obj); 769 alarm_store_local.updateAlarmDetails(ems_alarm_obj);
766 this.writeToResponse(JSONBuilder.OPEN_CURLY_BRACE + JSONBuilder.prepareKeyValuePair(JSONBuilder.JSON_RESULT_FIELD, SUCCESS) 770 this.writeToResponse(JSONBuilder.OPEN_CURLY_BRACE + JSONBuilder.prepareKeyValuePair(JSONBuilder.JSON_RESULT_FIELD, SUCCESS)
767 + JSONBuilder.CLOSED_CURLY_BRACE); 771 + JSONBuilder.CLOSED_CURLY_BRACE);
 
File Web.General/WebContent/webresource/general/scripts/DNMSPrint.js (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 151 | Parallel Line 151 | Parallel
151 freezePanelHTML += ""; 151 freezePanelHTML += "";
152 freezePanelHTML += "<table cellspacing=\"0\" cellpadding=\"0\" class=\"DNMSGrid_FreezePaneltable\">"; 152 freezePanelHTML += "<table cellspacing=\"0\" cellpadding=\"0\" class=\"DNMSGrid_FreezePaneltable\">";
153 freezePanelHTML += "<tr><th><div style=\"white-space:nowrap; width:150px; overflow:hidden;\">Column</div></th><th><div style=\"white-space:nowrap; width:100px; overflow:hidden;\">Printable Columns</div></th></tr>"; 153 freezePanelHTML += "<tr><th><div style=\"white-space:nowrap; width:150px; overflow:hidden;\">Column</div></th><th><div style=\"white-space:nowrap; width:100px; overflow:hidden;\">Printable Columns</div></th></tr>";
154 var freezeTableHeight = 50; 154 var freezeTableHeight = 65;
155 var str = ""; 155 var str = "";
156 for (var i=0; i < this.gridObject.defaultColOrder.columnSpecs.length; i++) 156 for (var i=0; i < this.gridObject.defaultColOrder.columnSpecs.length; i++)
157 { 157 {
 
 
Line 183 | Parallel Line 183 | Parallel
183 this.freezePanelDiv.innerHTML = freezePanelHTML; 183 this.freezePanelDiv.innerHTML = freezePanelHTML;
184 this.freezePanelDiv.style.width = "100%"; 184 this.freezePanelDiv.style.width = "100%";
185 this.freezePanelDiv.style.height = "100%"; 185 this.freezePanelDiv.style.height = "100%";
186 var freezeTableWidth = 260; 186 var freezeTableWidth = 290;
187 if (Prototype.Browser.IE) 187 if (Prototype.Browser.IE)
188 { 188 {
189 freezeTableHeight += 10; 189 freezeTableHeight += 10;
 
 
Line 193 | Parallel Line 193 | Parallel
193 height: freezeTableHeight, 193 height: freezeTableHeight,
194 maximizable:false, 194 maximizable:false,
195 minimizable:false, 195 minimizable:false,
196 resizable:false,
196 closable:true, 197 closable:true,
197 destroyOnClose:true, 198 destroyOnClose:true,
198 onClose: function () {this.columnConfigurewin = null;}.bind(this) 199 onClose: function () {this.columnConfigurewin = null;}.bind(this)
 
File Web.Performance/WebContent/webresource/dashboard/scripts/DashboardConfigurator.js (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 1284 | Parallel Line 1284 | Parallel
1284 +"</td>" 1284 +"</td>"
1285 +"<td colspan=\"2\">" 1285 +"<td colspan=\"2\">"
1286 +"<select class=\"selectbox\" style=\"width:60px;\" id=\"slot_aggregate_selector_" + slotPosition + "\">" 1286 +"<select class=\"selectbox\" style=\"width:60px;\" id=\"slot_aggregate_selector_" + slotPosition + "\">"
1287 +"<option value=\"1\">min</option>" 1287 +"<option value=\"3\">avg</option>"
1288 +"<option value=\"1\">min</option>"
1288 +"<option value=\"2\">max</option>" 1289 +"<option value=\"2\">max</option>"
1289 +"<option value=\"3\">avg</option>" 1290
1290 //+"<option value=\"4\">sum</option>" 1291 //+"<option value=\"4\">sum</option>"
1291 //+"<option value=\"5\">count</option>" 1292 //+"<option value=\"5\">count</option>"
1292 +"</select> &nbsp; " 1293 +"</select> &nbsp; "
 
File Web.Performance/src/com/dhyan/nms/client/webclient/performance/struts/PerformanceStatisticsAction.java (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 35 | Parallel Line 35 | Parallel
35 import com.dhyan.nms.util.LocalLookupManager; 35 import com.dhyan.nms.util.LocalLookupManager;
36 import com.opensymphony.xwork2.ActionSupport; 36 import com.opensymphony.xwork2.ActionSupport;
37 37
38 public final class PerformanceStatisticsAction extends ActionSupport implements ServletRequestAware, ServletResponseAware 38 public class PerformanceStatisticsAction extends ActionSupport implements ServletRequestAware, ServletResponseAware
39 { 39 {
40 private static final long serialVersionUID = 1L; 40 private static final long serialVersionUID = 1L;
41 41
 
 
Line 672 | Parallel Line 672 | Parallel
672 return null; 672 return null;
673 } 673 }
674 674
675 private Perfobjdatacollgroupmap[] getDataCollectionObjectsArray(final String paramJSONArray) 675 protected Perfobjdatacollgroupmap[] getDataCollectionObjectsArray(final String paramJSONArray)
676 { 676 {
677 try 677 try
678 { 678 {
 
 
Line 704 | Parallel Line 704 | Parallel
704 return null; 704 return null;
705 } 705 }
706 706
707 private Resourcedetails[] getResourceDetailVOArray(final String paramResources) 707 protected Resourcedetails[] getResourceDetailVOArray(final String paramResources)
708 { 708 {
709 try 709 try
710 { 710 {
 
 
Line 730 | Parallel Line 730 | Parallel
730 return null; 730 return null;
731 } 731 }
732 732
733 private Hashtable<Object, RealTimeChartModel> getRealTimeChartModel() 733 protected Hashtable<Object, RealTimeChartModel> getRealTimeChartModel()
734 { 734 {
735 Hashtable<Object, RealTimeChartModel> realTimeChartModelHash = new Hashtable<Object, RealTimeChartModel>(); 735 Hashtable<Object, RealTimeChartModel> realTimeChartModelHash = new Hashtable<Object, RealTimeChartModel>();
736 try 736 try
 
File Web.Security/WebContent/jsp/security/NewUserDetails.jsp (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 119 | Parallel Line 119 | Parallel
119 cssStyle="width:130px;" 119 cssStyle="width:130px;"
120 name="status" 120 name="status"
121 list="userStatusList" 121 list="userStatusList"
122 listKey="UserStatusName" 122 listKey="UserStatusId"
123 listValue="UserStatusName" 123 listValue="UserStatusName"
124 value="UserStatusName" 124 value="UserStatusName"
125 multiple="false" 125 multiple="false"
 
File Web.Security/WebContent/webresource/security/scripts/SecurityScriptController.js (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 195 | Parallel Line 195 | Parallel
195 }catch (e) {} 195 }catch (e) {}
196 } 196 }
197 } 197 }
198 var scrpitArr = ['/webresource/security/scripts/SecurityGroupManager.js',
199 '/webresource/security/scripts/SecurityUserManager.js'];
200 DNMSDynamicLoader.loadScript_Synchronized(scrpitArr, null);
 
File Web.Security/WebContent/webresource/security/scripts/SecurityUserManager.js (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 792 | Parallel Line 792 | Parallel
792 focus_field = thisForm.email; 792 focus_field = thisForm.email;
793 } 793 }
794 } 794 }
795 if(thisForm.acctExpires.value != '' && thisForm.pwordExpires.value != ''
796 && thisForm.acctExpires.value > 0 && thisForm.pwordExpires.value > 0
797 && parseInt(thisForm.acctExpires.value) < parseInt(thisForm.pwordExpires.value))
798 {
799 error_mess += userManagementLocale.getText("security.userManagement.warning.expAge");
800 }
795 if(thisForm.assignedGroups.value == "" || thisForm.assignedGroups.value == null) 801 if(thisForm.assignedGroups.value == "" || thisForm.assignedGroups.value == null)
796 { 802 {
797 error_mess += userManagementLocale.getText("security.userManagement.warning.assignMinGroup"); 803 error_mess += userManagementLocale.getText("security.userManagement.warning.assignMinGroup");
 
File Web.Security/src/com/dhyan/nms/client/webclient/security/struts/SecurityManagerAction.java (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 7 | Parallel Line 7 | Parallel
7 import java.util.HashMap; 7 import java.util.HashMap;
8 import java.util.Iterator; 8 import java.util.Iterator;
9 import java.util.Properties; 9 import java.util.Properties;
10 import java.util.TimeZone;
11 import java.util.TreeMap; 10 import java.util.TreeMap;
12 import java.util.Vector; 11 import java.util.Vector;
13 12
 
 
Line 1017 | Parallel Line 1016 | Parallel
1017 */ 1016 */
1018 public String subscribeGroupForNotification() throws Exception 1017 public String subscribeGroupForNotification() throws Exception
1019 { 1018 {
1020 LOGGER.info("Inside subscribeGroupForNotification<<<<<<<<<<<<<<<<<<<<<<<<<" + NotificationConstants.NOTIFICATION_TOPIC_SECURITY_GROUP); 1019 LOGGER.info("Inside subscribeGroupForNotification.................." + NotificationConstants.NOTIFICATION_TOPIC_SECURITY_GROUP);
1021 SubscriberDetails subDetails = new SubscriberDetails(); 1020 SubscriberDetails subDetails = new SubscriberDetails();
1022 subDetails.setDataProcessorClass(new SecurityGroupNotificationProcessor()); 1021 subDetails.setDataProcessorClass(new SecurityGroupNotificationProcessor());
1023 subDetails.setTopicName(NotificationConstants.NOTIFICATION_TOPIC_SECURITY_GROUP); 1022 subDetails.setTopicName(NotificationConstants.NOTIFICATION_TOPIC_SECURITY_GROUP);
 
 
Line 1025 | Parallel Line 1024 | Parallel
1025 subDetails.setSessionId(request.getSession().getId()); 1024 subDetails.setSessionId(request.getSession().getId());
1026 subDetails.setSubscriberKey(NotificationConstants.NOTIFICATION_TOPIC_SECURITY_GROUP + "_Subscriber"); 1025 subDetails.setSubscriberKey(NotificationConstants.NOTIFICATION_TOPIC_SECURITY_GROUP + "_Subscriber");
1027 SubscriberManager.getInstance().subscribe(subDetails); 1026 SubscriberManager.getInstance().subscribe(subDetails);
1028 LOGGER.info("subscribed succesfully subscribeGroupForNotification<<<<<<<<<<<<<<<<<<<<<<<<<"); 1027 LOGGER.info("subscribeGroupForNotification subscribed succesfully .................");
1029 response.getWriter().write(RESULT_SUCCESS); 1028 response.getWriter().write(RESULT_SUCCESS);
1030 return null; 1029 return null;
1031 } 1030 }
 
 
Line 1390 | Parallel Line 1389 | Parallel
1390 setAvailableGroupsList(group_coll); 1389 setAvailableGroupsList(group_coll);
1391 } 1390 }
1392 setTimeOut(new Long(idletimeout)); 1391 setTimeOut(new Long(idletimeout));
1393 setPwordExpires(new Long(0));
1394 setAcctExpires(new Long(0));
1395 setMode("add"); 1392 setMode("add");
1396 setRolesFlag(true); 1393 setRolesFlag(true);
1397 setAuditStatusFlag(true); 1394 setAuditStatusFlag(true);
 
 
Line 1417 | Parallel Line 1414 | Parallel
1417 setUserName(getUserName()); 1414 setUserName(getUserName());
1418 setUserVersion(info.getVersion()); 1415 setUserVersion(info.getVersion());
1419 setUserStatusId(info.getUserstatusid()); 1416 setUserStatusId(info.getUserstatusid());
1420 if(info.getAccountExpDate() > 0) 1417 setAcctExpires(info.getAccountage());
1421 { 1418 setPwordExpires(info.getPasswordage());
1422 Calendar cal = Calendar.getInstance(TimeZone.getDefault());
1423 setAcctExpires((info.getAccountExpDate()-cal.getTimeInMillis())/86400000);
1424 }
1425 else
1426 {
1427 setAcctExpires(info.getAccountExpDate());
1428 }
1429 if(info.getPasswordExpDate() > 0)
1430 {
1431 Calendar cal = Calendar.getInstance(TimeZone.getDefault());
1432 setPwordExpires((info.getPasswordExpDate()-cal.getTimeInMillis())/86400000);
1433 }
1434 else
1435 {
1436 setPwordExpires(info.getPasswordExpDate());
1437 }
1438 setTimeOut(info.getIdleTimeOut()); 1419 setTimeOut(info.getIdleTimeOut());
1439 setExAcctExpires(info.getAccountExpDate()); 1420 setExAcctExpires(info.getAccountExpDate());
1440 setExIdleTimeout(info.getIdleTimeOut()); 1421 setExIdleTimeout(info.getIdleTimeOut());
 
 
Line 1443 | Parallel Line 1424 | Parallel
1443 setMobile(info.getMobile()); 1424 setMobile(info.getMobile());
1444 setPager(info.getPager()); 1425 setPager(info.getPager());
1445 setSuperior(info.getUserhierarchyVo().getSuperiorid()); 1426 setSuperior(info.getUserhierarchyVo().getSuperiorid());
1446 setUserStatusName(info.getStatus()); 1427 setUserStatusId(info.getUserstatusid());
1447 setDescription(info.getDescription()); 1428 setDescription(info.getDescription());
1448 if(info.getPasswordStatus().equals("Y")) 1429 if(info.getPasswordStatus().equals("Y"))
1449 { 1430 {
 
 
Line 1505 | Parallel Line 1486 | Parallel
1505 } 1486 }
1506 } 1487 }
1507 setUserName(this.getUserName()); 1488 setUserName(this.getUserName());
1508 if(info.getAccountExpDate() > 0) 1489 setAcctExpires(info.getAccountage());
1509 { 1490 setPwordExpires(info.getPasswordage());
1510 Calendar cal = Calendar.getInstance(TimeZone.getDefault());
1511 setAcctExpires((info.getAccountExpDate()-cal.getTimeInMillis())/86400000);
1512 }
1513 else
1514 {
1515 setAcctExpires(info.getAccountExpDate());
1516 }
1517 if(info.getPasswordExpDate() > 0)
1518 {
1519 Calendar cal = Calendar.getInstance(TimeZone.getDefault());
1520 setPwordExpires((info.getPasswordExpDate()-cal.getTimeInMillis())/86400000);
1521 }
1522 else
1523 {
1524 setPwordExpires(info.getPasswordExpDate());
1525 }
1526 setTimeOut(info.getIdleTimeOut()); 1491 setTimeOut(info.getIdleTimeOut());
1527 setEmail(info.getEmail()); 1492 setEmail(info.getEmail());
1528 setMobile(info.getMobile()); 1493 setMobile(info.getMobile());
 
 
Line 1549 | Parallel Line 1514 | Parallel
1549 */ 1514 */
1550 public String addUserDetails() throws Exception 1515 public String addUserDetails() throws Exception
1551 { 1516 {
1552 LOGGER.info("Entering into adduserDetails method of SecurityManagerAction Class. ");
1553 try 1517 try
1554 { 1518 {
1555 SecurityFacadeLocal security_facade = (SecurityFacadeLocal) LocalLookupManager.getLocalObject(SecurityFacadeLocal.class); 1519 SecurityFacadeLocal security_facade = (SecurityFacadeLocal) LocalLookupManager.getLocalObject(SecurityFacadeLocal.class);
 
 
Line 1646 | Parallel Line 1610 | Parallel
1646 } 1610 }
1647 if (getPwordExpires() != null) 1611 if (getPwordExpires() != null)
1648 { 1612 {
1649 info.setPasswordExpDate(getPwordExpires()); 1613 info.setPasswordage(getPwordExpires());
1650 } 1614 }
1651 if (getAcctExpires() != null) 1615 if (getAcctExpires() != null)
1652 { 1616 {
1653 info.setAccountExpDate(getAcctExpires()); 1617 info.setAccountage(getAcctExpires());
1654 } 1618 }
1655 if (getTimeOut() != null) 1619 if (getTimeOut() != null)
1656 { 1620 {
 
 
Line 1708 | Parallel Line 1672 | Parallel
1708 info.setUserid(getUserId()); 1672 info.setUserid(getUserId());
1709 info.setUserstatusid(getUserStatusId()); 1673 info.setUserstatusid(getUserStatusId());
1710 info.setVersion(getUserVersion()); 1674 info.setVersion(getUserVersion());
1675 if(getUserStatusId() == SecurityConstants.ACTIVE && info.getUserstatusid() == SecurityConstants.ACCEXPIRY)
1676 {
1677 info.setAccountExpDate(getmidnightTimeInLong(new Long(getAcctExpires()).intValue()));
1678 }
1711 security_facade.updateUser(info, this.getUserName()[0]); 1679 security_facade.updateUser(info, this.getUserName()[0]);
1712 if (getAssignedGroups().size() > 0) 1680 if (getAssignedGroups().size() > 0)
1713 { 1681 {
 
 
Line 2195 | Parallel Line 2163 | Parallel
2195 { 2163 {
2196 this.loggedInUserList = paramLoggedInUserList; 2164 this.loggedInUserList = paramLoggedInUserList;
2197 } 2165 }
2166
2167 /*
2168 * Given the number of days from present the expiry date will be calculated
2169 * as midnight of that day
2170 */
2171 private long getmidnightTimeInLong(final int numberOfDaysFromPresent)
2172 {
2173 Long targetDateInLong = new Long(System.currentTimeMillis()+(numberOfDaysFromPresent*86400000));
2174 Calendar myCal = Calendar.getInstance();
2175 myCal.setTimeInMillis(targetDateInLong - 1);
2176 Calendar temp = Calendar.getInstance();
2177 temp.setLenient(true);
2178 temp.set(myCal.get(Calendar.YEAR), myCal.get(Calendar.MONTH), myCal.get(Calendar.DATE) + 0, 0, 0, 0);
2179 temp.set(Calendar.MILLISECOND, 0);
2180 return temp.getTimeInMillis();
2181 }
2198 } 2182 }
 
File Web.Topology/WebContent/webresource/topology/scripts/DNMSDiscovery.js (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 191 | Parallel Line 191 | Parallel
191 191
192 var editNetworkDetails = function() 192 var editNetworkDetails = function()
193 { 193 {
194 alert("ecit network details");
195 new Ajax.Request('/topology/checkForEditNetworkDetailsRole.action', 194 new Ajax.Request('/topology/checkForEditNetworkDetailsRole.action',
196 { 195 {
197 method: 'get', 196 method: 'get',
 
File Web.Topology/WebContent/webresource/topology/scripts/ResourceTreeManager.js (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 616 | Parallel Line 616 | Parallel
616 refreshTreeNode = function() 616 refreshTreeNode = function()
617 { 617 {
618 var selectedNode = TopologyManager.topologyTree.getSelectedNode(); 618 var selectedNode = TopologyManager.topologyTree.getSelectedNode();
619 var nodeDetails = selectedNode.optionalParameter; 619 if(selectedNode!=null)
620 var groupId = nodeDetails.entityGroupId;
621 var parentNode = selectedNode._parentNode;
622 PREV_SELECTED_NODE = selectedNode;
623 try
624 { 620 {
625 this.getTreeNode(groupId, parentNode, true); 621 var nodeDetails = selectedNode.optionalParameter;
622 var groupId = nodeDetails.entityGroupId;
623 var parentNode = selectedNode._parentNode;
624 PREV_SELECTED_NODE = selectedNode;
625 try
626 {
627 this.getTreeNode(groupId, parentNode, true);
628 }
629 catch(e)
630 {
631 //alert(e);
632 }
626 } 633 }
627 catch(e)
628 {
629 //alert(e);
630 }
631 } 634 }
632 635
633 getTreeNode = function(paramGroupId, parentNode, refreshMode) 636 getTreeNode = function(paramGroupId, parentNode, refreshMode)
 
File Web.Topology/WebContent/webresource/topology/scripts/TopologyController.js (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 826 | Parallel Line 826 | Parallel
826 } 826 }
827 }); 827 });
828 }, 828 },
829
830 topologyViewWindow:null,
831
829 buildTopologyViewCallBack: 832 buildTopologyViewCallBack:
830 function() 833 function()
831 { 834 {
832 isNotifyTopologyDiscovery = true; 835 isNotifyTopologyDiscovery = true;
833 var topologyViewWindow = null; 836 if (this.topologyViewWindow == null)
834 if (topologyViewWindow == null)
835 { 837 {
836 var discovery_win_height = $('DNMS_Layout_Main').clientHeight - 90; 838 var discovery_win_height = $('DNMS_Layout_Main').clientHeight - 90;
837 if(Prototype.Browser.IE) 839 if(Prototype.Browser.IE)
838 { 840 {
839 discovery_win_height = $('DNMS_Layout_Main').clientHeight - 105; 841 discovery_win_height = $('DNMS_Layout_Main').clientHeight - 105;
840 } 842 }
841 topologyViewWindow = new Window( 843 this.topologyViewWindow = new Window(
842 { 844 {
843 id: 'DNMS_Topology_View_Window', 845 id: 'DNMS_Topology_View_Window',
844 title: discoveryLocale.getText("discovery.window.title.discovery"), 846 title: discoveryLocale.getText("discovery.window.title.discovery"),
 
 
Line 885 | Parallel Line 887 | Parallel
885 887
886 } 888 }
887 }); 889 });
888 topologyViewWindow.showCenter(); 890 this.topologyViewWindow.showCenter();
889 topologyViewWindow.setURL('/topology/Discovery.jsp'); 891 this.topologyViewWindow.setURL('/topology/Discovery.jsp');
890 topologyViewWindow.maximize(); 892 this.topologyViewWindow.maximize();
891 } 893 }
892 else 894 else
893 { 895 {
894 if (topologyViewWindow.isMinimized()) 896 if (this.topologyViewWindow.isMinimized())
895 { 897 {
896 Windows.restore(null, this.topologyViewWindow.getId()); 898 Windows.restore(null, this.topologyViewWindow.getId());
897 } 899 }
898 else 900 else
899 { 901 {
900 topologyViewWindow.show(); 902 this.topologyViewWindow.show();
901 topologyViewWindow.toFront(); 903 this.topologyViewWindow.toFront();
902 } 904 }
903 } 905 }
904 }, 906 },
905 907
906 908
 
File dnms/resources/dbspecific/derby/schema/dnms_default_records.sql (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 1000 | Parallel Line 1000 | Parallel
1000 INSERT INTO USERSTATUS VALUES(6,'Account Locked',1); 1000 INSERT INTO USERSTATUS VALUES(6,'Account Locked',1);
1001 INSERT INTO USERSTATUS VALUES(7,'Change Password On Login',1); 1001 INSERT INTO USERSTATUS VALUES(7,'Change Password On Login',1);
1002 1002
1003 INSERT INTO USERDETAILS VALUES(1,'admin','+GW1NiOxIf007lQmx5Llwzr4wic=',0,0,15,null,null,null,1,1,'Y',-1,-1,null,1); 1003 INSERT INTO USERDETAILS VALUES(1,'admin','+GW1NiOxIf007lQmx5Llwzr4wic=',0,0,15,0,0,null,null,null,1,1,'Y',-1,-1,null,1);
1004 1004
1005 INSERT INTO GROUPDETAILS VALUES(1,'Default','default user',1,1); 1005 INSERT INTO GROUPDETAILS VALUES(1,'Default','default user',1,1);
1006 INSERT INTO GROUPDETAILS VALUES(2,'Administrator','Administrator',1,1); 1006 INSERT INTO GROUPDETAILS VALUES(2,'Administrator','Administrator',1,1);
 
 
Line 2042 | Parallel Line 2042 | Parallel
2042 INSERT INTO DASHBOARDSLOTS VALUES (34, 12, 'MTBF', 3, 4, 28, 1); 2042 INSERT INTO DASHBOARDSLOTS VALUES (34, 12, 'MTBF', 3, 4, 28, 1);
2043 2043
2044 -- PMStats Historical category description 2044 -- PMStats Historical category description
2045 INSERT INTO DASHBOARDHISTORICALSLOT values(1,1,1,1,5,1,1,1); 2045 INSERT INTO DASHBOARDHISTORICALSLOT values(1,1,3,1,5,1,1,1);
2046 INSERT INTO DASHBOARDHISTORICALSLOT values(2,2,1,1,5,1,2,1); 2046 INSERT INTO DASHBOARDHISTORICALSLOT values(2,2,3,1,5,1,2,1);
2047 2047
2048 INSERT INTO DASHBOARDHISTORICALSLOT values(3,3,1,1,5,1,3,1); 2048 INSERT INTO DASHBOARDHISTORICALSLOT values(3,3,3,1,5,1,3,1);
2049 INSERT INTO DASHBOARDHISTORICALSLOT values(4,4,1,1,5,1,3,1); 2049 INSERT INTO DASHBOARDHISTORICALSLOT values(4,4,3,1,5,1,3,1);
2050 2050
2051 INSERT INTO DASHBOARDHISTORICALSLOT values(5,5,1,1,5,1,3,1); 2051 INSERT INTO DASHBOARDHISTORICALSLOT values(5,5,3,1,5,1,3,1);
2052 INSERT INTO DASHBOARDHISTORICALSLOT values(6,6,1,1,5,1,3,1); 2052 INSERT INTO DASHBOARDHISTORICALSLOT values(6,6,3,1,5,1,3,1);
2053 2053
2054 INSERT INTO DASHBOARDHISTORICALSLOT values(7,7,1,1,5,1,3,1); 2054 INSERT INTO DASHBOARDHISTORICALSLOT values(7,7,3,1,5,1,3,1);
2055 INSERT INTO DASHBOARDHISTORICALSLOT values(8,8,1,1,5,1,3,1); 2055 INSERT INTO DASHBOARDHISTORICALSLOT values(8,8,3,1,5,1,3,1);
2056 2056
2057 INSERT INTO DASHBOARDHISTORICALSLOT values(9,9,1,1,5,1,3,1); 2057 INSERT INTO DASHBOARDHISTORICALSLOT values(9,9,3,1,5,1,3,1);
2058 INSERT INTO DASHBOARDHISTORICALSLOT values(10,10,1,1,5,1,3,1); 2058 INSERT INTO DASHBOARDHISTORICALSLOT values(10,10,3,1,5,1,3,1);
2059 2059
2060 -- Availability Historical category description 2060 -- Availability Historical category description
2061 INSERT INTO DASHBOARDHISTORICALSLOT values(11,11,1,1,5,1,1,1); 2061 INSERT INTO DASHBOARDHISTORICALSLOT values(11,11,3,1,5,1,1,1);
2062 INSERT INTO DASHBOARDHISTORICALSLOT values(12,12,1,1,5,1,2,1); 2062 INSERT INTO DASHBOARDHISTORICALSLOT values(12,12,3,1,5,1,2,1);
2063 INSERT INTO DASHBOARDHISTORICALSLOT values(13,13,1,1,5,1,3,1); 2063 INSERT INTO DASHBOARDHISTORICALSLOT values(13,13,3,1,5,1,3,1);
2064 INSERT INTO DASHBOARDHISTORICALSLOT values(14,14,1,1,5,1,3,1); 2064 INSERT INTO DASHBOARDHISTORICALSLOT values(14,14,3,1,5,1,3,1);
2065 2065
2066 INSERT INTO DASHBOARDHISTORICALSLOT values(15,15,1,1,5,1,1,1); 2066 INSERT INTO DASHBOARDHISTORICALSLOT values(15,15,3,1,5,1,1,1);
2067 INSERT INTO DASHBOARDHISTORICALSLOT values(16,16,1,1,5,1,2,1); 2067 INSERT INTO DASHBOARDHISTORICALSLOT values(16,16,3,1,5,1,2,1);
2068 INSERT INTO DASHBOARDHISTORICALSLOT values(17,17,1,1,5,1,3,1); 2068 INSERT INTO DASHBOARDHISTORICALSLOT values(17,17,3,1,5,1,3,1);
2069 INSERT INTO DASHBOARDHISTORICALSLOT values(18,18,1,1,5,1,3,1); 2069 INSERT INTO DASHBOARDHISTORICALSLOT values(18,18,3,1,5,1,3,1);
2070 2070
2071 INSERT INTO DASHBOARDHISTORICALSLOT values(19,19,1,1,5,1,1,1); 2071 INSERT INTO DASHBOARDHISTORICALSLOT values(19,19,3,1,5,1,1,1);
2072 INSERT INTO DASHBOARDHISTORICALSLOT values(20,20,1,1,5,1,2,1); 2072 INSERT INTO DASHBOARDHISTORICALSLOT values(20,20,3,1,5,1,2,1);
2073 INSERT INTO DASHBOARDHISTORICALSLOT values(21,21,1,1,5,1,3,1); 2073 INSERT INTO DASHBOARDHISTORICALSLOT values(21,21,3,1,5,1,3,1);
2074 INSERT INTO DASHBOARDHISTORICALSLOT values(22,22,1,1,5,1,3,1); 2074 INSERT INTO DASHBOARDHISTORICALSLOT values(22,22,3,1,5,1,3,1);
2075 2075
2076 INSERT INTO DASHBOARDHISTORICALSLOT values(23,23,1,1,5,1,1,1); 2076 INSERT INTO DASHBOARDHISTORICALSLOT values(23,23,3,1,5,1,1,1);
2077 INSERT INTO DASHBOARDHISTORICALSLOT values(24,24,1,1,5,1,2,1); 2077 INSERT INTO DASHBOARDHISTORICALSLOT values(24,24,3,1,5,1,2,1);
2078 INSERT INTO DASHBOARDHISTORICALSLOT values(25,25,1,1,5,1,3,1); 2078 INSERT INTO DASHBOARDHISTORICALSLOT values(25,25,3,1,5,1,3,1);
2079 INSERT INTO DASHBOARDHISTORICALSLOT values(26,26,1,1,5,1,3,1); 2079 INSERT INTO DASHBOARDHISTORICALSLOT values(26,26,3,1,5,1,3,1);
2080 2080
2081 INSERT INTO DASHBOARDHISTORICALSLOT values(27,27,1,1,5,1,1,1); 2081 INSERT INTO DASHBOARDHISTORICALSLOT values(27,27,3,1,5,1,1,1);
2082 INSERT INTO DASHBOARDHISTORICALSLOT values(28,28,1,1,5,1,2,1); 2082 INSERT INTO DASHBOARDHISTORICALSLOT values(28,28,3,1,5,1,2,1);
2083 INSERT INTO DASHBOARDHISTORICALSLOT values(29,29,1,1,5,1,3,1); 2083 INSERT INTO DASHBOARDHISTORICALSLOT values(29,29,3,1,5,1,3,1);
2084 INSERT INTO DASHBOARDHISTORICALSLOT values(30,30,1,1,5,1,3,1); 2084 INSERT INTO DASHBOARDHISTORICALSLOT values(30,30,3,1,5,1,3,1);
2085 2085
2086 INSERT INTO DASHBOARDHISTORICALSLOT values(31,31,1,1,5,1,1,1); 2086 INSERT INTO DASHBOARDHISTORICALSLOT values(31,31,3,1,5,1,1,1);
2087 INSERT INTO DASHBOARDHISTORICALSLOT values(32,32,1,1,5,1,2,1); 2087 INSERT INTO DASHBOARDHISTORICALSLOT values(32,32,3,1,5,1,2,1);
2088 INSERT INTO DASHBOARDHISTORICALSLOT values(33,33,1,1,5,1,3,1); 2088 INSERT INTO DASHBOARDHISTORICALSLOT values(33,33,3,1,5,1,3,1);
2089 INSERT INTO DASHBOARDHISTORICALSLOT values(34,34,1,1,5,1,3,1); 2089 INSERT INTO DASHBOARDHISTORICALSLOT values(34,34,3,1,5,1,3,1);
2090 2090
2091 2091
2092 -- Add SNMP performance metric level map 2092 -- Add SNMP performance metric level map
 
File dnms/resources/dbspecific/derby/schema/dnms_security.sql (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 2 | Parallel Line 2 | Parallel
2 --Creating Security Module Tables -------------------------------------------------------------------- 2 --Creating Security Module Tables --------------------------------------------------------------------
3 ------------------------------------------------------------------------------------------------------- 3 -------------------------------------------------------------------------------------------------------
4 4
5 CREATE table USERSTATUS ( 5 CREATE table USERSTATUS (
6 userstatusid NUMERIC(15) not null , 6 userstatusid NUMERIC(15) not null ,
7 status VARCHAR(64) , 7 status VARCHAR(64) ,
8 version NUMERIC(18) default 1, 8 version NUMERIC(18) default 1,
9 primary key (userstatusid) ); 9 primary key (userstatusid) );
10 10
11 CREATE table USERDETAILS ( 11 CREATE table USERDETAILS (
12 userid NUMERIC(15) not null , 12 userid NUMERIC(15) not null ,
13 username VARCHAR(64) not null UNIQUE, 13 username VARCHAR(64) not null UNIQUE,
14 password VARCHAR(64) not null , 14 password VARCHAR(64) not null ,
15 password_exp_date NUMERIC(18) , 15 password_exp_date NUMERIC(18) ,
16 account_exp_date NUMERIC(18) , 16 account_exp_date NUMERIC(18) ,
17 password_age NUMERIC(3) ,
18 account_age NUMERIC(3) ,
17 idle_time_out NUMERIC(18) , 19 idle_time_out NUMERIC(18) ,
18 email VARCHAR(64) , 20 email VARCHAR(64) ,
19 pager VARCHAR(64) , 21 pager VARCHAR(64) ,
 
 
Line 33 | Parallel Line 35 | Parallel
33 version NUMERIC(18) default 1, 35 version NUMERIC(18) default 1,
34 foreign key(userid) references USERDETAILS(userid) on delete cascade , 36 foreign key(userid) references USERDETAILS(userid) on delete cascade ,
35 foreign key(superiorid) references USERDETAILS(userid) on delete cascade ); 37 foreign key(superiorid) references USERDETAILS(userid) on delete cascade );
36 38
37 CREATE table USERPREFERENCE ( 39 CREATE table USERPREFERENCE (
38 preferenceid NUMERIC(15) not null , 40 preferenceid NUMERIC(15) not null ,
39 userid NUMERIC(15) not null , 41 userid NUMERIC(15) not null ,
 
File dnms/resources/dbspecific/mssql/schema/dnms_default_records.sql (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 1800 | Parallel Line 1800 | Parallel
1800 INSERT INTO DASHBOARDSLOTS VALUES (1, 1, 'sytemUtilization', 1,6,5,1); 1800 INSERT INTO DASHBOARDSLOTS VALUES (1, 1, 'sytemUtilization', 1,6,5,1);
1801 INSERT INTO DASHBOARDSLOTS VALUES (2, 1, 'IfOutOctets', 2,7,5,1); 1801 INSERT INTO DASHBOARDSLOTS VALUES (2, 1, 'IfOutOctets', 2,7,5,1);
1802 1802
1803 INSERT INTO DASHBOARDHISTORICALSLOT values(1,1,1,2,1,0,1); 1803 INSERT INTO DASHBOARDHISTORICALSLOT values(1,1,3,2,1,0,1);
1804 INSERT INTO DASHBOARDHISTORICALSLOT values(2,2,1,2,1,0,1); 1804 INSERT INTO DASHBOARDHISTORICALSLOT values(2,2,3,2,1,0,1);
1805 1805
1806 INSERT INTO DASHBOARDSLOTS VALUES (3, 2, 'IfInOctets', 2, 6, 5, 1); 1806 INSERT INTO DASHBOARDSLOTS VALUES (3, 2, 'IfInOctets', 2, 6, 5, 1);
1807 INSERT INTO DASHBOARDSLOTS VALUES (4, 2, 'sytemUtilization', 1, 7, 5, 1); 1807 INSERT INTO DASHBOARDSLOTS VALUES (4, 2, 'sytemUtilization', 1, 7, 5, 1);
1808 1808
1809 INSERT INTO DASHBOARDHISTORICALSLOT values(3,3,1,2,1,0,1); 1809 INSERT INTO DASHBOARDHISTORICALSLOT values(3,3,3,2,1,0,1);
1810 INSERT INTO DASHBOARDHISTORICALSLOT values(4,4,1,2,1,0,1); 1810 INSERT INTO DASHBOARDHISTORICALSLOT values(4,4,3,2,1,0,1);
1811 1811
1812 INSERT INTO DASHBOARDSLOTS VALUES (5, 3, 'IfInOctets', 3, 6, 5, 1); 1812 INSERT INTO DASHBOARDSLOTS VALUES (5, 3, 'IfInOctets', 3, 6, 5, 1);
1813 INSERT INTO DASHBOARDSLOTS VALUES (6, 3, 'IfOutOctets', 2, 7, 5, 1); 1813 INSERT INTO DASHBOARDSLOTS VALUES (6, 3, 'IfOutOctets', 2, 7, 5, 1);
1814 1814
1815 INSERT INTO DASHBOARDHISTORICALSLOT values(5,5,1,2,1,0,1); 1815 INSERT INTO DASHBOARDHISTORICALSLOT values(5,5,3,2,1,0,1);
1816 INSERT INTO DASHBOARDHISTORICALSLOT values(6,6,1,2,1,0,1); 1816 INSERT INTO DASHBOARDHISTORICALSLOT values(6,6,3,2,1,0,1);
1817 1817
1818 INSERT INTO DASHBOARDSLOTS VALUES (7, 4, 'IfInOctets', 3, 6, 5, 1); 1818 INSERT INTO DASHBOARDSLOTS VALUES (7, 4, 'IfInOctets', 3, 6, 5, 1);
1819 INSERT INTO DASHBOARDSLOTS VALUES (8, 4, 'IfOutOctets', 2, 7, 5, 1); 1819 INSERT INTO DASHBOARDSLOTS VALUES (8, 4, 'IfOutOctets', 2, 7, 5, 1);
1820 1820
1821 INSERT INTO DASHBOARDHISTORICALSLOT values(7,7,1,2,1,0,1); 1821 INSERT INTO DASHBOARDHISTORICALSLOT values(7,7,3,2,1,0,1);
1822 INSERT INTO DASHBOARDHISTORICALSLOT values(8,8,1,2,1,0,1); 1822 INSERT INTO DASHBOARDHISTORICALSLOT values(8,8,3,2,1,0,1);
1823 1823
1824 INSERT INTO DASHBOARDSLOTS VALUES (9, 5, 'IfInOctets', 3, 6, 5, 1); 1824 INSERT INTO DASHBOARDSLOTS VALUES (9, 5, 'IfInOctets', 3, 6, 5, 1);
1825 INSERT INTO DASHBOARDSLOTS VALUES (10, 5, 'IfOutOctets', 2, 7, 5, 1); 1825 INSERT INTO DASHBOARDSLOTS VALUES (10, 5, 'IfOutOctets', 2, 7, 5, 1);
1826 1826
1827 INSERT INTO DASHBOARDHISTORICALSLOT values(9,9,1,2,1,0,1); 1827 INSERT INTO DASHBOARDHISTORICALSLOT values(9,9,3,2,1,0,1);
1828 INSERT INTO DASHBOARDHISTORICALSLOT values(10,10,1,2,1,0,1); 1828 INSERT INTO DASHBOARDHISTORICALSLOT values(10,10,3,2,1,0,1);
1829 1829
1830 INSERT INTO DASHBOARDSLOTS VALUES (11, 6, 'IfInOctets', 3, 6, 5, 1); 1830 INSERT INTO DASHBOARDSLOTS VALUES (11, 6, 'IfInOctets', 3, 6, 5, 1);
1831 INSERT INTO DASHBOARDSLOTS VALUES (12, 6, 'IfOutOctets', 2, 7, 5, 1); 1831 INSERT INTO DASHBOARDSLOTS VALUES (12, 6, 'IfOutOctets', 2, 7, 5, 1);
1832 1832
1833 INSERT INTO DASHBOARDHISTORICALSLOT values(11,11,1,2,1,0,1); 1833 INSERT INTO DASHBOARDHISTORICALSLOT values(11,11,3,2,1,0,1);
1834 INSERT INTO DASHBOARDHISTORICALSLOT values(12,12,1,2,1,0,1); 1834 INSERT INTO DASHBOARDHISTORICALSLOT values(12,12,3,2,1,0,1);
1835 1835
1836 INSERT INTO DASHBOARDSLOTS VALUES (13, 7, 'IfInOctets', 3, 6, 5, 1); 1836 INSERT INTO DASHBOARDSLOTS VALUES (13, 7, 'IfInOctets', 3, 6, 5, 1);
1837 INSERT INTO DASHBOARDSLOTS VALUES (14, 7, 'IfOutOctets', 2, 7, 5, 1); 1837 INSERT INTO DASHBOARDSLOTS VALUES (14, 7, 'IfOutOctets', 2, 7, 5, 1);
1838 1838
1839 INSERT INTO DASHBOARDHISTORICALSLOT values(13,13,1,2,1,0,1); 1839 INSERT INTO DASHBOARDHISTORICALSLOT values(13,13,3,2,1,0,1);
1840 INSERT INTO DASHBOARDHISTORICALSLOT values(14,14,1,2,1,0,1); 1840 INSERT INTO DASHBOARDHISTORICALSLOT values(14,14,3,2,1,0,1);
1841 1841
1842 INSERT INTO DASHBOARDSLOTS VALUES (15, 8, 'IfInOctets', 3, 6, 5, 1); 1842 INSERT INTO DASHBOARDSLOTS VALUES (15, 8, 'IfInOctets', 3, 6, 5, 1);
1843 INSERT INTO DASHBOARDSLOTS VALUES (16, 8, 'IfOutOctets', 2, 7, 5, 1); 1843 INSERT INTO DASHBOARDSLOTS VALUES (16, 8, 'IfOutOctets', 2, 7, 5, 1);
1844 1844
1845 INSERT INTO DASHBOARDHISTORICALSLOT values(15,15,1,2,1,0,1); 1845 INSERT INTO DASHBOARDHISTORICALSLOT values(15,15,3,2,1,0,1);
1846 INSERT INTO DASHBOARDHISTORICALSLOT values(16,16,1,2,1,0,1); 1846 INSERT INTO DASHBOARDHISTORICALSLOT values(16,16,3,2,1,0,1);
1847 1847
1848 INSERT INTO DASHBOARDSLOTS VALUES (17, 9, 'IfInOctets', 3, 6, 5, 1); 1848 INSERT INTO DASHBOARDSLOTS VALUES (17, 9, 'IfInOctets', 3, 6, 5, 1);
1849 INSERT INTO DASHBOARDSLOTS VALUES (18, 9, 'IfOutOctets', 2, 7, 5, 1); 1849 INSERT INTO DASHBOARDSLOTS VALUES (18, 9, 'IfOutOctets', 2, 7, 5, 1);
1850 1850
1851 INSERT INTO DASHBOARDHISTORICALSLOT values(17,17,1,2,1,0,1); 1851 INSERT INTO DASHBOARDHISTORICALSLOT values(17,17,3,2,1,0,1);
1852 INSERT INTO DASHBOARDHISTORICALSLOT values(18,18,1,2,1,0,1); 1852 INSERT INTO DASHBOARDHISTORICALSLOT values(18,18,3,2,1,0,1);
1853 1853
1854 INSERT INTO DASHBOARDSLOTS VALUES (19, 10, 'IfInOctets', 3, 6, 5, 1); 1854 INSERT INTO DASHBOARDSLOTS VALUES (19, 10, 'IfInOctets', 3, 6, 5, 1);
1855 INSERT INTO DASHBOARDSLOTS VALUES (20, 10, 'IfOutOctets', 2, 7, 5, 1); 1855 INSERT INTO DASHBOARDSLOTS VALUES (20, 10, 'IfOutOctets', 2, 7, 5, 1);
1856 1856
1857 INSERT INTO DASHBOARDHISTORICALSLOT values(19,19,1,2,1,0,1); 1857 INSERT INTO DASHBOARDHISTORICALSLOT values(19,19,3,2,1,0,1);
1858 INSERT INTO DASHBOARDHISTORICALSLOT values(20,20,1,2,1,0,1); 1858 INSERT INTO DASHBOARDHISTORICALSLOT values(20,20,3,2,1,0,1);
1859 1859
1860 INSERT INTO DASHBOARDSLOTS VALUES (21, 11, 'IfInOctets', 3, 6, 5, 1); 1860 INSERT INTO DASHBOARDSLOTS VALUES (21, 11, 'IfInOctets', 3, 6, 5, 1);
1861 INSERT INTO DASHBOARDSLOTS VALUES (22, 11, 'IfOutOctets', 2, 7, 5, 1); 1861 INSERT INTO DASHBOARDSLOTS VALUES (22, 11, 'IfOutOctets', 2, 7, 5, 1);
1862 1862
1863 INSERT INTO DASHBOARDHISTORICALSLOT values(21,21,1,2,1,0,1); 1863 INSERT INTO DASHBOARDHISTORICALSLOT values(21,21,3,2,1,0,1);
1864 INSERT INTO DASHBOARDHISTORICALSLOT values(22,22,1,2,1,0,1); 1864 INSERT INTO DASHBOARDHISTORICALSLOT values(22,22,3,2,1,0,1);
 
File dnms/resources/dbspecific/mysql/schema/dnms_default_records.sql (Revision 5640) [Add File Comment] [<<] [Top] [>>]
 
Line 1000 | Parallel Line 1000 | Parallel
1000 INSERT INTO USERSTATUS VALUES(6,'Account Locked',1); 1000 INSERT INTO USERSTATUS VALUES(6,'Account Locked',1);
1001 INSERT INTO USERSTATUS VALUES(7,'Change Password On Login',1); 1001 INSERT INTO USERSTATUS VALUES(7,'Change Password On Login',1);
1002 1002
1003 INSERT INTO USERDETAILS VALUES(1,'admin','+GW1NiOxIf007lQmx5Llwzr4wic=',0,0,15,null,null,null,1,1,'Y',-1,-1,null,1); 1003 INSERT INTO USERDETAILS VALUES(1,'admin','+GW1NiOxIf007lQmx5Llwzr4wic=',0,0,15,0,0,null,null,null,1,1,'Y',-1,-1,null,1);
1004 1004
1005 INSERT INTO GROUPDETAILS VALUES(1,'Default','default user',1,1); 1005 INSERT INTO GROUPDETAILS VALUES(1,'Default','default user',1,1);
1006 INSERT INTO GROUPDETAILS VALUES(2,'Administrator','Administrator',1,1); 1006 INSERT INTO GROUPDETAILS VALUES(2,'Administrator','Administrator',1,1);
 
 
Line 2042 | Parallel Line 2042 | Parallel
2042 INSERT INTO DASHBOARDSLOTS VALUES (34, 12, 'MTBF', 3, 4, 28, 1); 2042 INSERT INTO DASHBOARDSLOTS VALUES (34, 12, 'MTBF', 3, 4, 28, 1);
2043 2043
2044 -- PMStats Historical category description 2044 -- PMStats Historical category description
2045 INSERT INTO DASHBOARDHISTORICALSLOT values(1,1,1,1,5,1,1,1); 2045 INSERT INTO DASHBOARDHISTORICALSLOT values(1,1,3,1,5,1,1,1);
2046 INSERT INTO DASHBOARDHISTORICALSLOT values(2,2,1,1,5,1,2,1); 2046 INSERT INTO DASHBOARDHISTORICALSLOT values(2,2,3,1,5,1,2,1);
2047 2047
2048 INSERT INTO DASHBOARDHISTORICALSLOT values(3,3,1,1,5,1,3,1); 2048 INSERT INTO DASHBOARDHISTORICALSLOT values(3,3,3,1,5,1,3,1);
2049 INSERT INTO DASHBOARDHISTORICALSLOT values(4,4,1,1,5,1,3,1); 2049 INSERT INTO DASHBOARDHISTORICALSLOT values(4,4,3,1,5,1,3,1);
2050 2050
2051 INSERT INTO DASHBOARDHISTORICALSLOT values(5,5,1,1,5,1,3,1); 2051 INSERT INTO DASHBOARDHISTORICALSLOT values(5,5,3,1,5,1,3,1);
2052 INSERT INTO DASHBOARDHISTORICALSLOT values(6,6,1,1,5,1,3,1); 2052 INSERT INTO DASHBOARDHISTORICALSLOT values(6,6,3,1,5,1,3,1);
2053 2053
2054 INSERT INTO DASHBOARDHISTORICALSLOT values(7,7,1,1,5,1,3,1); 2054 INSERT INTO DASHBOARDHISTORICALSLOT values(7,7,3,1,5,1,3,1);
2055 INSERT INTO DASHBOARDHISTORICALSLOT values(8,8,1,1,5,1,3,1); 2055 INSERT INTO DASHBOARDHISTORICALSLOT values(8,8,3,1,5,1,3,1);
2056 2056
2057 INSERT INTO DASHBOARDHISTORICALSLOT values(9,9,1,1,5,1,3,1); 2057 INSERT INTO DASHBOARDHISTORICALSLOT values(9,9,3,1,5,1,3,1);
2058 INSERT INTO DASHBOARDHISTORICALSLOT values(10,10,1,1,5,1,3,1); 2058 INSERT INTO DASHBOARDHISTORICALSLOT values(10,10,3,1,5,1,3,1);
2059 2059
2060 -- Availability Historical category description 2060 -- Availability Historical category description
2061 INSERT INTO DASHBOARDHISTORICALSLOT values(11,11,1,1,5,1,1,1); 2061 INSERT INTO DASHBOARDHISTORICALSLOT values(11,11,3,1,5,1,1,1);
2062 INSERT INTO DASHBOARDHISTORICALSLOT values(12,12,1,1,5,1,2,1); 2062 INSERT INTO DASHBOARDHISTORICALSLOT values(12,12,3,1,5,1,2,1);
2063 INSERT INTO DASHBOARDHISTORICALSLOT values(13,13,1,1,5,1,3,1); 2063 INSERT INTO DASHBOARDHISTORICALSLOT values(13,13,3,1,5,1,3,1);
2064 INSERT INTO DASHBOARDHISTORICALSLOT values(14,14,1,1,5,1,3,1); 2064 INSERT INTO DASHBOARDHISTORICALSLOT values(14,14,3,1,5,1,3,1);
2065 2065
2066 INSERT INTO DASHBOARDHISTORICALSLOT values(15,15,